diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 12:44:01 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 12:44:01 +0200 |
| commit | b9825801e2cbb39fafc761ea24667e714d3cee2f (patch) | |
| tree | e84263a49fe56a05fc9245b0385000c57ebe70ab /actionpack/test/dispatch/routing_test.rb | |
| parent | a256a5790a907c67b823496f0ed15a705418291c (diff) | |
| parent | 3a161e65e76a83be6d62c424227fe10b5b66b77d (diff) | |
| download | rails-b9825801e2cbb39fafc761ea24667e714d3cee2f.tar.gz rails-b9825801e2cbb39fafc761ea24667e714d3cee2f.tar.bz2 rails-b9825801e2cbb39fafc761ea24667e714d3cee2f.zip | |
Merge pull request #21321 from rodzyn/removing_mocha
Get rid of mocha tests in actionpack - part 1
Diffstat (limited to 'actionpack/test/dispatch/routing_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 332a550de0..8972f3e74d 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require 'erb' require 'abstract_unit' require 'controller/fake_controllers' @@ -4190,11 +4189,11 @@ class TestNamedRouteUrlHelpers < ActionDispatch::IntegrationTest include Routes.url_helpers test "url helpers do not ignore nil parameters when using non-optimized routes" do - Routes.stubs(:optimize_routes_generation?).returns(false) - - get "/categories/1" - assert_response :success - assert_raises(ActionController::UrlGenerationError) { product_path(nil) } + Routes.stub :optimize_routes_generation?, false do + get "/categories/1" + assert_response :success + assert_raises(ActionController::UrlGenerationError) { product_path(nil) } + end end end |