small change to assertion fail message

jlorenc1986 · Oct 13, 2015 · 228b97f · 228b97f
1 parent 23cdedf
commit 228b97f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/api/client-commands/end.js b/lib/api/client-commands/end.js
@@ -61,10 +61,10 @@ End.prototype.shouldTakeScreenshot = function() {
 };
 
 End.prototype.complete = function(callback, result) {
-  this.emit('complete');
   if (typeof callback === 'function') {
     callback.call(this, result);
   }
+  this.emit('complete');
 };
 
 module.exports = End;
diff --git a/lib/core/assertion.js b/lib/core/assertion.js
@@ -203,12 +203,14 @@ module.exports = new (function() {
 
       try {
         var err = new Error();
+
         err.name = message;
         err.message = message + ' - ' + failure;
 
         if (originalStackTrace) {
           var stackParts = originalStackTrace.split('\n');
           stackParts.shift();
+
           if (!client.options.start_session) {
             stackParts.unshift('AssertionError: ' + message);
           }
@@ -233,7 +235,7 @@ module.exports = new (function() {
         client.results.lastError = ex;
 
         if (client.options.output) {
-          if (client.options.start_session) {
+          if (client.options.start_session && originalStackTrace) {
             console.log(Logger.colors.light_gray(stacktrace));
           } else {
             var parts = stacktrace.split('\n');