kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

build fix, we have to reset the RACK_ENV as well.

Browse source 
This is a follow-up to ded17a4 to get the build passing on Travis.
As Travis has `ENV["RACK_ENV"]` set to `test` we need to reset that as well.
This commit is contained in:
Yves Senn 2014-09-03 21:59:38 +02:00
parent 9831875012
commit 316962d092
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
railties/test/application/rake/dbs_test.rb
View file

@ -176,8 +176,10 @@ module ApplicationTests
test 'db:setup loads schema and seeds database' do test 'db:setup loads schema and seeds database' do
begin begin
@old_env = ENV["RAILS_ENV"] @old_rails_env = ENV["RAILS_ENV"]
@old_rack_env = ENV["RACK_ENV"]
ENV.delete "RAILS_ENV" ENV.delete "RAILS_ENV"
ENV.delete "RACK_ENV"
app_file 'db/schema.rb', <<-RUBY app_file 'db/schema.rb', <<-RUBY
ActiveRecord::Schema.define(version: "1") do ActiveRecord::Schema.define(version: "1") do
@ -196,7 +198,8 @@ module ApplicationTests
assert_equal "development.sqlite3", File.basename(database_path.strip) assert_equal "development.sqlite3", File.basename(database_path.strip)
end end
ensure ensure
ENV["RAILS_ENV"] = @old_env ENV["RAILS_ENV"] = @old_rails_env
ENV["RACK_ENV"] = @old_rack_env
end end
end end
end end