Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 3 insertions, 6 deletions

diff --git a/features/step_definitions/config_steps.rb b/features/step_definitions/config_steps.rb
index 1fc67f5..a635d06 100644
--- a/features/step_definitions/config_steps.rb
+++ b/features/step_definitions/config_steps.rb
@@ -4,12 +4,9 @@ Given /there is a config for the (.*)$/ do |config|
   @tempfile = Tempfile.new("#{config}.json")
   @tempfile.write @dummy_config
   @tempfile.close
-  if config == 'provider'
-    StaticConfigController::PROVIDER_JSON = @tempfile.path
-  else
-    @orig_config ||= APP_CONFIG.dup
-    APP_CONFIG[:config_file_paths].merge! "#{config}-service" => @tempfile.path
-  end
+  @orig_config ||= APP_CONFIG.dup
+  config = "#{config}-service" unless config == 'provider'
+  APP_CONFIG[:config_file_paths].merge! config => @tempfile.path
 end
 
 # use with @config