Merge branch 'master' into moderation

[rails.git] / test / integration / cors_test.rb

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index fa4821b7a8eeb8bdc5516029923b20272b0eaccb..05754da7185d4735c9a95796b98377e3befdfeee 100644 (file)
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,32 +1,22 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"
 
 class CORSTest < ActionDispatch::IntegrationTest
-  # Rails 4 adds a built-in `options` method. When we upgrade, we can remove
-  # this definition.
-  unless instance_methods.include?(:options)
-    def options(*args)
-      reset! unless integration_session
-      @html_document = nil
-      integration_session.send(:process, :options, *args).tap do
-        copy_session_variables!
-      end
-    end
-  end
-
   def test_api_routes_allow_cross_origin_requests
-    options "/api/capabilities", nil,
-            'HTTP_ORIGIN' => "http://www.example.com",
-            'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET'
+    process :options, "/api/capabilities", :headers => {
+      "HTTP_ORIGIN" => "http://www.example.com",
+      "HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET"
+    }
 
     assert_response :success
-    assert_equal "http://www.example.com", response.headers['Access-Control-Allow-Origin']
+    assert_equal "http://www.example.com", response.headers["Access-Control-Allow-Origin"]
   end
 
   def test_non_api_routes_dont_allow_cross_origin_requests
     assert_raises ActionController::RoutingError do
-      options "/", nil,
-              'HTTP_ORIGIN' => "http://www.example.com",
-              'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET'
+      process :options, "/", :headers => {
+        "HTTP_ORIGIN" => "http://www.example.com",
+        "HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET"
+      }
     end
   end
 end