Merge pull request #7050 from OmarShehata/gltf-update-pipeline

Fix tests in #6805

Author: ggetz

Specs/Scene/ModelSpec.js

@@ -186,10 +186,12 @@ defineSuite([
     });
 
     function addZoomTo(model) {
-        model.zoomTo = function() {
+        model.zoomTo = function(zoom) {
+            zoom = defaultValue(zoom, 4.0);
+
             var camera = scene.camera;
             var center = Matrix4.multiplyByPoint(model.modelMatrix, model.boundingSphere.center, new Cartesian3());
-            var r = 4.0 * Math.max(model.boundingSphere.radius, camera.frustum.near);
+            var r = zoom * Math.max(model.boundingSphere.radius, camera.frustum.near);
             camera.lookAt(center, new HeadingPitchRange(0.0, 0.0, r));
         };
     }
@@ -2735,28 +2737,61 @@ defineSuite([
 
     it('renders with the KHR_materials_pbrSpecularGlossiness extension', function() {
         return loadModel(boomBoxPbrSpecularGlossinessUrl).then(function(model) {
+            model.show = false;
+            model.zoomTo(2.0);
+
+            var originalColor;
+            expect(scene).toRenderAndCall(function(rgba) {
+                originalColor = rgba;
+            });
+
             model.show = true;
-            model.zoomTo();
 
-            scene.renderForSpecs();
+            expect(scene).toRenderAndCall(function(rgba) {
+                expect(rgba).not.toEqual(originalColor);
+            });
+
+            primitives.remove(model);
         });
     });
 
     it('renders with the KHR_materials_pbrSpecularGlossiness extension with defaults', function() {
         return loadModel(boomBoxPbrSpecularGlossinessDefaultsUrl).then(function(model) {
+            model.show = false;
+            model.zoomTo(2.0);
+
+            var originalColor;
+            expect(scene).toRenderAndCall(function(rgba) {
+                originalColor = rgba;
+            });
+
             model.show = true;
-            model.zoomTo();
 
-            scene.renderForSpecs();
+            expect(scene).toRenderAndCall(function(rgba) {
+                expect(rgba).not.toEqual(originalColor);
+            });
+
+            primitives.remove(model);
         });
     });
 
     it('renders with the KHR_materials_pbrSpecularGlossiness extension when no textures are found', function() {
         return loadModel(boomBoxPbrSpecularGlossinessNoTextureUrl).then(function(model) {
+            model.show = false;
+            model.zoomTo(2.0);
+
+            var originalColor;
+            expect(scene).toRenderAndCall(function(rgba) {
+                originalColor = rgba;
+            });
+
             model.show = true;
-            model.zoomTo();
 
-            scene.renderForSpecs();
+            expect(scene).toRenderAndCall(function(rgba) {
+                expect(rgba).not.toEqual(originalColor);
+            });
+
+            primitives.remove(model);
         });
     });