Revert "Revert "Added the ability to associate trace information with failing specs""

This reverts commit fdad8849df.

spec/core/SpecSpec.js

@@ -224,7 +224,8 @@ describe('Spec', function() {
         deprecationWarnings: [],
         pendingReason: '',
         duration: jasmine.any(Number),
-        properties: null
+        properties: null,
+        trace: null
       },
       'things'
     );
@@ -537,4 +538,110 @@ describe('Spec', function() {
         "'done' callback more than once.\n(in spec: a spec)"
     );
   });
+
+  describe('#trace', function() {
+    it('adds the messages to the result', function() {
+      var timer = jasmine.createSpyObj('timer', ['start', 'elapsed']),
+        spec = new jasmineUnderTest.Spec({
+          queueableFn: {
+            fn: function() {}
+          },
+          queueRunnerFactory: function() {},
+          timer: timer
+        }),
+        t1 = 123,
+        t2 = 456;
+
+      spec.execute();
+      expect(spec.result.trace).toBeNull();
+      timer.elapsed.and.returnValue(t1);
+      spec.trace('msg 1');
+      expect(spec.result.trace).toEqual([{ message: 'msg 1', timestamp: t1 }]);
+      timer.elapsed.and.returnValue(t2);
+      spec.trace('msg 2');
+      expect(spec.result.trace).toEqual([
+        { message: 'msg 1', timestamp: t1 },
+        { message: 'msg 2', timestamp: t2 }
+      ]);
+    });
+
+    describe('When the spec passes', function() {
+      it('omits the messages from the reported result', function() {
+        var resultCallback = jasmine.createSpy('resultCallback'),
+          spec = new jasmineUnderTest.Spec({
+            queueableFn: {
+              fn: function() {}
+            },
+            resultCallback: resultCallback,
+            queueRunnerFactory: function(config) {
+              spec.trace('msg');
+              config.cleanupFns.forEach(function(fn) {
+                fn.fn();
+              });
+              config.onComplete(false);
+            }
+          });
+
+        spec.execute(function() {});
+        expect(resultCallback).toHaveBeenCalledWith(
+          jasmine.objectContaining({ trace: null }),
+          undefined
+        );
+      });
+
+      it('removes the messages to save memory', function() {
+        var resultCallback = jasmine.createSpy('resultCallback'),
+          spec = new jasmineUnderTest.Spec({
+            queueableFn: {
+              fn: function() {}
+            },
+            resultCallback: resultCallback,
+            queueRunnerFactory: function(config) {
+              spec.trace('msg');
+              config.cleanupFns.forEach(function(fn) {
+                fn.fn();
+              });
+              config.onComplete(false);
+            }
+          });
+
+        spec.execute(function() {});
+        expect(resultCallback).toHaveBeenCalled();
+        expect(spec.result.trace).toBeNull();
+      });
+    });
+
+    describe('When the spec fails', function() {
+      it('includes the messages in the reported result', function() {
+        var resultCallback = jasmine.createSpy('resultCallback'),
+          timer = jasmine.createSpyObj('timer', ['start', 'elapsed']),
+          spec = new jasmineUnderTest.Spec({
+            queueableFn: {
+              fn: function() {}
+            },
+            resultCallback: resultCallback,
+            queueRunnerFactory: function(config) {
+              spec.trace('msg');
+              spec.onException(new Error('nope'));
+              config.cleanupFns.forEach(function(fn) {
+                fn.fn();
+              });
+              config.onComplete(true);
+            },
+            timer: timer
+          }),
+          timestamp = 12345;
+
+        timer.elapsed.and.returnValue(timestamp);
+
+        spec.execute(function() {});
+        expect(resultCallback).toHaveBeenCalledWith(
+          jasmine.objectContaining({
+            trace: [{ message: 'msg', timestamp: timestamp }]
+          }),
+          undefined
+        );
+      });
+    });
+  });
 });

spec/core/baseSpec.js

@@ -198,4 +198,12 @@ describe('base helpers', function() {
       });
     });
   });
+
+  describe('trace', function() {
+    it("forwards to the current env's trace function", function() {
+      spyOn(jasmineUnderTest.getEnv(), 'trace');
+      jasmineUnderTest.trace('a message');
+      expect(jasmineUnderTest.getEnv().trace).toHaveBeenCalledWith('a message');
+    });
+  });
 });

spec/core/integration/EnvSpec.js

@@ -3324,4 +3324,87 @@ describe('Env integration', function() {
       });
     });
   });
+
+  it('sends traces to the reporter when the spec fails', function(done) {
+    var reporter = jasmine.createSpyObj('reporter', ['specDone']),
+      startTime,
+      endTime;
+
+    env.addReporter(reporter);
+    env.configure({ random: false });
+
+    env.it('fails', function() {
+      startTime = new Date().getTime();
+      env.trace('message 1');
+      env.trace('message 2');
+      env.expect(1).toBe(2);
+      endTime = new Date().getTime();
+    });
+
+    env.it('passes', function() {
+      env.trace('message that should not be reported');
+    });
+
+    env.execute(null, function() {
+      function numberInRange(min, max) {
+        return {
+          asymmetricMatch: function(compareTo) {
+            return compareTo >= min && compareTo <= max;
+          },
+          jasmineToString: function(pp) {
+            return '<number from ' + min + ' to ' + max + ' inclusive>';
+          }
+        };
+      }
+
+      var duration;
+
+      expect(reporter.specDone).toHaveBeenCalledTimes(2);
+      duration = reporter.specDone.calls.argsFor(0)[0].duration;
+      expect(reporter.specDone.calls.argsFor(0)[0]).toEqual(
+        jasmine.objectContaining({
+          trace: [
+            {
+              timestamp: numberInRange(0, duration),
+              message: 'message 1'
+            },
+            {
+              timestamp: numberInRange(0, duration),
+              message: 'message 2'
+            }
+          ]
+        })
+      );
+      expect(reporter.specDone.calls.argsFor(1)[0].trace).toBeFalsy();
+      done();
+    });
+  });
+
+  it('reports an error when trace is used when a spec is not running', function(done) {
+    var reporter = jasmine.createSpyObj('reporter', ['suiteDone']);
+
+    env.describe('a suite', function() {
+      env.beforeAll(function() {
+        env.trace('a message');
+      });
+
+      env.it('a spec', function() {});
+    });
+
+    env.addReporter(reporter);
+    env.execute(null, function() {
+      expect(reporter.suiteDone).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          failedExpectations: [
+            jasmine.objectContaining({
+              message: jasmine.stringContaining(
+                "'trace' was called when there was no current spec"
+              )
+            })
+          ]
+        })
+      );
+      done();
+    });
+  });
 });

spec/html/HtmlReporterSpec.js

@@ -1514,6 +1514,23 @@ describe('HtmlReporter', function() {
             }
           ]
         };
+        var failingSpecResultWithTrace = {
+          id: 567,
+          status: 'failed',
+          description: 'a failing spec',
+          fullName: 'a suite inner suite a failing spec',
+          passedExpectations: [],
+          failedExpectations: [
+            {
+              message: 'a failure message',
+              stack: 'a stack trace'
+            }
+          ],
+          trace: [
+            { timestamp: 123, message: 'msg 1' },
+            { timestamp: 456, message: 'msg 1' }
+          ]
+        };
 
         var passingSuiteResult = {
           id: 1,
@@ -1531,18 +1548,20 @@ describe('HtmlReporter', function() {
         reporter.suiteDone(passingSuiteResult);
         reporter.suiteDone(failingSuiteResult);
         reporter.suiteDone(passingSuiteResult);
+        reporter.specStarted(failingSpecResultWithTrace);
+        reporter.specDone(failingSpecResultWithTrace);
         reporter.jasmineDone({});
       });
 
       it('reports the specs counts', function() {
         var alertBar = container.querySelector('.jasmine-alert .jasmine-bar');
-        expect(alertBar.innerHTML).toMatch(/2 specs, 2 failure/);
+        expect(alertBar.innerHTML).toMatch(/3 specs, 3 failures/);
       });
 
       it('reports failure messages and stack traces', function() {
         var specFailures = container.querySelector('.jasmine-failures');
 
-        expect(specFailures.childNodes.length).toEqual(2);
+        expect(specFailures.childNodes.length).toEqual(3);
 
         var specFailure = specFailures.childNodes[0];
         expect(specFailure.getAttribute('class')).toMatch(/jasmine-failed/);
@@ -1583,6 +1602,18 @@ describe('HtmlReporter', function() {
         expect(suiteStackTrace.innerHTML).toEqual('a stack trace');
       });
 
+      it('reports traces when present', function() {
+        var specFailure = container.querySelectorAll(
+            '.jasmine-spec-detail.jasmine-failed'
+          )[2],
+          trace = specFailure.querySelector('.jasmine-trace table'),
+          rows;
+
+        expect(trace).toBeTruthy();
+        rows = trace.querySelectorAll('tbody tr');
+        expect(rows.length).toEqual(2);
+      });
+
       it('provides links to focus on a failure and each containing suite', function() {
         var description = container.querySelector(
           '.jasmine-failures .jasmine-description'