github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

fix colors options, fixes #55

Browse Source
This commit is contained in:
John Bintz 2011-08-23 20:07:05 -04:00
parent 64037b205f
commit a46e72c1e2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jasmine/headless/options.rb
View File

@ -18,7 +18,7 @@ module Jasmine
:files => [] :files => []
} }
DEFAULTS_FILE = '.jasmine-headless-webkit' DEFAULTS_FILE = File.join(Dir.pwd, '.jasmine-headless-webkit')
GLOBAL_DEFAULTS_FILE = File.expand_path("~/#{DEFAULTS_FILE}") GLOBAL_DEFAULTS_FILE = File.expand_path("~/#{DEFAULTS_FILE}")
def self.from_command_line def self.from_command_line
@ -30,6 +30,7 @@ module Jasmine
def initialize(opts = {}) def initialize(opts = {})
@options = DEFAULT_OPTIONS.dup @options = DEFAULT_OPTIONS.dup
read_defaults_files
opts.each { |k, v| @options[k] = v if v } opts.each { |k, v| @options[k] = v if v }
end end

5
spec/lib/jasmine/headless/options_spec.rb
View File

@ -57,11 +57,6 @@ describe Jasmine::Headless::Options do
end end
it "should read the options" do 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[:colors].should be_true
options[:jasmine_config].should == 'test' options[:jasmine_config].should == 'test'
end end