kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-06-19 18:24:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

ensure helpers are only included once

Browse Source 
* rename file arrays to clarify their contents
  * remove helpers from specs array before filtering
This commit is contained in:
Marc Schwieterman
2012-07-08 16:12:21 -04:00
parent 32690798e5
commit 93657d2399
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/motion/project/config.rb
View File

@@ -325,18 +325,18 @@ EOS
def spec_files
@spec_files ||= begin
# Core library + core helpers.
files = Dir.chdir(File.join(File.dirname(__FILE__), '..')) { (['spec.rb'] + Dir.glob(File.join('spec', 'helpers', '*.rb'))).map { |x| File.expand_path(x) } }
core = Dir.chdir(File.join(File.dirname(__FILE__), '..')) { (['spec.rb'] + Dir.glob(File.join('spec', 'helpers', '*.rb'))).map { |x| File.expand_path(x) } }
# Project helpers.
files += Dir.glob(File.join(specs_dir, 'helpers', '*.rb'))
helpers = Dir.glob(File.join(specs_dir, 'helpers', '*.rb'))
# Project specs.
specs = Dir.glob(File.join(specs_dir, '**', '*.rb'))
specs = Dir.glob(File.join(specs_dir, '**', '*.rb')) - helpers
if files_filter = ENV['files']
# Filter specs we want to run. A filter can be either the basename of a spec file or its path.
files_filter = files_filter.split(',')
files_filter.map! { |x| File.exist?(x) ? File.expand_path(x) : x }
specs.delete_if { |x| !files_filter.include?(File.expand_path(x)) and !files_filter.include?(File.basename(x, '.rb')) }
end
files + specs
core + helpers + specs
end
end