diff --git a/lib/jasmine.js b/lib/jasmine.js index f7355b1c..877a6975 100644 --- a/lib/jasmine.js +++ b/lib/jasmine.js @@ -2467,5 +2467,5 @@ jasmine.version_= { "major": 1, "minor": 1, "build": 0, - "revision": 1307672575 + "revision": 1307830575 } diff --git a/tasks/spec.rb b/tasks/spec.rb index 4e411cb7..aeda8bc8 100644 --- a/tasks/spec.rb +++ b/tasks/spec.rb @@ -1,18 +1,39 @@ desc "Run spec suite: Browser, Node, JSHint" -task :spec => ["build_jasmine_js", "spec:node", "spec:browser"] +task :spec => ["build_jasmine_js", "count_specs", "spec:node", "spec:browser"] desc 'Run specs in Node.js' -task "spec:node" => :require_node do +task "spec:node" => [:count_specs, :require_node] do puts "Running all appropriate specs via Node.js" system("node spec/node_suite.js") end desc "Run specs in the default browser (MacOS only)" -task "spec:browser" => :build_runner_html do +task "spec:browser" => [:count_specs, :build_runner_html] do puts "Running all appropriate specs via the default web browser" system("open spec/runner.html") end -#def core_spec_count -# -#end \ No newline at end of file +desc "Count number of specs in Jasmine core" +task :count_specs do + core_specs_count = count_specs_in(Dir.glob('spec/core/*.js')) + console_spec_count = count_specs_in(Dir.glob('spec/console/*.js')) + html_spec_count = count_specs_in(Dir.glob('spec/html/*.js')) + + puts "\n" + puts "#{yellow(core_specs_count + console_spec_count)} specs for Node.js runner (exclude DOM-related specs)" + puts "#{yellow(core_specs_count + console_spec_count + html_spec_count)} specs for Browser runner (all specs)" + puts "\n" + puts "Please verify that these numbers match the runner output." + puts "\n" +end + +def count_specs_in(files) + files.inject(0) do |count, file| + File.read(file).scan(/\sit\(/) {|s| count += 1} + count + end +end + +def yellow(str) + "\033[33m#{str}\033[0m" +end \ No newline at end of file