Merge branch 'master' into 3.0-features

- cleaning up 2.99 deprecations

src/core/Env.js

@@ -200,6 +200,14 @@ getJasmineRequireObj().Env = function(j$) {
       handlingLoadErrors = false;
     };
 
+    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, args) {
       var failFast = false;
       if (options.isLeaf) {
@@ -215,6 +223,7 @@ getJasmineRequireObj().Env = function(j$) {
       options.onException = options.onException || function(e) {
         (currentRunnable() || topSuite).onException(e);
       };
+      options.deprecated = self.deprecated;
 
       new j$.QueueRunner(options).execute(args);
     };
@@ -374,12 +383,14 @@ getJasmineRequireObj().Env = function(j$) {
            * @property {IncompleteReason} - Explanation of why the suite was incimplete.
            * @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({
             overallStatus: overallStatus,
             incompleteReason: incompleteReason,
             order: order,
-            failedExpectations: topSuite.result.failedExpectations
+            failedExpectations: topSuite.result.failedExpectations,
+            deprecationWarnings: topSuite.result.deprecationWarnings
           }, function() {});
         });
       });

src/core/QueueRunner.js

@@ -31,6 +31,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
     if (typeof(this.onComplete) !== 'function') {
       throw new Error('invalid onComplete ' + JSON.stringify(this.onComplete));
     }
+    this.deprecated = attrs.deprecated;
   }
 
   QueueRunner.prototype.execute = function() {

src/core/Spec.js

@@ -25,6 +25,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.
      */
@@ -34,6 +35,7 @@ getJasmineRequireObj().Spec = function(j$) {
       fullName: this.getFullName(),
       failedExpectations: [],
       passedExpectations: [],
+      deprecationWarnings: [],
       pendingReason: ''
     };
   }
@@ -150,6 +152,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),

src/core/Suite.js

@@ -21,13 +21,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: []
     };
   }
 
@@ -146,6 +148,10 @@ getJasmineRequireObj().Suite = function(j$) {
     }
   };
 
+  Suite.prototype.addDeprecationWarning = function(msg) {
+    this.result.deprecationWarnings.push(this.expectationResultFactory({ message: msg }));
+  };
+
   function isFailure(args) {
     return !args[0];
   }

src/html/HtmlReporter.js

@@ -60,7 +60,8 @@ jasmineRequire.HtmlReporter = function(j$) {
       filterSpecs = options.filterSpecs,
       timer = options.timer || noopTimer,
       htmlReporterMain,
-      symbols;
+      symbols,
+      deprecationWarnings = [];
 
     this.initialize = function() {
       clearPrior();
@@ -98,6 +99,7 @@ jasmineRequire.HtmlReporter = function(j$) {
       if (result.status === 'failed') {
         failures.push(failureDom(result));
       }
+      addDeprecationWarnings(result);
     };
 
     this.specStarted = function(result) {
@@ -126,6 +128,8 @@ jasmineRequire.HtmlReporter = function(j$) {
       if (result.status === 'failed') {
         failures.push(failureDom(result));
       }
+
+      addDeprecationWarnings(result);
     };
 
     this.jasmineDone = function(doneResult) {
@@ -195,6 +199,14 @@ jasmineRequire.HtmlReporter = function(j$) {
         }
       }
 
+      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);
 
@@ -375,6 +387,17 @@ jasmineRequire.HtmlReporter = function(j$) {
       return addToExistingQueryString('spec', els.join(' '));
     }
 
+    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);
     }

src/html/_HTMLReporter.scss

@@ -218,6 +218,11 @@ body {
       background-color: $neutral-color;
     }
 
+    &.jasmine-warning {
+      background-color: $pending-color;
+      color: $text-color;
+    }
+
     &.jasmine-menu {
       background-color: #fff;
       color: $faint-text-color;