jasmine-coverage 0.1.5 → 0.1.6

data/README.md

@@ -26,10 +26,6 @@ To use jasmine-coverage, run the rake task.
 
     bundle exec rake jasmine:coverage
 
-Optionally, add a failure level percentage.
-
-    bundle exec rake jasmine:coverage JASMINE_COVERAGE_MINIMUM=75
-
 # Output
 
 You will see the tests execute, then a large blob of text, and finally a summary of the test coverage results.
@@ -47,6 +43,18 @@ Files generated will be
     target/jscoverage/jscoverage.json  -  The report data
     target/jscoverage/jscoverage-test-rig.html  -  The actual page that the tests executed in
 
+# Configuration
+
+You can set a failure level percentage.
+
+    bundle exec rake jasmine:coverage JASMINE_COVERAGE_MINIMUM=75
+
+In addition, as jasmine-coverage has to create a single folder environment for the Javascript sandbox to function correctly, it has to copy
+files into the _target/jscoverage/test_rig_ folder. By default, this is then cleaned up for you if the tests pass. If you'd like to see what files
+it generates regardless, you can specify that in an environment variable.
+
+    bundle exec rake jasmine:coverage JASMINE_COVERAGE_KEEP_TEST_RIG=true
+
 # How it works
 
 First Sprockets is interrogated to get a list of JS files concerned. This way, the right JS files

data/lib/jasmine/coverage/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Coverage
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/lib/tasks/jasmine_coverage.rake

@@ -40,6 +40,7 @@ if env =~ /^(development|test)$/
 
       Jasmine::Coverage.resources = files_map
       Jasmine::Coverage.output_dir = output_dir
+      test_rig_folder = "#{Jasmine::Coverage.output_dir}/test_rig"
 
       puts "\nCoverage will now be run. Expect a large block of compiled coverage data. This will be processed for you into target/jscoverage.\n\n"
 
@@ -57,14 +58,21 @@ if env =~ /^(development|test)$/
       errStr = errStr +"4) The source files are being loaded out of sequence (so global variables are not being declared in order)\n"
       errStr = errStr +"   To check this, run bundle exec jasmine-headless-webkit -l to see the ordering\n"
       errStr = errStr +"\nIn any case, try running the standard jasmine command to get better errors:\n\nbundle exec jasmine:headless\n"
-      errStr = errStr +"\nFinally, try opening the testrig in firefox to see the tests run in a browser and get a stacktrace. "
+      errStr = errStr +"\nFinally, try opening the test_rig in firefox to see the tests run in a browser and get a stacktrace. "
       errStr = errStr +"Chrome has strict security settings that make this difficult since it accesses the local filesystem from Javascript (but you can switch the settings off at the command line)\n\n"
       errStr = errStr +"\n**********************************************************************************************\n"
       errStr = errStr +"\nThe test rig file needs to load JS directly off disk, which Chrome prevents by default. Your best bet is to open the rig in Firefox.\n"
-      errStr = errStr +"\nThe file can be found here: #{Jasmine::Coverage.output_dir}/testrig/jscoverage-test-rig.html\n"
+      errStr = errStr +"\nThe file can be found here: #{test_rig_folder}/jscoverage-test-rig.html\n"
       errStr = errStr +"\n**********************************************************************************************\n"
       fail errStr if status_code == 1
 
+      # Delete the test_rig folder if not required
+      if ENV['JASMINE_COVERAGE_KEEP_TEST_RIG']
+        p "A copy of the page and files that were used as the jasmine test environment can be found here: #{test_rig_folder}"
+      else
+        FileUtils.rm_rf test_rig_folder
+      end
+
       # Obtain the console log, which includes the coverage report encoded within it
       contents = File.open("#{output_dir}/rawreport.txt") { |f| f.read }
       # Get our Base64.
@@ -89,7 +97,6 @@ if env =~ /^(development|test)$/
         conf = (ENV['JSCOVERAGE_MINIMUM'] || ENV['JASMINE_COVERAGE_MINIMUM'])
         fail "Coverage Fail: Javascript coverage was less than #{conf}%. It was #{coverage_pc}%." if conf && coverage_pc < conf.to_i
       end
-
     end
 
     def instrument folder, instrumented_sub_dir

data/lib/tasks/jasmine_headless_coverage_patches.rb

@@ -12,16 +12,16 @@ module Jasmine::Headless
       ret = old_write
       str = File.open(all_tests_filename, "rb").read
 
-      testrigfolder = Jasmine::Coverage.output_dir+"/testrig"
-      FileUtils.mkdir_p testrigfolder
+      test_rigfolder = Jasmine::Coverage.output_dir+"/test_rig"
+      FileUtils.mkdir_p test_rigfolder
 
-      p "\nCopying all view files and potential javascript fixture folders so the JS has access to the html fixtures.\n"
-      FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../../spec", "#{testrigfolder}/spec")
-      FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../../app", "#{testrigfolder}/app")
-      FileUtils.mkdir_p "#{testrigfolder}/target/fixtures"
-      FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../fixtures", "#{testrigfolder}/target/fixtures")
-      FileUtils.mkdir_p "#{testrigfolder}/target/views"
-      FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../views", "#{testrigfolder}/target/views")
+      p "Copying all view files and potential javascript fixture folders so the jasmine-coverage run has access to the html fixtures."
+      #FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../../spec", "#{test_rigfolder}/spec")
+      #FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../../app", "#{test_rigfolder}/app")
+      FileUtils.mkdir_p "#{test_rigfolder}/target/fixtures"
+      FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../fixtures", "#{test_rigfolder}/target/fixtures") rescue nil
+      FileUtils.mkdir_p "#{test_rigfolder}/target/views"
+      FileUtils.copy_entry("#{Jasmine::Coverage.output_dir}/../views", "#{test_rigfolder}/target/views") rescue nil
 
       jss = str.scan(/<script type="text\/javascript" src="(.*)"><\/script>/)
       jss << str.scan(/<link rel="stylesheet" href="(.*)" type="text\/css" \/>/)
@@ -30,24 +30,24 @@ module Jasmine::Headless
       jss.each { |s|
         js = File.basename(s)
         str.sub!(s, js)
-        if File.exists?("#{testrigfolder}/#{js}") && js != 'index.js'
-          s = "\n\n*******************************************************************\n"
+        if File.exists?("#{test_rigfolder}/#{js}") && js != 'index.js'
+          s = "\n\n*****************************************************************************************************************\n"
           s = s + "Cannot copy file '#{js}' into jasmine coverage test rig folder.\n"
           s = s + "There is already another file of that name. You either have two files with the same name (but in different paths)\n"
           s = s + "or your filename is the same as that from a third party vendor.\n"
-          s = s + "*******************************************************************\n\n"
+          s = s + "The problem stems from the fact that to run all js files from one folder (as is required by a serverless jasmine\n"
+          s = s + "test), all your js files must have unique names, even if they are in different folders in your app hierarchy.\n"
+          s = s + "*****************************************************************************************************************\n\n"
           raise s
         end
-        FileUtils.cp(s, testrigfolder)
+        FileUtils.cp(s, test_rigfolder)
       }
 
-      outfile = "#{testrigfolder}/jscoverage-test-rig.html"
+      outfile = "#{test_rigfolder}/jscoverage-test-rig.html"
       aFile = File.new(outfile, "w")
       aFile.write(str)
       aFile.close
 
-      puts "A copy of the complete page that was used as the test environment can be found here:"
-      puts "#{outfile}"
       ret
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-coverage
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: jasmine-headless-webkit
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0.rc.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0.rc.2
+    none: false
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: coffee-script-source
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: headless
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: 
 email:
 - harry@harrylascelles.com
@@ -80,20 +80,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A blend of JS unit testing and coverage