diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/integration/routing/wiki_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/routing/wiki_test.rb')
| -rw-r--r-- | test/integration/routing/wiki_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb index 0d1924758..f677856a8 100644 --- a/test/integration/routing/wiki_test.rb +++ b/test/integration/routing/wiki_test.rb @@ -17,7 +17,7 @@ require File.expand_path('../../../test_helper', __FILE__) -class RoutingWikiTest < ActionController::IntegrationTest +class RoutingWikiTest < ActionDispatch::IntegrationTest def test_wiki_matching assert_routing( { :method => 'get', :path => "/projects/567/wiki" }, @@ -54,7 +54,7 @@ class RoutingWikiTest < ActionController::IntegrationTest :id => 'CookBook_documentation', :version => '2' } ) # Make sure we don't route wiki page sub-uris to let plugins handle them - assert_raise(ActionController::RoutingError) do + assert_raise(Minitest::Assertion) do assert_recognizes({}, {:method => 'get', :path => "/projects/1/wiki/CookBook_documentation/whatever"}) end end |