Fix scroll bar issue on edit pages

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

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index 827db7c93f81af1e79a007d468e38177c3916786..fa4821b7a8eeb8bdc5516029923b20272b0eaccb 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 File.dirname(__FILE__) + '/../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.
   # 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
     def options(*args)
       reset! unless integration_session
       @html_document = nil