From d5e44fe9a5aea1d000a7569709afdda4517867aa Mon Sep 17 00:00:00 2001 From: Ryan Carver Date: Thu, 30 Jun 2011 12:27:57 -0700 Subject: [PATCH] change Jasmine.root to Jasmine::Core.path to work with jasmine 1.1 --- jasmine-headless-webkit.gemspec | 2 +- lib/jasmine/files_list.rb | 4 ++-- spec/lib/jasmine/files_list_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jasmine-headless-webkit.gemspec b/jasmine-headless-webkit.gemspec index 6338b32..7d54a0f 100644 --- a/jasmine-headless-webkit.gemspec +++ b/jasmine-headless-webkit.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] - s.add_dependency 'jasmine' + s.add_dependency 'jasmine', '~>1.1.beta' s.add_dependency 'coffee-script', '>= 2.2' s.add_dependency 'rainbow' end diff --git a/lib/jasmine/files_list.rb b/lib/jasmine/files_list.rb index 031bb7f..9849410 100644 --- a/lib/jasmine/files_list.rb +++ b/lib/jasmine/files_list.rb @@ -14,8 +14,8 @@ module Jasmine attr_reader :files, :filtered_files, :spec_outside_scope DEFAULT_FILES = [ - File.join(Jasmine.root, "lib/jasmine.js"), - File.join(Jasmine.root, "lib/jasmine-html.js"), + File.join(Jasmine::Core.path, "jasmine.js"), + File.join(Jasmine::Core.path, "jasmine-html.js"), File.expand_path('../../../jasmine/jasmine.headless-reporter.js', __FILE__) ] diff --git a/spec/lib/jasmine/files_list_spec.rb b/spec/lib/jasmine/files_list_spec.rb index 410dc26..dec8a9b 100644 --- a/spec/lib/jasmine/files_list_spec.rb +++ b/spec/lib/jasmine/files_list_spec.rb @@ -9,8 +9,8 @@ describe Jasmine::FilesList do describe '#initialize' do it "should have default files" do files_list.files.should == [ - File.join(Jasmine.root, "lib/jasmine.js"), - File.join(Jasmine.root, "lib/jasmine-html.js"), + File.join(Jasmine::Core.path, "jasmine.js"), + File.join(Jasmine::Core.path, "jasmine-html.js"), File.expand_path('jasmine/jasmine.headless-reporter.js') ] end