Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index fa4821b7a8eeb8bdc5516029923b20272b0eaccb..f3581f6a21b0b258fabb127ef65072b50f5e728a 100644 (file)
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class CORSTest < ActionDispatch::IntegrationTest
   # Rails 4 adds a built-in `options` method. When we upgrade, we can remove