More work on user tests

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

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index 827db7c93f81af1e79a007d468e38177c3916786..fdecfc256c4eb666de1e244d090365da36555ed9 100644 (file)
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,9 +1,9 @@
-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_method_names.include?("options")
+  unless instance_methods.include?(:options)
     def options(*args)
       reset! unless integration_session
       @html_document = nil
@@ -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