Revert "Fix off-by-one error in user notes list"

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

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