Load spec_hhelpers before spec definitions
This commit is contained in:
@@ -14,11 +14,11 @@ class JasmineHelper
|
||||
end
|
||||
|
||||
def self.spec_dir
|
||||
File.expand_path('spec/javascripts')
|
||||
File.expand_path('spec')
|
||||
end
|
||||
|
||||
def self.spec_files
|
||||
Dir.glob(File.join(spec_dir, "**/*[Ss]pec.js"))
|
||||
Dir.glob(File.join(spec_dir, "javascripts/**/*[Ss]pec.js"))
|
||||
end
|
||||
|
||||
def self.specs
|
||||
@@ -41,7 +41,15 @@ class JasmineHelper
|
||||
end
|
||||
|
||||
def self.meta_spec_path
|
||||
File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'jasmine-ruby', 'jasmine_meta_spec.rb'))
|
||||
File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'jasmine-ruby', 'jasmine_meta_spec.rb'))
|
||||
end
|
||||
|
||||
def self.files
|
||||
[]
|
||||
end
|
||||
|
||||
def self.stylesheets
|
||||
[]
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -5,7 +5,10 @@ require File.expand_path(File.join(JasmineHelper.root, "contrib/ruby/jasmine_spe
|
||||
|
||||
jasmine_runner = Jasmine::Runner.new(SeleniumRC::Server.new.jar_path,
|
||||
JasmineHelper.specs,
|
||||
JasmineHelper.dir_mappings)
|
||||
JasmineHelper.dir_mappings,
|
||||
{ :spec_helpers => JasmineHelper.files + JasmineHelper.spec_helpers,
|
||||
:stylesheets => JasmineHelper.stylesheets
|
||||
})
|
||||
|
||||
spec_builder = Jasmine::SpecBuilder.new(JasmineHelper.spec_files, jasmine_runner)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user