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

ensure files are not required twice, fixes #10 (h/t @dnagir)

Browse Source
This commit is contained in:
John Bintz 2011-06-11 09:54:15 -04:00
parent 46d1027982
commit c29757ad9f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jasmine/files_list.rb
View File

@ -98,7 +98,7 @@ module Jasmine
data[searches].collect do |search|
path = search
path = File.join(data[root], path) if data[root]
found_files = Dir[path]
found_files = Dir[path] - @files
@files += found_files

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

@ -24,13 +24,14 @@ describe Jasmine::FilesList do
let(:src_dir) { 'src' }
let(:spec_dir) { 'spec' }
let(:first_file) { File.join(src_dir, 'js/first_file.js') }
let(:src_file) { File.join(src_dir, 'js/src_file.js') }
let(:spec_file) { File.join(spec_dir, 'spec_file_spec.js') }
let(:helper_file) { File.join(spec_dir, 'helper/helper_file.js') }
let(:stylesheet_file) { File.join(src_dir, 'stylesheet/blah.css') }
before do
[ src_file, spec_file, helper_file, stylesheet_file ].each do |file|
[ first_file, src_file, spec_file, helper_file, stylesheet_file ].each do |file|
File.open(file, 'w')
end
end
@ -38,7 +39,7 @@ describe Jasmine::FilesList do
let(:config) { {
'src_dir' => src_dir,
'spec_dir' => spec_dir,
'src_files' => [ 'js/*.js' ],
'src_files' => [ 'js/first_file.js', 'js/*.js' ],
'spec_files' => [ '*_spec.js' ],
'helpers' => [ 'helper/*.js' ],
'stylesheets' => [ 'stylesheet/*.css' ]
@ -46,6 +47,7 @@ describe Jasmine::FilesList do
it 'should read the data from the jasmine.yml file and add the files' do
files_list.files.should == Jasmine::FilesList::DEFAULT_FILES + [
File.expand_path(first_file),
File.expand_path(src_file),
File.expand_path(stylesheet_file),
File.expand_path(helper_file),