From 24dd06b65e9068ce4b3b8913266a703983e88d7a Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 23 Feb 2017 09:09:54 -0500
Subject: [PATCH] * address FIXME regarding jasmine.done() * support disabling
 tests / reporting as pending

---
 .../developer/libraries/jasmine/hifi-boot.js  | 12 +++++++++--
 .../tests/unit_tests/avatarUnitTests.js       | 11 +++++++++-
 .../tests/unit_tests/entityUnitTests.js       |  8 +++++++
 .../developer/tests/unit_tests/testRunner.js  | 21 ++++++++++++++++---
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/scripts/developer/libraries/jasmine/hifi-boot.js b/scripts/developer/libraries/jasmine/hifi-boot.js
index f490a3618f..49d7fadd29 100644
--- a/scripts/developer/libraries/jasmine/hifi-boot.js
+++ b/scripts/developer/libraries/jasmine/hifi-boot.js
@@ -6,7 +6,7 @@
     var lastSpecStartTime;
     function ConsoleReporter(options) {
         var startTime = new Date().getTime();
-        var errorCount = 0;
+        var errorCount = 0, pending = [];
         this.jasmineStarted = function (obj) {
             print('Jasmine started with ' + obj.totalSpecsDefined + ' tests.');
         };
@@ -15,11 +15,15 @@
             var endTime = new Date().getTime();
             print('<hr />');
             if (errorCount === 0) {
-                print ('<span style="color:green">All tests passed!</span>');
+                print ('<span style="color:green">All enabled tests passed!</span>');
             } else {
                 print('<span style="color:red">Tests completed with ' +
                     errorCount + ' ' + ERROR + '.<span>');
             }
+            if (pending.length) {
+                print ('<span style="color:darkorange">disabled: <br />&nbsp;&nbsp;&nbsp;'+
+                       pending.join('<br />&nbsp;&nbsp;&nbsp;')+'</span>');
+            }
             print('Tests completed in ' + (endTime - startTime) + 'ms.');
         };
         this.suiteStarted = function(obj) {
@@ -32,6 +36,10 @@
             lastSpecStartTime = new Date().getTime();
         };
         this.specDone = function(obj) {
+            if (obj.status === 'pending') {
+                pending.push(obj.fullName);
+                return print('...(pending ' + obj.fullName +')');
+            }
             var specEndTime = new Date().getTime();
             var symbol = obj.status === PASSED ?
                 '<span style="color:green">' + CHECKMARK + '</span>' :
diff --git a/scripts/developer/tests/unit_tests/avatarUnitTests.js b/scripts/developer/tests/unit_tests/avatarUnitTests.js
index 7032b5f5e6..fc2801f83e 100644
--- a/scripts/developer/tests/unit_tests/avatarUnitTests.js
+++ b/scripts/developer/tests/unit_tests/avatarUnitTests.js
@@ -8,6 +8,15 @@ var ROT_IDENT = {x: 0, y: 0, z: 0, w: 1};
 
 describe("MyAvatar", function () {
 
+    // backup/restore current skeletonModelURL
+    beforeAll(function() {
+        this.oldURL = MyAvatar.skeletonModelURL;
+    });
+
+    afterAll(function() {
+        MyAvatar.skeletonModelURL = this.oldURL;
+    });
+
     // reload the avatar from scratch before each test.
     beforeEach(function (done) {
         MyAvatar.skeletonModelURL = DEFAULT_AVATAR_URL;
@@ -25,7 +34,7 @@ describe("MyAvatar", function () {
                 }, 500);
             }
         }, 500);
-    });
+    }, 10000 /*timeout -- allow time to download avatar*/);
 
     // makes the assumption that there is solid ground somewhat underneath the avatar.
     it("position and orientation getters", function () {
diff --git a/scripts/developer/tests/unit_tests/entityUnitTests.js b/scripts/developer/tests/unit_tests/entityUnitTests.js
index 033a484663..612bf6cdcd 100644
--- a/scripts/developer/tests/unit_tests/entityUnitTests.js
+++ b/scripts/developer/tests/unit_tests/entityUnitTests.js
@@ -19,6 +19,14 @@ describe('Entity', function() {
         },
     };
 
+    it('serversExist', function() {
+        expect(Entities.serversExist()).toBe(true);
+    });
+
+    it('canRezTmp', function() {
+        expect(Entities.canRezTmp()).toBe(true);
+    });
+
     beforeEach(function() {
         boxEntity = Entities.addEntity(boxProps);
     });
diff --git a/scripts/developer/tests/unit_tests/testRunner.js b/scripts/developer/tests/unit_tests/testRunner.js
index 31d83cd986..545bb89600 100644
--- a/scripts/developer/tests/unit_tests/testRunner.js
+++ b/scripts/developer/tests/unit_tests/testRunner.js
@@ -3,11 +3,26 @@ Script.include('../../libraries/jasmine/jasmine.js');
 Script.include('../../libraries/jasmine/hifi-boot.js')
 
 // Include unit tests
-// FIXME: Figure out why jasmine done() is not working.
-// Script.include('avatarUnitTests.js');
+Script.include('avatarUnitTests.js');
 Script.include('bindUnitTest.js');
 Script.include('entityUnitTests.js');
 
+describe("jasmine internal tests", function() {
+    it('should support async .done()', function(done) {
+        var start = new Date;
+        Script.setTimeout(function() {
+            expect((new Date - start)/1000).toBeCloseTo(0.5, 1);
+            done();
+        }, 500);
+    });
+    // jasmine pending test
+    xit('disabled test', function() {
+        expect(false).toBe(true);
+    });
+});
+
+// invoke Script.stop (after any async tests complete)
+jasmine.getEnv().addReporter({ jasmineDone: Script.stop });
+
 // Run the tests
 jasmine.getEnv().execute();
-Script.stop();