aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-08-02 12:28:56 -0700
committerGitHub <noreply@github.com>2016-08-02 12:28:56 -0700
commit2762ebd84629ccc39a9959ecf15c9f82c1d283b3 (patch)
tree30703ec9361dd96053fd0db65fa2796d828f493c /railties/test
parent111227c0dfb72b060428063e35d865b62338654a (diff)
parent31c1ed95d33bd9a46a6a4ebb5c1e1fa2af171969 (diff)
downloadrails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.tar.gz
rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.tar.bz2
rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.zip
Merge branch 'master' into retry-and-discard-jobs
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/railties/engine_test.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 0eaa5bc351..fb8de84e1b 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -36,8 +36,6 @@ module RailtiesTest
add_to_env_config "development", "config.assets.digest = false"
boot_rails
- require 'rack/test'
- extend Rack::Test::Methods
get "/assets/engine.js"
assert_match "alert()", last_response.body
@@ -321,8 +319,6 @@ module RailtiesTest
RUBY
boot_rails
- require 'rack/test'
- extend Rack::Test::Methods
get "/sprokkit"
assert_equal "I am a Sprokkit", last_response.body
@@ -359,8 +355,6 @@ module RailtiesTest
RUBY
boot_rails
- require 'rack/test'
- extend Rack::Test::Methods
get '/foo'
assert_equal 'foo', last_response.body
@@ -449,8 +443,6 @@ YAML
RUBY
boot_rails
- require 'rack/test'
- extend Rack::Test::Methods
get "/admin/foo/bar"
assert_equal 200, last_response.status