Merge pull request #2715 from newrelic/ceiling_fan_blade_dust

CI: stop checking for / testing against Rack v1
newrelic · Jun 13, 2024 · e94988d · e94988d
2 parents 2fcace3 + 8b58203
commit e94988d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 49 deletions.
diff --git a/test/multiverse/suites/rack/builder_map_test.rb b/test/multiverse/suites/rack/builder_map_test.rb
@@ -58,32 +58,7 @@ def app
           run(PrefixAppTwo.new)
         end
 
-        # Rack versions prior to 1.4 did not support combining map and run at the
-        # top-level in the same Rack::Builder.
-        if Rack::VERSION[1] >= 4
-          run(ExampleApp.new)
-        end
-      end
-    end
-
-    if Rack::VERSION[1] >= 4
-      def test_metrics_for_default_prefix
-        get('/')
-
-        assert_metrics_recorded_exclusive([
-          'Apdex',
-          'ApdexAll',
-          'HttpDispatcher',
-          'Middleware/all',
-          'Controller/Rack/BuilderMapTest::ExampleApp/call',
-          'Apdex/Rack/BuilderMapTest::ExampleApp/call',
-          'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
-          'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
-          'Nested/Controller/Rack/BuilderMapTest::ExampleApp/call',
-          ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call'],
-          ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call'],
-          ['Nested/Controller/Rack/BuilderMapTest::ExampleApp/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call']
-        ])
+        run(ExampleApp.new)
       end
     end
 

diff --git a/test/multiverse/suites/rack/url_map_test.rb b/test/multiverse/suites/rack/url_map_test.rb
@@ -71,29 +71,6 @@ def puma_rack_app
       end
     end
 
-    if defined?(Rack) && Rack::VERSION[1] >= 4
-      def test_metrics_for_default_prefix
-        get('/')
-
-        assert_metrics_recorded_exclusive([
-          'Apdex',
-          'ApdexAll',
-          'HttpDispatcher',
-          'Middleware/all',
-          'Controller/Rack/UrlMapTest::ExampleApp/call',
-          'Apdex/Rack/UrlMapTest::ExampleApp/call',
-          'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
-          'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
-          nested_controller_metric,
-          'Nested/Controller/Rack/UrlMapTest::ExampleApp/call',
-          ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
-          ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
-          ['Nested/Controller/Rack/UrlMapTest::ExampleApp/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
-          [nested_controller_metric, 'Controller/Rack/UrlMapTest::ExampleApp/call']
-        ], :ignore_filter => /^(Supportability|Logging)/)
-      end
-    end
-
     def test_metrics_for_mapped_prefix
       get('/prefix1')