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

remove our distribution of jasmine and use the gem

Browse Source
This commit is contained in:
John Bintz 2011-05-06 14:16:25 -04:00
parent 603ba69f77
commit d24e41198c
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "jasmine"]
path = jasmine
url = https://github.com/pivotal/jasmine.git

10
bin/jasmine-headless-webkit
View File

@ -7,6 +7,8 @@ require 'yaml'
require 'fileutils' require 'fileutils'
require 'getoptlong' require 'getoptlong'
require 'rubygems'
require 'jasmine'
require 'jasmine/cli' require 'jasmine/cli'
include Jasmine::CLI include Jasmine::CLI
@ -44,9 +46,8 @@ end
puts "Running Jasmine specs..." puts "Running Jasmine specs..."
files = [ files = [
'file://' + File.join(gem_dir, 'jasmine/lib/jasmine.js'), 'file://' + File.join(Jasmine.root, 'lib/jasmine.js'),
'file://' + File.join(gem_dir, 'jasmine/lib/jasmine-html.js'), 'file://' + File.join(Jasmine.root, 'lib/jasmine-html.js'),
'file://' + File.join(gem_dir, 'jasmine/lib/jasmine.css')
] ]
files += [ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'helpers', 'spec_dir' ], [ 'spec_files', 'spec_dir' ] ].collect do |searches, root| files += [ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'helpers', 'spec_dir' ], [ 'spec_files', 'spec_dir' ] ].collect do |searches, root|
@ -57,11 +58,14 @@ files += [ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'helpers'
data[searches].collect do |search| data[searches].collect do |search|
path = search path = search
path = File.join(data[root], path) if data[root] path = File.join(data[root], path) if data[root]
p path
Dir[path] Dir[path]
end end
end end
end end
p files
files = files.flatten.compact.collect { |file| files = files.flatten.compact.collect { |file|
case File.extname(file) case File.extname(file)
when '.js' when '.js'

1
jasmine

@ -1 +0,0 @@
Subproject commit e826fbb17088f9e31a570ac4e09a738592af7b30

1
jasmine-headless-webkit.gemspec
View File

@ -21,4 +21,5 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"] s.require_paths = ["lib"]
s.add_dependency 'jasmine' s.add_dependency 'jasmine'
s.add_dependency 'coffee-script-source'
end end

2
lib/jasmine/cli.rb
View File

@ -4,7 +4,7 @@ module Jasmine
'spec_files' => [ '**/*[sS]pec.js' ], 'spec_files' => [ '**/*[sS]pec.js' ],
'helpers' => [ 'helpers/**/*.js' ], 'helpers' => [ 'helpers/**/*.js' ],
'spec_dir' => 'spec/javascripts', 'spec_dir' => 'spec/javascripts',
'src_dir' => '', 'src_dir' => nil,
'stylesheets' => [], 'stylesheets' => [],
'src_files' => [] 'src_files' => []
} }

2
spec/lib/jasmine/cli_spec.rb
View File

@ -14,7 +14,7 @@ describe Jasmine::CLI do
'stylesheets' => [], 'stylesheets' => [],
'helpers' => [ 'helpers/**/*.js' ], 'helpers' => [ 'helpers/**/*.js' ],
'spec_files' => [ '**/*[sS]pec.js' ], 'spec_files' => [ '**/*[sS]pec.js' ],
'src_dir' => '', 'src_dir' => nil,
'spec_dir' => 'spec/javascripts' 'spec_dir' => 'spec/javascripts'
} }
end end