diff options
author | José Valim <jose.valim@gmail.com> | 2011-06-11 08:01:52 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-06-11 08:01:52 -0700 |
commit | 1829dd91757c5ac337b5e11323c693e75bf2f771 (patch) | |
tree | 6205be0741721be6d312eccf8a88f8d7a3695ece /actionpack | |
parent | 94df84a8a4b183037c160d513bf9fa9d1858c36f (diff) | |
parent | f3c9f32664595b955f60a68f194f2f2939475b67 (diff) | |
download | rails-1829dd91757c5ac337b5e11323c693e75bf2f771.tar.gz rails-1829dd91757c5ac337b5e11323c693e75bf2f771.tar.bz2 rails-1829dd91757c5ac337b5e11323c693e75bf2f771.zip |
Merge pull request #1647 from neerajdotname/make_tests_stronger
Make tests stronger, cleaner and slimmer
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/test/controller/test_test.rb | 1 | ||||
-rw-r--r-- | actionpack/test/controller/url_for_test.rb | 4 | ||||
-rw-r--r-- | actionpack/test/controller/webservice_test.rb | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index f48b73b63a..6265e78030 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -612,7 +612,6 @@ XML send(method, :test_remote_addr) assert false, "expected RuntimeError, got nothing" rescue RuntimeError => error - assert true assert_match(%r{@#{variable} is nil}, error.message) rescue => error assert false, "expected RuntimeError, got #{error.class}" diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb index 3f3d6dcc2f..484e996f31 100644 --- a/actionpack/test/controller/url_for_test.rb +++ b/actionpack/test/controller/url_for_test.rb @@ -293,8 +293,8 @@ module AbstractController first_class.default_url_options[:host] = first_host second_class.default_url_options[:host] = second_host - assert_equal first_class.default_url_options[:host], first_host - assert_equal second_class.default_url_options[:host], second_host + assert_equal first_host, first_class.default_url_options[:host] + assert_equal second_host, second_class.default_url_options[:host] end def test_with_stringified_keys diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb index 621fb79915..ae8588cbb0 100644 --- a/actionpack/test/controller/webservice_test.rb +++ b/actionpack/test/controller/webservice_test.rb @@ -30,7 +30,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest def test_check_parameters with_test_route_set do get "/" - assert_blank @controller.response.body + assert_equal '', @controller.response.body end end @@ -162,7 +162,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest def test_use_xml_ximple_with_empty_request with_test_route_set do assert_nothing_raised { post "/", "", {'CONTENT_TYPE' => 'application/xml'} } - assert_blank @controller.response.body + assert_equal '', @controller.response.body end end |