mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix indentation
This commit is contained in:
parent
082c377954
commit
766fb54c8f
1 changed files with 20 additions and 22 deletions
|
@ -1298,30 +1298,28 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
|
|||
end
|
||||
|
||||
def test_recognize_array_of_methods
|
||||
begin
|
||||
Object.const_set(:BooksController, Class.new(ActionController::Base))
|
||||
rs.draw do |r|
|
||||
r.connect '/match', :controller => 'books', :action => 'get_or_post', :conditions => { :method => [:get, :post] }
|
||||
r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
|
||||
end
|
||||
|
||||
@request = ActionController::TestRequest.new
|
||||
@request.env["REQUEST_METHOD"] = 'POST'
|
||||
@request.request_uri = "/match"
|
||||
assert_nothing_raised { rs.recognize(@request) }
|
||||
assert_equal 'get_or_post', @request.path_parameters[:action]
|
||||
|
||||
# have to recreate or else the RouteSet uses a cached version:
|
||||
@request = ActionController::TestRequest.new
|
||||
@request.env["REQUEST_METHOD"] = 'PUT'
|
||||
@request.request_uri = "/match"
|
||||
assert_nothing_raised { rs.recognize(@request) }
|
||||
assert_equal 'not_get_or_post', @request.path_parameters[:action]
|
||||
ensure
|
||||
Object.send(:remove_const, :BooksController) rescue nil
|
||||
end
|
||||
Object.const_set(:BooksController, Class.new(ActionController::Base))
|
||||
rs.draw do |r|
|
||||
r.connect '/match', :controller => 'books', :action => 'get_or_post', :conditions => { :method => [:get, :post] }
|
||||
r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
|
||||
end
|
||||
|
||||
@request = ActionController::TestRequest.new
|
||||
@request.env["REQUEST_METHOD"] = 'POST'
|
||||
@request.request_uri = "/match"
|
||||
assert_nothing_raised { rs.recognize(@request) }
|
||||
assert_equal 'get_or_post', @request.path_parameters[:action]
|
||||
|
||||
# have to recreate or else the RouteSet uses a cached version:
|
||||
@request = ActionController::TestRequest.new
|
||||
@request.env["REQUEST_METHOD"] = 'PUT'
|
||||
@request.request_uri = "/match"
|
||||
assert_nothing_raised { rs.recognize(@request) }
|
||||
assert_equal 'not_get_or_post', @request.path_parameters[:action]
|
||||
ensure
|
||||
Object.send(:remove_const, :BooksController) rescue nil
|
||||
end
|
||||
|
||||
def test_subpath_recognized
|
||||
Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
|
||||
|
||||
|
|
Loading…
Reference in a new issue