aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-03-05 15:19:09 +0100
committerYves Senn <yves.senn@gmail.com>2015-03-18 09:52:19 +0100
commitd9bbafb2e79bbaee93648b7ee5138a0dbd7e8277 (patch)
treeeb3cfcc8ac82f718ca309a24ad9f922ccd3c4008 /railties
parent8017e6af31caa58a58787274ff0ca01397219e49 (diff)
downloadrails-d9bbafb2e79bbaee93648b7ee5138a0dbd7e8277.tar.gz
rails-d9bbafb2e79bbaee93648b7ee5138a0dbd7e8277.tar.bz2
rails-d9bbafb2e79bbaee93648b7ee5138a0dbd7e8277.zip
run `test_test.rb` using the `bin/rails test`.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/test_test.rb18
1 files changed, 1 insertions, 17 deletions
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 58b1bdbe86..61652e5052 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -301,23 +301,7 @@ Expected: ["id", "name"]
end
def run_test_file(name, options = {})
- ruby '-Itest', "#{app_path}/test/#{name}", options.deep_merge(env: {"RAILS_ENV" => "test"})
- end
-
- def ruby(*args)
- options = args.extract_options!
- env = options.fetch(:env, {})
- env["RUBYLIB"] = $:.join(':')
-
- Dir.chdir(app_path) do
- `#{env_string(env)} #{Gem.ruby} #{args.join(' ')} 2>&1`
- end
- end
-
- def env_string(variables)
- variables.map do |key, value|
- "#{key}='#{value}'"
- end.join " "
+ Dir.chdir(app_path) { `bin/rails test "#{app_path}/test/#{name}" 2>&1` }
end
end
end