rally-jasmine-core 1.2.0.0 → 1.2.0.1

data/lib/jasmine-core/jasmine.js

@@ -470,7 +470,7 @@ jasmine.log = function() {
  * @see jasmine.createSpy
  * @param obj
  * @param methodName
- * @returns a Jasmine spy that can be chained with all spy methods
+ * @return {jasmine.Spy} a Jasmine spy that can be chained with all spy methods
  */
 var spyOn = function(obj, methodName) {
   return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
@@ -515,6 +515,7 @@ if (isCommonJS) exports.xit = xit;
  * jasmine.Matchers functions.
  *
  * @param {Object} actual Actual value to test against and expected value
+ * @return {jasmine.Matchers}
  */
 var expect = function(actual) {
   return jasmine.getEnv().currentSpec.expect(actual);
@@ -1381,18 +1382,14 @@ jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
     throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
   }
   this.message = function() {
+    var invertedMessage = "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was.";
+    var positiveMessage = "";
     if (this.actual.callCount === 0) {
-      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
-      return [
-        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
-        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
-      ];
+      positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.";
     } else {
-      return [
-        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
-        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
-      ];
+      positiveMessage = "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but actual calls were " + jasmine.pp(this.actual.argsForCall).replace(/^\[ | \]$/g, '')
     }
+    return [positiveMessage, invertedMessage];
   };
 
   return this.env.contains_(this.actual.argsForCall, expectedArgs);
@@ -1462,7 +1459,7 @@ jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
 /**
  * Matcher that checks that the expected exception was thrown by the actual.
  *
- * @param {String} expected
+ * @param {String} [expected]
  */
 jasmine.Matchers.prototype.toThrow = function(expected) {
   var result = false;
@@ -2030,7 +2027,14 @@ jasmine.Queue.prototype.next_ = function() {
   while (goAgain) {
     goAgain = false;
     
-    if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) {
+    if (this.abort) {
+      var blockNotEnsured = !this.ensured[self.index];
+      while (blockNotEnsured && self.index < self.blocks.length) {
+        self.index++;
+        blockNotEnsured = !this.ensured[self.index];
+      }
+    }
+    if (self.index < self.blocks.length) {
       var calledSynchronously = true;
       var completedSynchronously = false;
 
@@ -2564,5 +2568,5 @@ jasmine.version_= {
   "major": 1,
   "minor": 2,
   "build": 0,
-  "revision": 1343710612
+  "revision": 1351621339
 };

data/lib/jasmine-core/spec/core/SpecRunningSpec.js

@@ -406,9 +406,15 @@ describe("jasmine spec running", function () {
         env.afterEach(afterEach);
 
         env.it('waitsFor', function () {
+          this.runs(function() {
+            return true;
+          });
           this.waitsFor(100, function() {
             return false;
           });
+          this.runs(function() {
+            return true;
+          });
         });
       }).execute();
 

data/lib/jasmine-core/version.rb

@@ -1,6 +1,6 @@
 module Jasmine
   module Core
-    VERSION = "1.2.0.0"
+    VERSION = "1.2.0.1"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rally-jasmine-core
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: 
   segments: 
   - 1
   - 2
   - 0
-  - 0
-  version: 1.2.0.0
+  - 1
+  version: 1.2.0.1
 platform: ruby
 authors: 
 - Matt Parrish
@@ -19,12 +19,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-26 00:00:00 Z
+date: 2012-10-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -35,12 +33,12 @@ dependencies:
         - 4
         - 3
         version: 1.4.3
+  prerelease: false
   type: :development
-  version_requirements: *id001
+  name: json_pure
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: tilt
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +47,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  name: tilt
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: sass
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +61,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id003
+  name: sass
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: compass
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +75,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  name: compass
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: ragaskar-jsdoc_helper
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +89,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  name: ragaskar-jsdoc_helper
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +103,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  name: rspec
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: fuubar
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +117,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  name: fuubar
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: awesome_print
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,12 +131,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id008
+  name: awesome_print
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,12 +145,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  name: thor
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,12 +159,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  name: nokogiri
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: redcarpet
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -176,12 +174,12 @@ dependencies:
         - 1
         - 7
         version: "1.7"
+  prerelease: false
   type: :development
-  version_requirements: *id011
+  name: redcarpet
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: rocco
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,12 +188,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id012
+  name: rocco
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -204,8 +202,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id013
+  name: rdiscount
+  requirement: *id013
 description: Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.
 email: mparrish@rallydev.com
 executables: []