kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Stop calling methods directly on Journey

Browse source 
Journey is a private API that we want to refactor. We need to stop
calling methods directly on it so we're free to change the
implmentation.
This commit is contained in:
eileencodes 2020-05-19 13:30:26 -04:00
parent e3c7ba4612
commit 58cf1a5fb5
No known key found for this signature in database
GPG key ID: BA5C575120BBE8DF
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
actionpack/test/journey/router_test.rb
View file

@ -60,31 +60,31 @@ module ActionDispatch
get "/foo/:id", id: /\d/, anchor: false, to: "foo#bar"
assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(nil, { controller: "foo", action: "bar", id: "10" }, {})
_generate(nil, { controller: "foo", action: "bar", id: "10" }, {})
end
end
def test_required_parts_are_verified_when_building
get "/foo/:id", id: /\d+/, anchor: false, to: "foo#bar"
path, _ = @formatter.generate(nil, { controller: "foo", action: "bar", id: "10" }, {})
path, _ = _generate(nil, { controller: "foo", action: "bar", id: "10" }, {})
assert_equal "/foo/10", path
assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(nil, { id: "aa" }, {})
_generate(nil, { id: "aa" }, {})
end
end
def test_only_required_parts_are_verified
get "/foo(/:id)", id: /\d/, to: "foo#bar"
path, _ = @formatter.generate(nil, { controller: "foo", action: "bar", id: "10" }, {})
path, _ = _generate(nil, { controller: "foo", action: "bar", id: "10" }, {})
assert_equal "/foo/10", path
path, _ = @formatter.generate(nil, { controller: "foo", action: "bar" }, {})
path, _ = _generate(nil, { controller: "foo", action: "bar" }, {})
assert_equal "/foo", path
path, _ = @formatter.generate(nil, { controller: "foo", action: "bar", id: "aa" }, {})
path, _ = _generate(nil, { controller: "foo", action: "bar", id: "aa" }, {})
assert_equal "/foo/aa", path
end
@ -93,7 +93,7 @@ module ActionDispatch
get "/foo/:id", as: route_name, id: /\d+/, to: "foo#bar"
error = assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(route_name, {}, {})
_generate(route_name, {}, {})
end
assert_match(/missing required keys: \[:id\]/, error.message)
@ -103,7 +103,7 @@ module ActionDispatch
route_name = "gorby_thunderhorse"
error = assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(route_name, {}, {})
_generate(route_name, {}, {})
end
assert_no_match(/missing required keys: \[\]/, error.message)
@ -186,14 +186,14 @@ module ActionDispatch
def test_required_part_in_recall
get "/messages/:a/:b", to: "foo#bar"
path, _ = @formatter.generate(nil, { controller: "foo", action: "bar", a: "a" }, { b: "b" })
path, _ = _generate(nil, { controller: "foo", action: "bar", a: "a" }, { b: "b" })
assert_equal "/messages/a/b", path
end
def test_splat_in_recall
get "/*path", to: "foo#bar"
path, _ = @formatter.generate(nil, { controller: "foo", action: "bar" }, { path: "b" })
path, _ = _generate(nil, { controller: "foo", action: "bar" }, { path: "b" })
assert_equal "/b", path
end
@ -201,7 +201,7 @@ module ActionDispatch
get "/messages/:action(/:id(.:format))", to: "foo#bar"
get "/messages/:id(.:format)", to: "bar#baz"
path, _ = @formatter.generate(nil, { controller: "foo", id: 10 }, { action: "index" })
path, _ = _generate(nil, { controller: "foo", id: 10 }, { action: "index" })
assert_equal "/messages/index/10", path
end
@ -211,8 +211,8 @@ module ActionDispatch
params = { controller: "tasks", format: nil }
extras = { action: "lol" }
path, _ = @formatter.generate(nil, params, extras)
assert_equal "/tasks", path
path, _ = _generate(nil, params, extras)
assert_equal "/tasks/index", path
end
def test_generate_slash
@ -220,14 +220,14 @@ module ActionDispatch
[:action, "show"] ]
get "/", Hash[params]
path, _ = @formatter.generate(nil, Hash[params], {})
path, _ = _generate(nil, Hash[params], {})
assert_equal "/", path
end
def test_generate_id
get "/:controller(/:action)", to: "foo#bar"
path, params = @formatter.generate(
path, params = _generate(
nil, { id: 1, controller: "tasks", action: "show" }, {})
assert_equal "/tasks/show", path
assert_equal({ id: 1 }, params)
@ -236,7 +236,7 @@ module ActionDispatch
def test_generate_escapes
get "/:controller(/:action)", to: "foo#bar"
path, _ = @formatter.generate(nil,
path, _ = _generate(nil,
{ controller: "tasks",
action: "a/b c+d",
}, {})
@ -246,7 +246,7 @@ module ActionDispatch
def test_generate_escapes_with_namespaced_controller
get "/:controller(/:action)", to: "foo#bar"
path, _ = @formatter.generate(
path, _ = _generate(
nil, { controller: "admin/tasks",
action: "a/b c+d",
}, {})
@ -256,7 +256,7 @@ module ActionDispatch
def test_generate_extra_params
get "/:controller(/:action)", to: "foo#bar"
path, params = @formatter.generate(
path, params = _generate(
nil, { id: 1,
controller: "tasks",
action: "show",
@ -286,7 +286,7 @@ module ActionDispatch
message = "No route matches #{Hash[request_parameters.sort_by { |k, _|k.to_s }].inspect}, missing required keys: #{[missing_key.to_sym].inspect}"
error = assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(
_generate(
nil, request_parameters, request_parameters)
end
assert_equal message, error.message
@ -295,7 +295,7 @@ module ActionDispatch
def test_generate_uses_recall_if_needed
get "/:controller(/:action(/:id))", to: "foo#bar"
path, params = @formatter.generate(
path, params = _generate(
nil,
{ controller: "tasks", id: 10 },
{ action: "index" })
@ -306,11 +306,11 @@ module ActionDispatch
def test_generate_with_name
get "/:controller(/:action)", to: "foo#bar", as: "tasks"
path, params = @formatter.generate(
path, params = _generate(
"tasks",
{ controller: "tasks" },
{ controller: "tasks", action: "index" })
assert_equal "/tasks", path
assert_equal "/tasks/index", path
assert_equal({}, params)
end
@ -487,6 +487,10 @@ module ActionDispatch
end
private
def _generate(*args)
ActionDispatch::Routing::RouteSet::Generator.new(*args, @route_set).generate(nil).to_ary
end
def get(*args)
ActiveSupport::Deprecation.silence do
mapper.get(*args)