lib/taza/settings.rb in bret-watircraft-0.4.5 vs lib/taza/settings.rb in bret-watircraft-0.5.0
- old
+ new
@@ -25,11 +25,11 @@
env_settings[key.to_sym] = ENV[key.upcase] if ENV[key.upcase]
end
# Because of the way #merge works, the settings at the bottom of the list
# trump those at the top.
- settings = environment_settings.merge(
- default_settings.merge(
+ settings = default_settings.merge(
+ environment_settings.merge(
config_file.merge(
env_settings)))
settings[:browser] = settings[:browser].to_s
settings[:driver] = settings[:driver].to_s