Merge branch 'master' of github.com:johnbintz/jasmine-headless-webkit

2011-10-17 09:25:42 -04:00 · 2011-10-17 09:25:42 -04:00 · 8503d86aba
commit 8503d86aba
parent 42ed3e6013 919ce4f79c
2 changed files with 3 additions and 1 deletions
--- a/lib/jasmine/headless.rb
+++ b/lib/jasmine/headless.rb
@ -1,3 +1,5 @@
+require 'pathname'
+
 module Jasmine::Headless
  autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
  autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer'
--- a/lib/jasmine/headless/options.rb
+++ b/lib/jasmine/headless/options.rb
@ -21,7 +21,7 @@ module Jasmine
      }

      DEFAULTS_FILE = File.join(Dir.pwd, '.jasmine-headless-webkit')
-      GLOBAL_DEFAULTS_FILE = File.expand_path("~/#{DEFAULTS_FILE}")
+      GLOBAL_DEFAULTS_FILE = File.expand_path('~/.jasmine-headless-webkit')

      def self.from_command_line
        options = new