Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #31 from rcarver/jasmine-1-1

Jasmine 1.1 compatibility
  • Loading branch information...
commit 6454c329faaa6255dde1ae162f5650613ff6f5b2 2 parents 1d3991f + d5e44fe
@johnbintz johnbintz authored
View
2  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
View
4 lib/jasmine/files_list.rb
@@ -14,8 +14,8 @@ class FilesList
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__)
]
View
4 spec/lib/jasmine/files_list_spec.rb
@@ -9,8 +9,8 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.