show test directories

JabRef · May 10, 2021 · a0f3130 · a0f3130
1 parent f9ce567
commit a0f3130
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Rakefile b/Rakefile
@@ -7,6 +7,8 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+puts "Running tests from #{Dir.pwd}"
+
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -92,20 +92,20 @@ def load_style(path)
   end
 
 def collect_styles(type = '')
-  Dir[File.join(STYLE_ROOT, type, '*.csl')].select do |filename|
+  dependence = type == '' ? 'independent' : type
+  glob = File.join(STYLE_ROOT, type, '*.csl')
+  print "\nLoading #{dependence} styles matching #{STYLE_FILTER.source} in #{glob}"
+
+  Dir[glob].select do |filename|
     filename =~ STYLE_FILTER
   end
 end
 
-print "\nLoading dependent styles"
-
 Dependents = Hash[collect_styles('dependent').each_with_index.map { |path, i|
   print '.' if i % 120 == 0
   load_style(path)
 }]
 
-print "\nLoading independent styles"
-
 Independents = Hash[collect_styles.each_with_index.map { |path, i|
   print '.'  if i % 120 == 0
   load_style(path)