diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-02-19 09:31:10 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-02-19 09:34:22 -0600 |
| commit | 7d7f9ccfdf986099e3c5abf05af37a886daba0b5 (patch) | |
| tree | 9dacbefbc1a3d05ec4d22516bd5b1cd3f943fce5 /actionpack/test/dispatch/response_test.rb | |
| parent | be35a1510d065fc8575524e1b6b9f2bebd3e138c (diff) | |
| download | rails-7d7f9ccfdf986099e3c5abf05af37a886daba0b5.tar.gz rails-7d7f9ccfdf986099e3c5abf05af37a886daba0b5.tar.bz2 rails-7d7f9ccfdf986099e3c5abf05af37a886daba0b5.zip | |
Reinstate pending tests that were supposed to be fixed before the
beta.
Shout louder this time so they actually get fixed.
Diffstat (limited to 'actionpack/test/dispatch/response_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/response_test.rb | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb index 4697fa3e2b..c7f7f3102d 100644 --- a/actionpack/test/dispatch/response_test.rb +++ b/actionpack/test/dispatch/response_test.rb @@ -165,10 +165,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest assert_equal('public', @response.headers['Cache-Control']) assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag']) - pending do - assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag) - assert_equal({:public => true}, @response.cache_control) - end + assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag) + assert_equal({:public => true}, @response.cache_control) end test "response cache control from rackish app" do @@ -184,10 +182,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest assert_equal('public', @response.headers['Cache-Control']) assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag']) - pending do - assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag) - assert_equal({:public => true}, @response.cache_control) - end + assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag) + assert_equal({:public => true}, @response.cache_control) end test "response charset and content type from railsish app" do @@ -202,10 +198,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest get '/' assert_response :success - pending do - assert_equal('utf-16', @response.charset) - assert_equal(Mime::XML, @response.content_type) - end + assert_equal('utf-16', @response.charset) + assert_equal(Mime::XML, @response.content_type) assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type']) end @@ -220,10 +214,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest get '/' assert_response :success - pending do - assert_equal('utf-16', @response.charset) - assert_equal(Mime::XML, @response.content_type) - end + assert_equal('utf-16', @response.charset) + assert_equal(Mime::XML, @response.content_type) assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type']) end |