diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-09-15 21:56:03 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-09-25 21:31:45 +0200 |
| commit | efd808755cac74f0001907a1d635856160d11f6a (patch) | |
| tree | b52f912f1b699f2992cde4727e1177364d6b1919 /railties/lib | |
| parent | 03c982fa3417fc49a380eeb88fdd26fdd4bae46b (diff) | |
| download | rails-efd808755cac74f0001907a1d635856160d11f6a.tar.gz rails-efd808755cac74f0001907a1d635856160d11f6a.tar.bz2 rails-efd808755cac74f0001907a1d635856160d11f6a.zip | |
Fix console tests.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/command/environment_argument.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/console/console_command.rb | 2 |
2 files changed, 3 insertions, 1 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 diff --git a/railties/lib/rails/commands/console/console_command.rb b/railties/lib/rails/commands/console/console_command.rb index 730b108d8c..617066f575 100644 --- a/railties/lib/rails/commands/console/console_command.rb +++ b/railties/lib/rails/commands/console/console_command.rb @@ -70,7 +70,7 @@ module Rails class_option :sandbox, aliases: "-s", type: :boolean, default: false, desc: "Rollback database modifications on exit." - class_option :environment, aliases: "-e", type: :string, default: Rails::Command.environment, + class_option :environment, aliases: "-e", type: :string, desc: "Specifies the environment to run this console under (test/development/production)." def perform |