X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4a2ecfe8b31f111de9387f320dcadb60c4790be9..9ef85e42ba4a3b10157b2aa0711e68acaf9e3f9e:/test/integration/cors_test.rb

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index b1323c819..fdecfc256 100644
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"
 
-class CORSTest < ActionController::IntegrationTest
+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)
@@ -15,18 +15,18 @@ class CORSTest < ActionController::IntegrationTest
 
   def test_api_routes_allow_cross_origin_requests
     options "/api/capabilities", nil,
-            'HTTP_ORIGIN' => "http://www.example.com",
-            'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET'
+            "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'
+              "HTTP_ORIGIN" => "http://www.example.com",
+              "HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET"
     end
   end
 end