X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0..821a22c6073d4b50ae7038e9c1aacbb5e68cd55a:/test/integration/cors_test.rb?ds=inline

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index 827db7c93..f3581f6a2 100644
--- 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