aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2018-12-24 18:20:06 +0100
committerGitHub <noreply@github.com>2018-12-24 18:20:06 +0100
commit4298df00ae6219b9b5b7c40f281d4fa4d66f4383 (patch)
treed13d6a0e60e8c4c324e25d789d640f8d188ad1ad /actionpack
parent52a692fed072f9834561ecbeccaea1f6df0d1bf1 (diff)
parentb17d8c83ed714e566d84e7cf28c7f636c3db6d91 (diff)
downloadrails-4298df00ae6219b9b5b7c40f281d4fa4d66f4383.tar.gz
rails-4298df00ae6219b9b5b7c40f281d4fa4d66f4383.tar.bz2
rails-4298df00ae6219b9b5b7c40f281d4fa4d66f4383.zip
Merge pull request #34781 from kossnocorp/patch-1
Make Rails Facebook-free
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/routing_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 30f2a23b33..b378bb80b8 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -355,10 +355,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
rs.draw { ActiveSupport::Deprecation.silence { get "/:controller/:action", action: /auth[-|_].+/ } }
assert_equal({ action: "auth_google", controller: "content" }, rs.recognize_path("/content/auth_google"))
- assert_equal({ action: "auth-facebook", controller: "content" }, rs.recognize_path("/content/auth-facebook"))
+ assert_equal({ action: "auth-twitter", controller: "content" }, rs.recognize_path("/content/auth-twitter"))
assert_equal "/content/auth_google", url_for(rs, controller: "content", action: "auth_google")
- assert_equal "/content/auth-facebook", url_for(rs, controller: "content", action: "auth-facebook")
+ assert_equal "/content/auth-twitter", url_for(rs, controller: "content", action: "auth-twitter")
end
def test_route_with_regexp_for_controller