Skip to content

Commit

Permalink
Merge pull request rails#34781 from kossnocorp/patch-1
Browse files Browse the repository at this point in the history
Make Rails Facebook-free
  • Loading branch information
kaspth authored Dec 24, 2018
2 parents 52a692f + b17d8c8 commit 4298df0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions actionpack/test/controller/routing_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,10 @@ def test_route_with_regexp_for_action
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
Expand Down

0 comments on commit 4298df0

Please sign in to comment.