aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-09-23 16:42:15 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-09-23 16:42:15 -0700
commit208956c0d014b6e4c560ac40145fdac97c72aa39 (patch)
tree96c5c2b963e30afea4a5cd819056f981538d23a7 /actionpack/test
parent85ab2e7328000dc92715a3756e25df6acdc90a01 (diff)
downloadrails-208956c0d014b6e4c560ac40145fdac97c72aa39.tar.gz
rails-208956c0d014b6e4c560ac40145fdac97c72aa39.tar.bz2
rails-208956c0d014b6e4c560ac40145fdac97c72aa39.zip
remove controller construction
also remove req / res references
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/live_stream_test.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index b82d08d5e9..5abf9aea81 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -262,7 +262,6 @@ module ActionController
end
def test_set_cookie
- @controller = TestController.new
get :set_cookie
assert_equal({'hello' => 'world'}, @response.cookies)
assert_equal "hello world", @response.body
@@ -352,11 +351,8 @@ module ActionController
end
def test_live_stream_default_header
- @controller.request = @request
- @controller.response = @response
- @controller.process :default_header
- _, headers, _ = @response.prepare!
- assert headers['Content-Type']
+ get :default_header
+ assert response.headers['Content-Type']
end
def test_render_text
@@ -425,13 +421,13 @@ module ActionController
def test_stale_without_etag
get :with_stale
- assert_equal 200, @response.status.to_i
+ assert_equal 200, response.status.to_i
end
def test_stale_with_etag
@request.if_none_match = Digest::MD5.hexdigest("123")
get :with_stale
- assert_equal 304, @response.status.to_i
+ assert_equal 304, response.status.to_i
end
end