fix colors options, fixes #55
This commit is contained in:
parent
64037b205f
commit
a46e72c1e2
@ -18,7 +18,7 @@ module Jasmine
|
||||
:files => []
|
||||
}
|
||||
|
||||
DEFAULTS_FILE = '.jasmine-headless-webkit'
|
||||
DEFAULTS_FILE = File.join(Dir.pwd, '.jasmine-headless-webkit')
|
||||
GLOBAL_DEFAULTS_FILE = File.expand_path("~/#{DEFAULTS_FILE}")
|
||||
|
||||
def self.from_command_line
|
||||
@ -30,6 +30,7 @@ module Jasmine
|
||||
|
||||
def initialize(opts = {})
|
||||
@options = DEFAULT_OPTIONS.dup
|
||||
read_defaults_files
|
||||
opts.each { |k, v| @options[k] = v if v }
|
||||
end
|
||||
|
||||
|
@ -57,11 +57,6 @@ describe Jasmine::Headless::Options do
|
||||
end
|
||||
|
||||
it "should read the options" do
|
||||
options[:colors].should be_false
|
||||
options[:jasmine_config].should == 'spec/javascripts/support/jasmine.yml'
|
||||
|
||||
options.read_defaults_files
|
||||
|
||||
options[:colors].should be_true
|
||||
options[:jasmine_config].should == 'test'
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user