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/controller/render_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/controller/render_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 9acdc29aeb..4a6086cf78 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'controller/fake_models' -require 'pathname' class TestControllerWithExtraEtags < ActionController::Base etag { nil } @@ -295,9 +294,10 @@ class ExpiresInRenderTest < ActionController::TestCase def test_date_header_when_expires_in time = Time.mktime(2011,10,30) - Time.stubs(:now).returns(time) - get :conditional_hello_with_expires_in - assert_equal Time.now.httpdate, @response.headers["Date"] + Time.stub :now, time do + get :conditional_hello_with_expires_in + assert_equal Time.now.httpdate, @response.headers["Date"] + end end end |