diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
| commit | bbba0649f529626a076c4247047b60cfbe86d5e4 (patch) | |
| tree | cdbf52c160399441574d1f13dd6587ee504e002d /actioncable/test/connection/cross_site_forgery_test.rb | |
| parent | cd73632d9d47752013f46e775e59241215cfd8e9 (diff) | |
| parent | a373be9da45d4bee684ea03420212780ec1ef4b1 (diff) | |
| download | rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.gz rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.bz2 rails-bbba0649f529626a076c4247047b60cfbe86d5e4.zip | |
Merge pull request #23992 from matthewd/em-option
Support faye-websocket + EventMachine as an option
Diffstat (limited to 'actioncable/test/connection/cross_site_forgery_test.rb')
| -rw-r--r-- | actioncable/test/connection/cross_site_forgery_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/test/connection/cross_site_forgery_test.rb b/actioncable/test/connection/cross_site_forgery_test.rb index a29f65fb97..2d516b0533 100644 --- a/actioncable/test/connection/cross_site_forgery_test.rb +++ b/actioncable/test/connection/cross_site_forgery_test.rb @@ -76,6 +76,6 @@ class ActionCable::Connection::CrossSiteForgeryTest < ActionCable::TestCase def env_for_origin(origin) Rack::MockRequest.env_for "/test", 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket', 'SERVER_NAME' => HOST, - 'HTTP_ORIGIN' => origin + 'HTTP_HOST' => HOST, 'HTTP_ORIGIN' => origin end end |