jasmine-core 2.0.4 → 2.1.3

package/CONTRIBUTING.md

@@ -100,7 +100,7 @@ Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to te
 
 ...and then visit `http://localhost:8888` to run specs.
 
-Jasmine uses Node.js with a custom runner to test outside of a browser.
+Jasmine uses the [Jasmine NPM package](http://github.com/pivotal/jasmine-npm) to test itself in a Node.js/npm environment.
 
     $ grunt execSpecsInNode
 

package/README.md

@@ -1,6 +1,6 @@
 <a name="README">[<img src="https://rawgithub.com/pivotal/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a> 
 
-[![Build Status](https://travis-ci.org/pivotal/jasmine.png?branch=master)](https://travis-ci.org/pivotal/jasmine) [![Code Climate](https://codeclimate.com/github/pivotal/jasmine.png)](https://codeclimate.com/github/pivotal/jasmine)
+[![Build Status](https://travis-ci.org/jasmine/jasmine.png?branch=master)](https://travis-ci.org/jasmine/jasmine) [![Code Climate](https://codeclimate.com/github/pivotal/jasmine.png)](https://codeclimate.com/github/pivotal/jasmine)
 
 =======
 
@@ -53,12 +53,13 @@ For the Jasmine Python Egg:<br>
 
 ## Maintainers
 
-* [Davis W. Frank](mailto:dwfrank@pivotallabs.com), Pivotal Labs
-* [Rajan Agaskar](mailto:rajan@pivotallabs.com), Pivotal Labs
-* [Sheel Choksi](mailto:schoksi@pivotallabs.com), Pivotal Labs
+* [Davis W. Frank](mailto:dwfrank@pivotal.io), Pivotal Labs
+* [Rajan Agaskar](mailto:rajan@pivotal.io), Pivotal Labs
+* [Gregg Van Hove](mailto:ghove@pivotal.io), Pivotal Labs
 
 ### Maintainers Emeritus
 
-* [Christian Williams](mailto:antixian666@gmail.com), Square
+* [Christian Williams](mailto:antixian666@gmail.com), Cloud Foundry
+* Sheel Choksi
 
 Copyright (c) 2008-2014 Pivotal Labs. This software is licensed under the MIT License.

package/RELEASE.md

@@ -33,7 +33,7 @@ When ready to release - specs are all green and the stories are done:
 
 1. Build the standalone distribution with `grunt buildStandaloneDist`
 1. Make sure you add the new ZIP file to git
- 1. Should we still do this? Given we want to use guthub releases...
+ 1. Should we still do this? Given we want to use github releases...
 
 ### Release the Python egg
 
@@ -52,6 +52,13 @@ When ready to release - specs are all green and the stories are done:
 1. `npm adduser` to save your credentials locally
 1. `npm publish .` to publish what's in `package.json`
 
+### Release the docs
+
+Probably only need to do this when releasing a minor version, and not a patch version.
+
+1. `cp edge ${version}` to copy the current edge docs to the new version
+1. Add a link to the new version in `index.html`
+
 ### Finally
 
 1. Visit the [Releases page for Jasmine](https://github.com/pivotal/jasmine/releases), find the tag just pushed.

package/lib/console/console.js

@@ -54,7 +54,10 @@ getJasmineRequireObj().ConsoleReporter = function() {
         red: '\x1B[31m',
         yellow: '\x1B[33m',
         none: '\x1B[0m'
-      };
+      },
+      failedSuites = [];
+
+    print('ConsoleReporter is deprecated and will be removed in a future version.');
 
     this.jasmineStarted = function() {
       specCount = 0;
@@ -89,9 +92,12 @@ getJasmineRequireObj().ConsoleReporter = function() {
       printNewline();
       var seconds = timer.elapsed() / 1000;
       print('Finished in ' + seconds + ' ' + plural('second', seconds));
-
       printNewline();
 
+      for(i = 0; i < failedSuites.length; i++) {
+        suiteFailureDetails(failedSuites[i]);
+      }
+
       onComplete(failureCount === 0);
     };
 
@@ -116,6 +122,13 @@ getJasmineRequireObj().ConsoleReporter = function() {
       }
     };
 
+    this.suiteDone = function(result) {
+      if (result.failedExpectations && result.failedExpectations.length > 0) {
+        failureCount++;
+        failedSuites.push(result);
+      }
+    };
+
     return this;
 
     function printNewline() {
@@ -160,6 +173,17 @@ getJasmineRequireObj().ConsoleReporter = function() {
 
       printNewline();
     }
+
+    function suiteFailureDetails(result) {
+      for (var i = 0; i < result.failedExpectations.length; i++) {
+        printNewline();
+        print(colored('red', 'An error was thrown in an afterAll'));
+        printNewline();
+        print(colored('red', 'AfterAll ' + result.failedExpectations[i].message));
+
+      }
+      printNewline();
+    }
   }
 
   return ConsoleReporter;

package/lib/jasmine-core/boot.js

@@ -21,7 +21,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 /**
- Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
+ Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js` and `jasmine_html.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
 
  If a project is using Jasmine via the standalone distribution, this file can be customized directly. If a project is using Jasmine via the [Ruby gem][jasmine-gem], this file can be copied into the support directory via `jasmine copy_boot_js`. Other environments (e.g., Python) will have different mechanisms.
 

package/lib/jasmine-core/example/node_example/spec/PlayerSpec.js

@@ -1,6 +1,6 @@
 describe("Player", function() {
-  var Player = require('../../jasmine_examples/Player.js');
-  var Song = require('../../jasmine_examples/Song.js');
+  var Player = require('../src/Player.js');
+  var Song = require('../src/Song.js');
   var player;
   var song;
 

package/lib/jasmine-core/jasmine-html.js

@@ -46,7 +46,8 @@ jasmineRequire.HtmlReporter = function(j$) {
       failureCount = 0,
       pendingSpecCount = 0,
       htmlReporterMain,
-      symbols;
+      symbols,
+      failedSuites = [];
 
     this.initialize = function() {
       clearPrior();
@@ -83,6 +84,10 @@ jasmineRequire.HtmlReporter = function(j$) {
     };
 
     this.suiteDone = function(result) {
+      if (result.status == 'failed') {
+        failedSuites.push(result);
+      }
+
       if (currentParent == topResults) {
         return;
       }
@@ -96,7 +101,7 @@ jasmineRequire.HtmlReporter = function(j$) {
 
     var failures = [];
     this.specDone = function(result) {
-      if(noExpectations(result) && console && console.error) {
+      if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') {
         console.error('Spec \'' + result.fullName + '\' has no expectations.');
       }
 
@@ -178,6 +183,15 @@ jasmineRequire.HtmlReporter = function(j$) {
 
       alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage));
 
+      for(i = 0; i < failedSuites.length; i++) {
+        var failedSuite = failedSuites[i];
+        for(var j = 0; j < failedSuite.failedExpectations.length; j++) {
+          var errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message;
+          var errorBarClassName = 'bar errored';
+          alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessage));
+        }
+      }
+
       var results = find('.results');
       results.appendChild(summary);
 

package/lib/jasmine-core/jasmine.css

@@ -30,6 +30,7 @@ body { overflow-y: scroll; }
 .jasmine_html-reporter .bar.failed { background-color: #ca3a11; }
 .jasmine_html-reporter .bar.passed { background-color: #007069; }
 .jasmine_html-reporter .bar.skipped { background-color: #bababa; }
+.jasmine_html-reporter .bar.errored { background-color: #ca3a11; }
 .jasmine_html-reporter .bar.menu { background-color: #fff; color: #aaaaaa; }
 .jasmine_html-reporter .bar.menu a { color: #333333; }
 .jasmine_html-reporter .bar a { color: white; }