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

This commit is contained in:
John Bintz 2011-10-17 09:25:42 -04:00
commit 8503d86aba
2 changed files with 3 additions and 1 deletions

View File

@ -1,3 +1,5 @@
require 'pathname'
module Jasmine::Headless module Jasmine::Headless
autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache' autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer' autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer'

View File

@ -21,7 +21,7 @@ module Jasmine
} }
DEFAULTS_FILE = File.join(Dir.pwd, '.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('~/.jasmine-headless-webkit')
def self.from_command_line def self.from_command_line
options = new options = new