1 files changed, 12 insertions, 44 deletions
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index a7acc0de41..fe52c50336 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -105,50 +105,6 @@ module ActionDispatch
         assert_equal 'http://example.com/foo', url_helpers.foo_url(only_path: false)
       end
 
-      test "only_path: true with *_path" do
-        draw do
-          get 'foo', to: SimpleApp.new('foo#index')
-        end
-
-        assert_deprecated do
-          assert_equal '/foo', url_helpers.foo_path(only_path: true)
-        end
-      end
-
-      test "only_path: false with *_path with global :host option" do
-        @set.default_url_options = { host: 'example.com' }
-
-        draw do
-          get 'foo', to: SimpleApp.new('foo#index')
-        end
-
-        assert_deprecated do
-          assert_equal 'http://example.com/foo', url_helpers.foo_path(only_path: false)
-        end
-      end
-
-      test "only_path: false with *_path with local :host option" do
-        draw do
-          get 'foo', to: SimpleApp.new('foo#index')
-        end
-
-        assert_deprecated do
-          assert_equal 'http://example.com/foo', url_helpers.foo_path(only_path: false, host: 'example.com')
-        end
-      end
-
-      test "only_path: false with *_path with no :host option" do
-        draw do
-          get 'foo', to: SimpleApp.new('foo#index')
-        end
-
-        assert_deprecated do
-          assert_raises ArgumentError do
-            assert_equal 'http://example.com/foo', url_helpers.foo_path(only_path: false)
-          end
-        end
-      end
-
       test "explicit keys win over implicit keys" do
         draw do
           resources :foo do
@@ -160,6 +116,18 @@ module ActionDispatch
         assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(2, foo_id: 1)
       end
 
+      test "having an optional scope with resources" do
+        draw do
+          scope "(/:foo)" do
+            resources :users
+          end
+        end
+
+        assert_equal '/users/1', url_helpers.user_path(1)
+        assert_equal '/users/1', url_helpers.user_path(1, foo: nil)
+        assert_equal '/a/users/1', url_helpers.user_path(1, foo: 'a')
+      end
+
       private
         def draw(&block)
           @set.draw(&block)