github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

Jasmine 1.1 compatibility #31

Merged
rcarver merged 1 commits from jasmine-1-1 into master 2011-06-30 21:42:54 +00:00
Conversation 1 Commits 1 Files Changed 3 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5e44fe9a5 - Show all commits

2
jasmine-headless-webkit.gemspec
View File

@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"] 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 'coffee-script', '>= 2.2'
s.add_dependency 'rainbow' s.add_dependency 'rainbow'
end end

4
lib/jasmine/files_list.rb
View File

@ -14,8 +14,8 @@ module Jasmine
attr_reader :files, :filtered_files, :spec_outside_scope attr_reader :files, :filtered_files, :spec_outside_scope
DEFAULT_FILES = [ DEFAULT_FILES = [
File.join(Jasmine.root, "lib/jasmine.js"), File.join(Jasmine::Core.path, "jasmine.js"),
File.join(Jasmine.root, "lib/jasmine-html.js"), File.join(Jasmine::Core.path, "jasmine-html.js"),
File.expand_path('../../../jasmine/jasmine.headless-reporter.js', __FILE__) File.expand_path('../../../jasmine/jasmine.headless-reporter.js', __FILE__)
] ]

4
spec/lib/jasmine/files_list_spec.rb
View File

@ -9,8 +9,8 @@ describe Jasmine::FilesList do
describe '#initialize' do describe '#initialize' do
it "should have default files" do it "should have default files" do
files_list.files.should == [ files_list.files.should == [
File.join(Jasmine.root, "lib/jasmine.js"), File.join(Jasmine::Core.path, "jasmine.js"),
File.join(Jasmine.root, "lib/jasmine-html.js"), File.join(Jasmine::Core.path, "jasmine-html.js"),
File.expand_path('jasmine/jasmine.headless-reporter.js') File.expand_path('jasmine/jasmine.headless-reporter.js')
] ]
end end