From a46e72c1e2a369fee60a28414f5e6a4e6da6451d Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 23 Aug 2011 20:07:05 -0400 Subject: [PATCH] fix colors options, fixes #55 --- lib/jasmine/headless/options.rb | 3 ++- spec/lib/jasmine/headless/options_spec.rb | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/jasmine/headless/options.rb b/lib/jasmine/headless/options.rb index 5017eb4..7afbd63 100644 --- a/lib/jasmine/headless/options.rb +++ b/lib/jasmine/headless/options.rb @@ -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 diff --git a/spec/lib/jasmine/headless/options_spec.rb b/spec/lib/jasmine/headless/options_spec.rb index e9d0142..e822da3 100644 --- a/spec/lib/jasmine/headless/options_spec.rb +++ b/spec/lib/jasmine/headless/options_spec.rb @@ -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