learn-test 1.2.25 → 1.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fef75741704908c87c1de0eddf32855448529a0
-  data.tar.gz: c4643a237fd652d42adf2672116c8bf18c903d17
+  metadata.gz: 34bfbc3b76dddc66031d2b5cd1219a412f490354
+  data.tar.gz: d5a26157552218763f27cdee4d12dac7e38e7dd8
 SHA512:
-  metadata.gz: f5e43c02992dcd9ca1f91a1c5b93e6231fcd4368720cc36f7141e6e91ac8c715bb2ae1f3673045ca60ee721ddfde8318354dad10e9c03ccf68eedaabef1db852
-  data.tar.gz: 6617c5d9e46ca66f61bc75c2a176c90e52747a389101227fd66ac5a1f7ec32883a2d35f78c6c0db3a477b46291a7b7264d227297ba0d50bdbe663b55d6070454
+  metadata.gz: ab0ce891184c8c0e20f3ab3b35fce1feda5cb57d11e62ac6e4351e3ddfc0e949e5a565177d7b6f2d89d495c632fb14d0ff58bb1cee86695062f912df7a93a767
+  data.tar.gz: 9bf5c0067ad6eeae26f94cc13dee01e22872c78fdd852ae53bebb5d9c71ae74c2ab9505e23952a4ce6e72699f8ca3e8da3faad73bac3d9b8c162ca3223a57373

data/learn-test.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Flatiron School"]
   spec.email         = ["learn@flatironschool.com"]
   spec.summary       = %q{Runs RSpec, Jasmine, and Python Unit Test builds and pushes JSON output to Learn.}
-  spec.homepage      = "https://learn.co"
+  spec.homepage      = "https://github.com/learn-co/learn-test"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/learn_test/jasmine/runners/run-jasmine.js

@@ -1,23 +1,20 @@
-/* globals jasmine, phantom */
-
-// assign args based on phantomjs version
-if ( phantom.version.major === 2 ) {
-    // NOTE phantom has depricated phantom.args in 2.0
-    // use system.args instead
-    var system = require('system');
-    var args = system.args;
+/* globals jasmineRequire, phantom */
+// Verify arguments
+var system = require('system');
+var args;
+
+if(phantom.args) {
+    args = phantom.args;
 } else {
-    var system = null;
-    var args = phantom.args;
+    args = system.args.slice(1);//use system args for phantom 2.0+
 }
 
-// Verify arguments
-if ( (phantom.version.major === 1 && !args.length ) || ( !args.length ) ) {
+if (args.length === 0) {
     console.log("Simple JasmineBDD test runner for phantom.js");
     console.log("Usage: phantomjs-testrunner.js url_to_runner.html");
     console.log("Accepts http:// and file:// urls");
     console.log("");
-    console.log("NOTE: This script depends on jasmine.TrivialReporter being used\non the page, for the DOM elements it creates.\n");
+    console.log("NOTE: This script depends on jasmine.HtmlReporter being used\non the page, for the DOM elements it creates.\n");
     phantom.exit(2);
 }
 else {
@@ -28,7 +25,6 @@ else {
 
     var setupPageFn = function(p, k) {
         return function() {
-            overloadPageEvaluate(p);
             setupWriteFileFunction(p, k, fs.separator);
         };
     };
@@ -37,6 +33,9 @@ else {
         address = args[i];
         console.log("Loading " + address);
 
+        // if provided a url without a protocol, try to use file://
+        address = address.indexOf("://") === -1 ? "file://" + address : address;
+
         // create a WebPage object to work with
         page = require("webpage").create();
         page.url = address;
@@ -76,7 +75,6 @@ function logAndWorkAroundDefaultLineBreaking(msg) {
     var interpretAsWithoutNewline = /(^(\033\[\d+m)*[\.F](\033\[\d+m)*$)|( \.\.\.$)/;
     if (navigator.userAgent.indexOf("Windows") < 0 && interpretAsWithoutNewline.test(msg)) {
         try {
-            var system = require('system');
             system.stdout.write(msg);
         } catch (e) {
             var fs = require('fs');
@@ -109,14 +107,14 @@ function replaceFunctionPlaceholders(fn, replacements) {
 }
 
 /**
- * Replaces the "evaluate" method with one we can easily do substitution with.
+ * Custom "evaluate" method which we can easily do substitution with.
  *
  * @param {phantomjs.WebPage} page The WebPage object to overload
+ * @param {function} fn The function to replace occurrences within.
+ * @param {object} replacements Key => Value object of string replacements.
  */
-function overloadPageEvaluate(page) {
-    page._evaluate = page.evaluate;
-    page.evaluate = function(fn, replacements) { return page._evaluate(replaceFunctionPlaceholders(fn, replacements)); };
-    return page;
+function evaluate(page, fn, replacements) {
+    return page.evaluate(replaceFunctionPlaceholders(fn, replacements));
 }
 
 /** Stubs a fake writeFile function into the test runner.
@@ -127,7 +125,7 @@ function overloadPageEvaluate(page) {
  */
 // TODO: not bothering with error checking for now (closed environment)
 function setupWriteFileFunction(page, key, path_separator) {
-    page.evaluate(function(){
+    evaluate(page, function(){
         window["%resultsObj%"] = {};
         window.fs_path_separator = "%fs_path_separator%";
         window.__phantom_writeFile = function(filename, text) {
@@ -144,7 +142,7 @@ function setupWriteFileFunction(page, key, path_separator) {
  *                     be the same key provided to setupWriteFileFunction.
  */
 function getXmlResults(page, key) {
-    return page.evaluate(function(){
+    return evaluate(page, function(){
         return window["%resultsObj%"] || {};
     }, {resultsObj: key});
 }
@@ -168,20 +166,28 @@ function processPage(status, page, resultsKey) {
     }
     else {
         var isFinished = function() {
-            return page.evaluate(function(){
+            return evaluate(page, function(){
                 // if there's a JUnitXmlReporter, return a boolean indicating if it is finished
-                if (window.done) {
-                    return window.done
+                if (window.jasmineReporters && window.jasmineReporters.startTime) {
+                    return !!window.jasmineReporters.endTime;
+                }
+                // otherwise, scrape the DOM for the HtmlReporter "finished in ..." output
+                var durElem = document.querySelector(".html-reporter .duration");
+                if (!durElem) {
+                    durElem = document.querySelector(".jasmine_html-reporter .duration");
                 }
-                // otherwise, see if there is anything in a "finished-at" element
-                return false;
+                return durElem && durElem.textContent && durElem.textContent.toLowerCase().indexOf("finished in") === 0;
             });
         };
-        var getResults = function() {
-            return page.evaluate(function(){
-                return document.getElementsByClassName("bar").length &&
-                       document.getElementsByClassName("bar")[0].innerHTML.match(/(\d+) spec.* (\d+) failure.*/) ||
-                       ["Unable to determine success or failure."];
+        var getResultsFromHtmlRunner = function() {
+            return evaluate(page, function(){
+                var resultElem = document.querySelector(".html-reporter .alert .bar");
+                if (!resultElem) {
+                    resultElem = document.querySelector(".jasmine_html-reporter .alert .bar");
+                }
+                return resultElem && resultElem.textContent &&
+                    resultElem.textContent.match(/(\d+) spec.* (\d+) failure.*/) ||
+                   ["Unable to determine success or failure."];
             });
         };
         var timeout = 60000;
@@ -199,20 +205,16 @@ function processPage(status, page, resultsKey) {
                 }
 
                 // print out a success / failure message of the results
-                // var results = getResults();
-                // var failures = Number(results[2]);
-                // if (failures > 0) {
-                //     console.error(results[0])
-                //     page.__exit_code = 1;
-                //     clearInterval(ival);
-                // }
-                // else {
-                //     console.log(results[0]);
-                //     page.__exit_code = 0;
-                //     clearInterval(ival);
-                // }
-
-                page.__exit_code = 0;
+                var results = getResultsFromHtmlRunner();
+                var failures = Number(results[2]);
+                if (failures > 0) {
+                    page.__exit_code = 1;
+                    clearInterval(ival);
+                }
+                else {
+                    page.__exit_code = 0;
+                    clearInterval(ival);
+                }
             }
             else {
                 timeout -= loopInterval;
@@ -225,4 +227,3 @@ function processPage(status, page, resultsKey) {
         }, loopInterval);
     }
 }
-

data/lib/learn_test/version.rb

@@ -1,3 +1,3 @@
 module LearnTest
-  VERSION = '1.2.25'
+  VERSION = '1.2.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 1.2.25
+  version: 1.2.26
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,7 +197,7 @@ files:
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
-homepage: https://learn.co
+homepage: https://github.com/learn-co/learn-test
 licenses:
 - MIT
 metadata: {}
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Runs RSpec, Jasmine, and Python Unit Test builds and pushes JSON output to