diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2018-02-24 18:03:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 18:03:47 -0500 |
| commit | 697dd48b5e5787126a91ce10739f8af31d1ffd1d (patch) | |
| tree | cc4ff296f2096afe1a5fd3057f101213caac149a /actionpack/test/controller/api | |
| parent | 6f5cca77313e127313ea44c5c213fda3b9027a95 (diff) | |
| parent | 3915a470d2b8898fdbc384d0f9f31e2ad8a2c899 (diff) | |
| download | rails-697dd48b5e5787126a91ce10739f8af31d1ffd1d.tar.gz rails-697dd48b5e5787126a91ce10739f8af31d1ffd1d.tar.bz2 rails-697dd48b5e5787126a91ce10739f8af31d1ffd1d.zip | |
Merge branch 'master' into update_default_hsts_max_age
Diffstat (limited to 'actionpack/test/controller/api')
| -rw-r--r-- | actionpack/test/controller/api/conditional_get_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/api/conditional_get_test.rb b/actionpack/test/controller/api/conditional_get_test.rb index fd1997f26c..e366ce9532 100644 --- a/actionpack/test/controller/api/conditional_get_test.rb +++ b/actionpack/test/controller/api/conditional_get_test.rb @@ -53,7 +53,7 @@ class ConditionalGetApiTest < ActionController::TestCase @request.if_modified_since = @last_modified get :one assert_equal 304, @response.status.to_i - assert @response.body.blank? + assert_predicate @response.body, :blank? assert_equal @last_modified, @response.headers["Last-Modified"] end end |