Merge pull request #7396 from tomykaira/cleanup_test
Access @rs only through attr_accessor
This commit is contained in:
commit
6904af1db2
@ -197,7 +197,7 @@ def test_optional_star_paths_are_greedy_but_not_too_much
|
||||
end
|
||||
|
||||
def test_regexp_precidence
|
||||
@rs.draw do
|
||||
rs.draw do
|
||||
get '/whois/:domain', :constraints => {
|
||||
:domain => /\w+\.[\w\.]+/ },
|
||||
:to => lambda { |env| [200, {}, %w{regexp}] }
|
||||
@ -216,7 +216,7 @@ def matches? request
|
||||
end
|
||||
}
|
||||
|
||||
@rs.draw do
|
||||
rs.draw do
|
||||
get '/', :constraints => subdomain.new,
|
||||
:to => lambda { |env| [200, {}, %w{default}] }
|
||||
get '/', :constraints => { :subdomain => 'clients' },
|
||||
@ -228,7 +228,7 @@ def matches? request
|
||||
end
|
||||
|
||||
def test_lambda_constraints
|
||||
@rs.draw do
|
||||
rs.draw do
|
||||
get '/', :constraints => lambda { |req|
|
||||
req.subdomain.present? and req.subdomain != "clients" },
|
||||
:to => lambda { |env| [200, {}, %w{default}] }
|
||||
@ -266,22 +266,22 @@ def test_non_greedy_glob_regexp
|
||||
|
||||
def test_draw_with_block_arity_one_raises
|
||||
assert_raise(RuntimeError) do
|
||||
@rs.draw { |map| map.match '/:controller(/:action(/:id))' }
|
||||
rs.draw { |map| map.match '/:controller(/:action(/:id))' }
|
||||
end
|
||||
end
|
||||
|
||||
def test_specific_controller_action_failure
|
||||
@rs.draw do
|
||||
rs.draw do
|
||||
mount lambda {} => "/foo"
|
||||
end
|
||||
|
||||
assert_raises(ActionController::RoutingError) do
|
||||
url_for(@rs, :controller => "omg", :action => "lol")
|
||||
url_for(rs, :controller => "omg", :action => "lol")
|
||||
end
|
||||
end
|
||||
|
||||
def test_default_setup
|
||||
@rs.draw { get '/:controller(/:action(/:id))' }
|
||||
rs.draw { get '/:controller(/:action(/:id))' }
|
||||
assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
|
||||
assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
|
||||
assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
|
||||
@ -298,8 +298,8 @@ def test_default_setup
|
||||
end
|
||||
|
||||
def test_ignores_leading_slash
|
||||
@rs.clear!
|
||||
@rs.draw { get '/:controller(/:action(/:id))'}
|
||||
rs.clear!
|
||||
rs.draw { get '/:controller(/:action(/:id))'}
|
||||
test_default_setup
|
||||
end
|
||||
|
||||
@ -470,7 +470,7 @@ def test_named_route_with_regexps
|
||||
end
|
||||
|
||||
def test_changing_controller
|
||||
@rs.draw { get ':controller/:action/:id' }
|
||||
rs.draw { get ':controller/:action/:id' }
|
||||
|
||||
assert_equal '/admin/stuff/show/10',
|
||||
url_for(rs, {:controller => 'stuff', :action => 'show', :id => 10},
|
||||
@ -583,7 +583,7 @@ def test_route_with_text_default
|
||||
end
|
||||
|
||||
def test_action_expiry
|
||||
@rs.draw { get ':controller(/:action(/:id))' }
|
||||
rs.draw { get ':controller(/:action(/:id))' }
|
||||
assert_equal '/content', url_for(rs, { :controller => 'content' }, { :controller => 'content', :action => 'show' })
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user