lib/uispecrunner/application.rb in uispecrunner-0.2.1 vs lib/uispecrunner/application.rb in uispecrunner-0.2.2
- old
+ new
@@ -18,10 +18,10 @@
# Read standard arguments from uispec.opts
options_file = 'uispec.opts'
if File.exists?(options_file)
option_file_args = File.readlines(options_file).map {|l| l.chomp.split " "}.flatten
- options = options.merge(UISpecRunner::Options.new(option_file_args))
+ options = UISpecRunner::Options.new(option_file_args).merge(options)
end
runner = UISpecRunner.new(options)
runner.run!
return 0