diff options
| author | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
|---|---|---|
| committer | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
| commit | 20401783cf26f903d7020cb7136b1e78e60e71ea (patch) | |
| tree | 5bb029802ade6dda33e051adf74915dc0a8d1fe5 /actionpack/test/controller/send_file_test.rb | |
| parent | f99e9f627b6e4ab7fe72bc759426312ec0c7a2cd (diff) | |
| parent | abb899c54e8777428b7a607774370ba29a5573bd (diff) | |
| download | rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.gz rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.bz2 rails-20401783cf26f903d7020cb7136b1e78e60e71ea.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/guides/source/caching_with_rails.textile
Diffstat (limited to 'actionpack/test/controller/send_file_test.rb')
| -rw-r--r-- | actionpack/test/controller/send_file_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb index 3d1904fee9..2e14a0a32c 100644 --- a/actionpack/test/controller/send_file_test.rb +++ b/actionpack/test/controller/send_file_test.rb @@ -155,7 +155,7 @@ class SendFileTest < ActionController::TestCase define_method "test_default_send_#{method}_status" do @controller.options = { :stream => false } assert_nothing_raised { assert_not_nil process(method) } - assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @response.status + assert_equal ActionController::DEFAULT_RENDER_STATUS_CODE, @response.status end end end |