aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/command
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-09-15 21:56:03 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2016-09-25 21:31:45 +0200
commitefd808755cac74f0001907a1d635856160d11f6a (patch)
treeb52f912f1b699f2992cde4727e1177364d6b1919 /railties/lib/rails/command
parent03c982fa3417fc49a380eeb88fdd26fdd4bae46b (diff)
downloadrails-efd808755cac74f0001907a1d635856160d11f6a.tar.gz
rails-efd808755cac74f0001907a1d635856160d11f6a.tar.bz2
rails-efd808755cac74f0001907a1d635856160d11f6a.zip
Fix console tests.
Diffstat (limited to 'railties/lib/rails/command')
-rw-r--r--railties/lib/rails/command/environment_argument.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/command/environment_argument.rb b/railties/lib/rails/command/environment_argument.rb
index bff076adc9..05eac34155 100644
--- a/railties/lib/rails/command/environment_argument.rb
+++ b/railties/lib/rails/command/environment_argument.rb
@@ -13,6 +13,8 @@ module Rails
def extract_environment_option_from_argument
if environment
self.options = options.merge(environment: acceptable_environment(environment))
+ elsif !options[:environment]
+ self.options = options.merge(environment: Rails::Command.environment)
end
end