fix colors options, fixes johnbintz#55

svenfuchs · Aug 24, 2011 · a46e72c · a46e72c
1 parent 64037b2
commit a46e72c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/lib/jasmine/headless/options.rb b/lib/jasmine/headless/options.rb
@@ -18,7 +18,7 @@ class Options
         :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 @@ def self.from_command_line
 
       def initialize(opts = {})
         @options = DEFAULT_OPTIONS.dup
+        read_defaults_files
         opts.each { |k, v| @options[k] = v if v }
       end
 

diff --git a/spec/lib/jasmine/headless/options_spec.rb b/spec/lib/jasmine/headless/options_spec.rb
@@ -57,11 +57,6 @@
     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