From 13cf18ce39c612cb5f6de0d7fc0f05728dac1056 Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Sun, 8 Dec 2013 17:33:42 -0800 Subject: [PATCH] some small changes to tests --- test/karma.conf.js | 2 +- test/lib/pixi/textures/Texture.js | 2 +- test/unit/pixi/renderers/webgl/WebGLShaders.js | 15 +++++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index c66a696..cf5f7c1 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -66,7 +66,7 @@ module.exports = function(config) { // report which specs are slower than 500ms // CLI --report-slower-than 500 - reportSlowerThan : 1000, + reportSlowerThan : 500, preprocessors : { // '**/client/js/*.js': 'coverage' diff --git a/test/lib/pixi/textures/Texture.js b/test/lib/pixi/textures/Texture.js index d5867b6..bf064e7 100644 --- a/test/lib/pixi/textures/Texture.js +++ b/test/lib/pixi/textures/Texture.js @@ -25,7 +25,7 @@ function pixi_textures_Texture_confirmNew(obj, done) { if (obj.baseTexture.hasLoaded) { confirmFrameDone(); } else { - pixi_core_Rectangle_confirm(obj.frame, 0, 0, 1, 1); obj.addEventListener('update', confirmFrameDone); + pixi_core_Rectangle_confirm(obj.frame, 0, 0, 1, 1); } } diff --git a/test/unit/pixi/renderers/webgl/WebGLShaders.js b/test/unit/pixi/renderers/webgl/WebGLShaders.js index 2872de8..4459958 100644 --- a/test/unit/pixi/renderers/webgl/WebGLShaders.js +++ b/test/unit/pixi/renderers/webgl/WebGLShaders.js @@ -4,10 +4,17 @@ describe('renderers/webgl/WebGLShaders', function () { var expect = chai.expect; it('Module members exist', function () { - expect(PIXI).to.respondTo('initPrimitiveShader'); - expect(PIXI).to.respondTo('initDefaultShader'); - expect(PIXI).to.respondTo('initDefaultStripShader'); - expect(PIXI).to.respondTo('activateDefaultShader'); + expect(PIXI).to.respondTo('initDefaultShaders'); + expect(PIXI).to.respondTo('activatePrimitiveShader'); + expect(PIXI).to.respondTo('deactivatePrimitiveShader'); + + expect(PIXI).to.respondTo('activateStripShader'); + expect(PIXI).to.respondTo('deactivateStripShader'); + + expect(PIXI).to.respondTo('CompileVertexShader'); + expect(PIXI).to.respondTo('CompileFragmentShader'); + expect(PIXI).to.respondTo('_CompileShader'); + expect(PIXI).to.respondTo('compileProgram'); }); });