From 94587acda2cc41de798d47545ceeab9f6acfdb1e Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 22 Dec 2011 09:54:34 -0800 Subject: [PATCH] Changed reloadLib to use requirejs' context. That process being async it now returns a $.Deferred --- tests/jquery.testHelper.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js index 4eb2ddce..99a99cbb 100644 --- a/tests/jquery.testHelper.js +++ b/tests/jquery.testHelper.js @@ -56,19 +56,24 @@ reloads: {}, reloadLib: function(libName){ + var deferred = $.Deferred(); if(this.reloads[libName] === undefined) { this.reloads[libName] = { - lib: $("script[src$='" + libName + "']"), count: 0 }; } - var lib = this.reloads[libName].lib.clone(), - src = lib.attr('src'); + require( + { + baseUrl: "../../../js", + context: libName+"_"+this.reloads[libName].count++ + }, [libName], + function() { + deferred.resolve(); + } + ); - //NOTE append "cache breaker" to force reload - lib.attr('src', src + "?" + this.reloads[libName].count++); - $("body").append(lib); + return deferred; }, rerunQunit: function(){