update tests for major version todos

Author: tannalynn

test/new_relic/agent/pipe_channel_manager_test.rb

@@ -79,8 +79,6 @@ def test_listener_merges_transaction_traces
     end
 
     def test_listener_merges_error_traces
-      skip_for_ruby_2_5_9_and_rails_6_x
-
       sampler = NewRelic::Agent.agent.error_collector
       sampler.notice_error(Exception.new('message'), :uri => '/myurl/',
         :metric => 'path', :referer => 'test_referer',
@@ -132,8 +130,6 @@ def test_listener_merges_analytics_events
     end
 
     def test_listener_merges_error_events
-      skip_for_ruby_2_5_9_and_rails_6_x
-
       error_event_aggregator = NewRelic::Agent.agent.error_collector.error_event_aggregator
       reset_lifetime_counts!(error_event_aggregator)
 
@@ -364,12 +360,4 @@ def reset_lifetime_counts!(container)
     buffer.instance_variable_set(:@captured_lifetime, 0)
     buffer.instance_variable_set(:@seen_lifetime, 0)
   end
-
-  def skip_for_ruby_2_5_9_and_rails_6_x
-    # TODO: MAJOR VERSION - remove this method and its calls when Ruby 2.5 is no longer supported
-    skip if RUBY_VERSION == '2.5.9' &&
-      defined?(Rails::VERSION::STRING) &&
-      # version string starts with 6.0 or 6.1
-      Rails::VERSION::STRING =~ /\A6\.(0|1)/
-  end
 end

test/new_relic/dependency_detection_test.rb

@@ -171,26 +171,6 @@ def test_config_disabling_with_enabled
     end
   end
 
-  # TODO: MAJOR VERSION - Deprecated!
-  def test_config_disabling_with_disable_testing
-    executed = false
-
-    dd = DependencyDetection.defer do
-      named(:testing)
-      executes { executed = true }
-    end
-
-    with_config(:disable_testing => true) do
-      executed = false
-      DependencyDetection.detect!
-
-      refute_predicate dd, :disabled_configured?
-      assert_predicate dd, :deprecated_disabled_configured?
-      refute_predicate dd, :allowed_by_config?
-      refute executed
-    end
-  end
-
   def test_config_enabling_with_enabled
     executed = false