FLAPJACK_ENV left in test code, removed elsewhere (expect email.rb wh…

…ere it is required).
kbailey4444 · Oct 30, 2014 · c72b8fe · c72b8fe
1 parent 8baaacb
commit c72b8fe
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -23,6 +23,7 @@
 require 'i18n'
 I18n.config.enforce_available_locales = true
 
+FLAPJACK_ENV = 'test'
 FLAPJACK_ROOT   = File.join(File.dirname(__FILE__), '..', '..')
 FLAPJACK_CONFIG = File.join(FLAPJACK_ROOT, 'etc', 'flapjack_config.toml')
 

diff --git a/lib/flapjack/cli/import.rb b/lib/flapjack/cli/import.rb
@@ -18,7 +18,7 @@ def initialize(global_options, options)
         @config_env = config.all
 
         if @config_env.nil? || @config_env.empty?
-          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+          exit_now! "No config data found in '#{global_options[:config]}'"
         end
 
         Flapjack::RedisProxy.config = config.for_redis

diff --git a/lib/flapjack/cli/maintenance.rb b/lib/flapjack/cli/maintenance.rb
@@ -20,7 +20,7 @@ def initialize(global_options, options)
         @config_env = config.all
 
         if @config_env.nil? || @config_env.empty?
-          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+          exit_now! "No config data found in '#{global_options[:config]}'"
         end
 
         Flapjack::RedisProxy.config = config.for_redis

diff --git a/lib/flapjack/cli/purge.rb b/lib/flapjack/cli/purge.rb
@@ -16,7 +16,7 @@ def initialize(global_options, options)
         @config_env = config.all
 
         if @config_env.nil? || @config_env.empty?
-          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+          exit_now! "No config data found in '#{global_options[:config]}'"
         end
 
         Flapjack::RedisProxy.config = config.for_redis

diff --git a/lib/flapjack/cli/receiver.rb b/lib/flapjack/cli/receiver.rb
@@ -22,7 +22,7 @@ def initialize(global_options, options)
         @config_env = @config.all
 
         if @config_env.nil? || @config_env.empty?
-          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+          exit_now! "No config data found in '#{global_options[:config]}'"
         end
 
         Flapjack::RedisProxy.config = @config.for_redis

diff --git a/lib/flapjack/cli/server.rb b/lib/flapjack/cli/server.rb
@@ -17,7 +17,7 @@ def initialize(global_options, options)
         @config_env = @config.all
 
         if @config_env.nil? || @config_env.empty?
-          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+          exit_now! "No config data found in '#{global_options[:config]}'"
         end
 
         @pidfile = case

diff --git a/lib/flapjack/cli/simulate.rb b/lib/flapjack/cli/simulate.rb
@@ -18,7 +18,7 @@ def initialize(global_options, options)
         @config_env = config.all
 
         if @config_env.nil? || @config_env.empty?
-          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+          exit_now! "No config data found in '#{global_options[:config]}'"
         end
 
         Flapjack::RedisProxy.config = config.for_redis

diff --git a/lib/flapjack/gateways/email.rb b/lib/flapjack/gateways/email.rb
diff --git a/tasks/benchmarks.rake b/tasks/benchmarks.rake
@@ -21,7 +21,7 @@ namespace :benchmarks do
     @redis = Redis.new(config.for_redis)
 
     if @config_env.nil? || @config_env.empty?
-      puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{config_file}'"
+      puts "No config data found in '#{config_file}'"
       exit(false)
     end
   end

diff --git a/tasks/events.rake b/tasks/events.rake
@@ -25,7 +25,7 @@ namespace :events do
     @redis_config = config.for_redis
 
     if @config_env.nil? || @config_env.empty?
-      puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{config_file}'"
+      puts "No config data found in '#{config_file}'"
       exit(false)
     end
 

diff --git a/tasks/profile.rake b/tasks/profile.rake
@@ -78,8 +78,7 @@ namespace :profile do
     config.load(FLAPJACK_CONFIG)
     config_env = config.all
     if config_env.nil? || config_env.empty?
-      puts "No config data for environment '#{FLAPJACK_ENV}' " +
-        "found in '#{FLAPJACK_CONFIG}'"
+      puts "No config data found in '#{FLAPJACK_CONFIG}'"
       exit(false)
     end