diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-07-18 12:42:08 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-07-18 12:42:08 +0930 |
| commit | e78746fefdd1c5528a10ca23a5f40804ef855086 (patch) | |
| tree | deae317ebeca2cb20b57e9ad9a8c0c36720c8d7f /actionpack/test/controller/api | |
| parent | 0db98b3ec8226042a5c3400d594d803abb5b169f (diff) | |
| parent | 8cb8ce98d903929342e2ca3a54a07ab5196baf93 (diff) | |
| download | rails-e78746fefdd1c5528a10ca23a5f40804ef855086.tar.gz rails-e78746fefdd1c5528a10ca23a5f40804ef855086.tar.bz2 rails-e78746fefdd1c5528a10ca23a5f40804ef855086.zip | |
Merge pull request #20923 from sikachu/silence-render-text-warning
Stop using deprecated `render :text` in test
Diffstat (limited to 'actionpack/test/controller/api')
| -rw-r--r-- | actionpack/test/controller/api/conditional_get_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/api/conditional_get_test.rb b/actionpack/test/controller/api/conditional_get_test.rb index d1eb27bf24..b4f1673be0 100644 --- a/actionpack/test/controller/api/conditional_get_test.rb +++ b/actionpack/test/controller/api/conditional_get_test.rb @@ -7,12 +7,12 @@ class ConditionalGetApiController < ActionController::API def one if stale?(last_modified: Time.now.utc.beginning_of_day, etag: [:foo, 123]) - render text: "Hi!" + render plain: "Hi!" end end def two - render text: "Hi!" + render plain: "Hi!" end private |