remove our distribution of jasmine and use the gem
This commit is contained in:
parent
603ba69f77
commit
d24e41198c
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "jasmine"]
|
||||
path = jasmine
|
||||
url = https://github.com/pivotal/jasmine.git
|
@ -7,6 +7,8 @@ require 'yaml'
|
||||
require 'fileutils'
|
||||
require 'getoptlong'
|
||||
|
||||
require 'rubygems'
|
||||
require 'jasmine'
|
||||
require 'jasmine/cli'
|
||||
|
||||
include Jasmine::CLI
|
||||
@ -44,9 +46,8 @@ end
|
||||
puts "Running Jasmine specs..."
|
||||
|
||||
files = [
|
||||
'file://' + File.join(gem_dir, 'jasmine/lib/jasmine.js'),
|
||||
'file://' + File.join(gem_dir, 'jasmine/lib/jasmine-html.js'),
|
||||
'file://' + File.join(gem_dir, 'jasmine/lib/jasmine.css')
|
||||
'file://' + File.join(Jasmine.root, 'lib/jasmine.js'),
|
||||
'file://' + File.join(Jasmine.root, 'lib/jasmine-html.js'),
|
||||
]
|
||||
|
||||
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|
|
||||
path = search
|
||||
path = File.join(data[root], path) if data[root]
|
||||
p path
|
||||
Dir[path]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
p files
|
||||
|
||||
files = files.flatten.compact.collect { |file|
|
||||
case File.extname(file)
|
||||
when '.js'
|
||||
|
1
jasmine
1
jasmine
@ -1 +0,0 @@
|
||||
Subproject commit e826fbb17088f9e31a570ac4e09a738592af7b30
|
@ -21,4 +21,5 @@ Gem::Specification.new do |s|
|
||||
s.require_paths = ["lib"]
|
||||
|
||||
s.add_dependency 'jasmine'
|
||||
s.add_dependency 'coffee-script-source'
|
||||
end
|
||||
|
@ -4,7 +4,7 @@ module Jasmine
|
||||
'spec_files' => [ '**/*[sS]pec.js' ],
|
||||
'helpers' => [ 'helpers/**/*.js' ],
|
||||
'spec_dir' => 'spec/javascripts',
|
||||
'src_dir' => '',
|
||||
'src_dir' => nil,
|
||||
'stylesheets' => [],
|
||||
'src_files' => []
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ describe Jasmine::CLI do
|
||||
'stylesheets' => [],
|
||||
'helpers' => [ 'helpers/**/*.js' ],
|
||||
'spec_files' => [ '**/*[sS]pec.js' ],
|
||||
'src_dir' => '',
|
||||
'src_dir' => nil,
|
||||
'spec_dir' => 'spec/javascripts'
|
||||
}
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user