jasmine-core 2.9.1 → 2.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2399fd8959270f1010f1f663f0d654eb4fbc8ee6
-  data.tar.gz: adf388ab54d67155d2b91c1b9c8466770e6472f9
+  metadata.gz: 8fa6bc01f3bebe3af74f236043dfa248343ddb9c
+  data.tar.gz: 6e463032dd5611aa0fcae23f5747c3798169a772
 SHA512:
-  metadata.gz: b80bb848ba40ff33b9f3f30cdb9c781fc821c6051d6c56fb75b1872efb6c4fe718e345119e5bcc17122fe163d9d81bb4f2df7c37dfec16c6f67e9868c19a7e94
-  data.tar.gz: 151eb2d23147153fad959843b15ed8332aff7923265d1025ca056e0e2e94a6d79acd05b0c229ec44bd3881df06c22d4de6306e283b0066da099cc54fdbeffbf4
+  metadata.gz: c2e443a7bacb5598138901ccca2e38f942c38c27105f46843f235d0cee3fd2d3bdc3d8f951e5b69b2c5e52df051300a030b171d64f534762be732421e3969b66
+  data.tar.gz: 63dc193aad536b5cce1bee3a3ec944c3a005b60fe023c7ef534463290d687ef0d2856840d66e7db52d4a6b73d5e33c1d646ca3f37be1e0cc74f35e85b4ca2e9c

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

@@ -88,7 +88,8 @@ jasmineRequire.HtmlReporter = function(j$) {
       results = [],
       htmlReporterMain,
       symbols,
-      failedSuites = [];
+      failedSuites = [],
+      deprecationWarnings = [];
 
     this.initialize = function() {
       clearPrior();
@@ -126,6 +127,7 @@ jasmineRequire.HtmlReporter = function(j$) {
       }
 
       stateBuilder.suiteDone(result);
+      addDeprecationWarnings(result);
     };
 
     this.specStarted = function(result) {
@@ -169,6 +171,8 @@ jasmineRequire.HtmlReporter = function(j$) {
 
         failures.push(failure);
       }
+
+      addDeprecationWarnings(result);
     };
 
     this.jasmineDone = function(doneResult) {
@@ -278,6 +282,14 @@ jasmineRequire.HtmlReporter = function(j$) {
         alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failure.message));
       }
 
+      addDeprecationWarnings(doneResult);
+
+      var warningBarClassName = 'jasmine-bar jasmine-warning';
+      for(i = 0; i < deprecationWarnings.length; i++) {
+        var warning = deprecationWarnings[i];
+        alert.appendChild(createDom('span', {className: warningBarClassName}, 'DEPRECATION: ' + warning));
+      }
+
       var results = find('.jasmine-results');
       results.appendChild(summary);
 
@@ -352,6 +364,17 @@ jasmineRequire.HtmlReporter = function(j$) {
 
     return this;
 
+    function addDeprecationWarnings(result) {
+      if (result && result.deprecationWarnings) {
+        for(var i = 0; i < result.deprecationWarnings.length; i++) {
+          var warning = result.deprecationWarnings[i].message;
+          if (!j$.util.arrayContains(warning)) {
+            deprecationWarnings.push(warning);
+          }
+        }
+      }
+    }
+
     function find(selector) {
       return getContainer().querySelector('.jasmine_html-reporter ' + selector);
     }

data/lib/jasmine-core/jasmine.css

@@ -33,6 +33,7 @@ body { overflow-y: scroll; }
 .jasmine_html-reporter .jasmine-bar.jasmine-passed { background-color: #007069; }
 .jasmine_html-reporter .jasmine-bar.jasmine-skipped { background-color: #bababa; }
 .jasmine_html-reporter .jasmine-bar.jasmine-errored { background-color: #ca3a11; }
+.jasmine_html-reporter .jasmine-bar.jasmine-warning { background-color: #ba9d37; color: #333; }
 .jasmine_html-reporter .jasmine-bar.jasmine-menu { background-color: #fff; color: #aaa; }
 .jasmine_html-reporter .jasmine-bar.jasmine-menu a { color: #333; }
 .jasmine_html-reporter .jasmine-bar a { color: white; }

data/lib/jasmine-core/jasmine.js

@@ -505,6 +505,7 @@ getJasmineRequireObj().Spec = function(j$) {
      * @property {String} fullName - The full description including all ancestors of this spec.
      * @property {Expectation[]} failedExpectations - The list of expectations that failed during execution of this spec.
      * @property {Expectation[]} passedExpectations - The list of expectations that passed during execution of this spec.
+     * @property {Expectation[]} deprecationWarnings - The list of deprecation warnings that occurred during execution this spec.
      * @property {String} pendingReason - If the spec is {@link pending}, this will be the reason.
      * @property {String} status - Once the spec has completed, this string represents the pass/fail status of this spec.
      */
@@ -514,6 +515,7 @@ getJasmineRequireObj().Spec = function(j$) {
       fullName: this.getFullName(),
       failedExpectations: [],
       passedExpectations: [],
+      deprecationWarnings: [],
       pendingReason: ''
     };
   }
@@ -629,6 +631,10 @@ getJasmineRequireObj().Spec = function(j$) {
     return this.getSpecName(this);
   };
 
+  Spec.prototype.addDeprecationWarning = function(msg) {
+    this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg }));
+  };
+
   var extractCustomPendingMessage = function(e) {
     var fullMessage = e.toString(),
         boilerplateStart = fullMessage.indexOf(Spec.pendingSpecExceptionMessage),
@@ -710,6 +716,8 @@ getJasmineRequireObj().Env = function(j$) {
     var self = this;
     var global = options.global || j$.getGlobal();
 
+    var hasExecuted = false;
+
     var totalSpecsDefined = 0;
 
     var catchExceptions = true;
@@ -895,6 +903,7 @@ getJasmineRequireObj().Env = function(j$) {
 
     // TODO: fix this naming, and here's where the value comes in
     this.catchExceptions = function(value) {
+      this.deprecated('The catchExceptions option is deprecated and will be replaced with stopOnSpecFailure in Jasmine 3.0');
       catchExceptions = !!value;
       return catchExceptions;
     };
@@ -933,6 +942,14 @@ getJasmineRequireObj().Env = function(j$) {
       return seed;
     };
 
+    this.deprecated = function(msg) {
+      var runnable = currentRunnable() || topSuite;
+      runnable.addDeprecationWarning(msg);
+      if(typeof console !== 'undefined' && typeof console.warn !== 'undefined') {
+        console.error('DEPRECATION: ' + msg);
+      }
+    };
+
     var queueRunnerFactory = function(options) {
       options.catchException = catchException;
       options.clearStack = options.clearStack || clearStack;
@@ -940,6 +957,7 @@ getJasmineRequireObj().Env = function(j$) {
       options.fail = self.fail;
       options.globalErrors = globalErrors;
       options.completeOnFirstError = throwOnExpectationFailure && options.isLeaf;
+      options.deprecated = self.deprecated;
 
       new j$.QueueRunner(options).execute();
     };
@@ -959,6 +977,12 @@ getJasmineRequireObj().Env = function(j$) {
     };
 
     this.execute = function(runnablesToRun) {
+      if (hasExecuted) {
+        this.deprecated('Executing the same Jasmine multiple times will no longer work in Jasmine 3.0');
+      }
+
+      hasExecuted = true;
+
       if(!runnablesToRun) {
         if (focusedRunnables.length) {
           runnablesToRun = focusedRunnables;
@@ -1025,10 +1049,12 @@ getJasmineRequireObj().Env = function(j$) {
          * @typedef JasmineDoneInfo
          * @property {Order} order - Information about the ordering (random or not) of this execution of the suite.
          * @property {Expectation[]} failedExpectations - List of expectations that failed in an {@link afterAll} at the global level.
+         * @property {Expectation[]} deprecationWarnings - List of deprecation warnings that occurred at the global level.
          */
         reporter.jasmineDone({
           order: order,
-          failedExpectations: topSuite.result.failedExpectations
+          failedExpectations: topSuite.result.failedExpectations,
+          deprecationWarnings: topSuite.result.deprecationWarnings
         });
       });
     };
@@ -1130,6 +1156,7 @@ getJasmineRequireObj().Env = function(j$) {
     var focusedRunnables = [];
 
     this.fdescribe = function(description, specDefinitions) {
+      this.deprecated('fit and fdescribe will cause your suite to report an \'incomplete\' status in Jasmine 3.0');
       ensureIsNotNested('fdescribe');
       ensureIsFunction(specDefinitions, 'fdescribe');
       var suite = suiteFactory(description);
@@ -1255,6 +1282,7 @@ getJasmineRequireObj().Env = function(j$) {
     };
 
     this.fit = function(description, fn, timeout){
+      this.deprecated('fit and fdescribe will cause your suite to report an \'incomplete\' status in Jasmine 3.0');
       ensureIsNotNested('fit');
       ensureIsFunctionOrAsync(fn, 'fit');
       var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
@@ -1510,6 +1538,9 @@ getJasmineRequireObj().Any = function(j$) {
     }
 
     if (this.expectedObject == Object) {
+      if (other === null) {
+        j$.getEnv().deprecated('jasmine.Any(Object) will no longer match null in Jasmine 3.0');
+      }
       return typeof other == 'object';
     }
 
@@ -4320,7 +4351,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
     return function() {
       if (!called) {
         called = true;
-        fn();
+        fn.apply(null, arguments);
       }
       return null;
     };
@@ -4339,6 +4370,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
     this.fail = attrs.fail || function() {};
     this.globalErrors = attrs.globalErrors || { pushListener: function() {}, popListener: function() {} };
     this.completeOnFirstError = !!attrs.completeOnFirstError;
+    this.deprecated = attrs.deprecated;
   }
 
   QueueRunner.prototype.execute = function() {
@@ -4398,9 +4430,13 @@ getJasmineRequireObj().QueueRunner = function(j$) {
           clearTimeout(timeoutId);
           self.globalErrors.popListener(handleError);
         }),
-        next = once(function () {
+        next = once(function (err) {
           cleanup();
 
+          if (err instanceof Error) {
+            self.deprecated('done callback received an Error object. Jasmine 3.0 will treat this as a failure');
+          }
+
           function runNext() {
             if (self.completeOnFirstError && errored) {
               self.skipToCleanup(iterativeIndex);
@@ -5147,13 +5183,15 @@ getJasmineRequireObj().Suite = function(j$) {
      * @property {String} description - The description text passed to the {@link describe} that made this suite.
      * @property {String} fullName - The full description including all ancestors of this suite.
      * @property {Expectation[]} failedExpectations - The list of expectations that failed in an {@link afterAll} for this suite.
+     * @property {Expectation[]} deprecationWarnings - The list of deprecation warnings that occurred on this suite.
      * @property {String} status - Once the suite has completed, this string represents the pass/fail status of this suite.
      */
     this.result = {
       id: this.id,
       description: this.description,
       fullName: this.getFullName(),
-      failedExpectations: []
+      failedExpectations: [],
+      deprecationWarnings: []
     };
   }
 
@@ -5273,6 +5311,10 @@ getJasmineRequireObj().Suite = function(j$) {
     }
   };
 
+  Suite.prototype.addDeprecationWarning = function(msg) {
+    this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg }));
+  };
+
   function isAfterAll(children) {
     return children && children[0].result.status;
   }
@@ -5538,5 +5580,5 @@ getJasmineRequireObj().UserContext = function(j$) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.9.1';
+  return '2.99.0';
 };

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

@@ -222,6 +222,7 @@ describe("Spec", function() {
       fullName: 'a suite with a spec',
       failedExpectations: [],
       passedExpectations: [],
+      deprecationWarnings: [],
       pendingReason: ''
     });
   });

data/lib/jasmine-core/spec/core/integration/EnvSpec.js

@@ -2004,4 +2004,47 @@ describe("Env integration", function() {
 
     env.execute();
   });
+
+  it('should report deprecation warnings on the correct specs and suites', function(done) {
+    var env = new jasmineUnderTest.Env(),
+      reporter = jasmine.createSpyObj('reporter', ['jasmineDone', 'suiteDone', 'specDone']);
+
+    reporter.jasmineDone.and.callFake(function(result) {
+      expect(result.deprecationWarnings).toEqual([
+        jasmine.objectContaining({ message: 'top level deprecation' })
+      ]);
+
+      expect(reporter.suiteDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        fullName: 'suite',
+        deprecationWarnings: [
+          jasmine.objectContaining({ message: 'suite level deprecation' })
+        ]
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        fullName: 'suite spec',
+        deprecationWarnings: [
+          jasmine.objectContaining({ message: 'spec level deprecation' })
+        ]
+      }));
+
+      done();
+    });
+
+    env.addReporter(reporter);
+
+    env.deprecated('top level deprecation');
+
+    env.describe('suite', function() {
+      env.beforeAll(function() {
+        env.deprecated('suite level deprecation');
+      });
+
+      env.it('spec', function() {
+        env.deprecated('spec level deprecation');
+      });
+    });
+
+    env.execute();
+  });
 });

data/lib/jasmine-core/spec/html/HtmlReporterSpec.js

@@ -208,6 +208,47 @@ describe("New HtmlReporter", function() {
     });
   });
 
+  describe('when there are deprecation warnings', function() {
+    it('displays the messages in their own alert bars', function() {
+      var env = new jasmineUnderTest.Env(),
+        container = document.createElement('div'),
+        getContainer = function() { return container; },
+        reporter = new jasmineUnderTest.HtmlReporter({
+          env: env,
+          getContainer: getContainer,
+          createElement: function() { return document.createElement.apply(document, arguments); },
+          createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+        });
+
+      reporter.initialize();
+
+      reporter.jasmineStarted({});
+      reporter.specDone({
+        status: 'passed',
+        deprecationWarnings: [{ message: 'spec deprecation' }],
+        failedExpectations: [],
+        passedExpectations: []
+      });
+      reporter.suiteDone({
+        status: 'passed',
+        deprecationWarnings: [{ message: 'suite deprecation' }],
+        failedExpectations: []
+      });
+      reporter.jasmineDone({
+        deprecationWarnings: [{ message: 'global deprecation' }],
+        failedExpectations: []
+      });
+
+      var alertBars = container.querySelectorAll(".jasmine-alert .jasmine-bar");
+
+      expect(alertBars.length).toEqual(4);
+      expect(alertBars[1].innerHTML).toMatch(/spec deprecation/);
+      expect(alertBars[1].getAttribute("class")).toEqual('jasmine-bar jasmine-warning');
+      expect(alertBars[2].innerHTML).toMatch(/suite deprecation/);
+      expect(alertBars[3].innerHTML).toMatch(/global deprecation/);
+    });
+  });
+
   describe("when Jasmine is done", function() {
     it("adds a warning to the link title of specs that have no expectations", function() {
       if (!window.console) {

data/lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.9.1"
+    VERSION = "2.99.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-core
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.99.0
 platform: ruby
 authors:
 - Gregg Van Hove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake