aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorDamien Mathieu <damien@heroku.com>2015-03-19 10:06:28 +0100
committerDamien Mathieu <damien@heroku.com>2015-03-19 10:06:28 +0100
commitd578cbfb5c9fa353ce041bc826e13905910e2d2a (patch)
tree825cabca0569e490290923ea8cb0c6f0a86eef2f /railties/test/application
parent7f338b9082fe3488f681c171b93c371cfc951f22 (diff)
downloadrails-d578cbfb5c9fa353ce041bc826e13905910e2d2a.tar.gz
rails-d578cbfb5c9fa353ce041bc826e13905910e2d2a.tar.bz2
rails-d578cbfb5c9fa353ce041bc826e13905910e2d2a.zip
don't fallback to RACK_ENV when RAILS_ENV is not present
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/rake/dbs_test.rb3
-rw-r--r--railties/test/application/runner_test.rb6
2 files changed, 0 insertions, 9 deletions
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index c414732f92..1da108f1e1 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -203,9 +203,7 @@ module ApplicationTests
test 'db:setup loads schema and seeds database' do
begin
@old_rails_env = ENV["RAILS_ENV"]
- @old_rack_env = ENV["RACK_ENV"]
ENV.delete "RAILS_ENV"
- ENV.delete "RACK_ENV"
app_file 'db/schema.rb', <<-RUBY
ActiveRecord::Schema.define(version: "1") do
@@ -225,7 +223,6 @@ module ApplicationTests
end
ensure
ENV["RAILS_ENV"] = @old_rails_env
- ENV["RACK_ENV"] = @old_rack_env
end
end
end
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 6595c40f8b..b59202e68e 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -79,11 +79,5 @@ module ApplicationTests
assert_match "production", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
end
end
-
- def test_environment_with_rack_env
- with_rack_env "production" do
- assert_match "production", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
- end
- end
end
end