Commit 2056f6ce authored by Thibaut Frain's avatar Thibaut Frain

Jquery spreadsheet test refactoring

parent 8b5ed49a
...@@ -18,6 +18,6 @@ ...@@ -18,6 +18,6 @@
<body> <body>
<div id="qunit"></div> <div id="qunit"></div>
<div id="qunit-fixture"></div> <div id="qunit-fixture"></div>
<div class="jqs-gadget" style="display:none;"></div> <div id="gadget" style="display:none;"></div>
</body> </body>
</html> </html>
...@@ -5,16 +5,12 @@ ...@@ -5,16 +5,12 @@
QUnit.config.testTimeout = 1000; QUnit.config.testTimeout = 1000;
(function (window, $, QUnit, rJS) { (function (window, $, QUnit, rJS) {
//var test = QUnit.test,
var asyncTest = QUnit.asyncTest, var asyncTest = QUnit.asyncTest,
//stop = QUnit.stop,
start = QUnit.start, start = QUnit.start,
ok = QUnit.ok, ok = QUnit.ok,
equal = QUnit.equal, equal = QUnit.equal,
expect = QUnit.expect, jqsGadgetURL = '../deploy/gadget/jqs.html';
//throws = QUnit.throws,
//deepEqual = QUnit.deepEqual;
gadgetURL = '../deploy/gadget/jqs.html';
function iframeSelector(selectorString) { function iframeSelector(selectorString) {
return $('iframe').contents().find(selectorString); return $('iframe').contents().find(selectorString);
...@@ -27,37 +23,37 @@ QUnit.config.testTimeout = 1000; ...@@ -27,37 +23,37 @@ QUnit.config.testTimeout = 1000;
rJS(window).ready(function () { rJS(window).ready(function () {
var g = rJS(this), var g = rJS(this),
jqs_context = g.context.find('.jqs-gadget').first(); gadget_context = g.context.find('#gadget').first();
asyncTest("jquery.sheet loading : sheet loads", 2, function () { asyncTest("jquery.sheet loading : sheet loads", 2, function () {
g.declareIframedGadget(gadgetURL, jqs_context); var c0r0 = buildSelector(0,0,0);
var c1r1 = buildSelector(0,1,1);
setTimeout(function () {
var c0r0 = buildSelector(0,0,0); g.declareIframedGadget(jqsGadgetURL, gadget_context)
var c1r1 = buildSelector(0,1,1); .then(function () {
ok(iframeSelector(c0r0).length != 0); ok(iframeSelector(c0r0).length != 0);
ok(iframeSelector(c1r1).length != 0); ok(iframeSelector(c1r1).length != 0);
start(); })
},100); .always(start);
}); });
asyncTest("jquery.sheet loading : sheet is empty", 2, function () { asyncTest("jquery.sheet loading : sheet is empty", 2, function () {
g.declareIframedGadget(gadgetURL, jqs_context);
var c0r0 = buildSelector(0,0,0); var c0r0 = buildSelector(0,0,0);
var c1r1 = buildSelector(0,1,1); var c1r1 = buildSelector(0,1,1);
setTimeout(function () { g.declareIframedGadget(jqsGadgetURL, gadget_context)
equal(iframeSelector(c0r0).html(),""); .then(function () {
equal(iframeSelector(c1r1).html(),""); equal(iframeSelector(c0r0).html(),"");
start(); equal(iframeSelector(c1r1).html(),"");
},100); })
.always(start);
}); });
asyncTest("clear content", 2, function () { asyncTest("clear content", 2, function () {
var c0r0 = buildSelector(0,0,0); var c0r0 = buildSelector(0,0,0);
var c1r1 = buildSelector(0,1,1); var c1r1 = buildSelector(0,1,1);
g.declareIframedGadget(gadgetURL, jqs_context) g.declareIframedGadget(jqsGadgetURL, gadget_context)
.then(function (gadget) { .then(function (gadget) {
iframeSelector(c0r0).html('c0r0Value'); iframeSelector(c0r0).html('c0r0Value');
iframeSelector(c1r1).html('c1r1Value'); iframeSelector(c1r1).html('c1r1Value');
...@@ -76,7 +72,7 @@ QUnit.config.testTimeout = 1000; ...@@ -76,7 +72,7 @@ QUnit.config.testTimeout = 1000;
var c0r0 = buildSelector(0,0,0); var c0r0 = buildSelector(0,0,0);
var c1r1 = buildSelector(0,1,1); var c1r1 = buildSelector(0,1,1);
g.declareIframedGadget(gadgetURL, jqs_context) g.declareIframedGadget(jqsGadgetURL, gadget_context)
.then(function (gadget) { .then(function (gadget) {
iframeSelector(c0r0).html('c0r0Value'); iframeSelector(c0r0).html('c0r0Value');
iframeSelector(c1r1).html('c1r1Value'); iframeSelector(c1r1).html('c1r1Value');
...@@ -92,15 +88,14 @@ QUnit.config.testTimeout = 1000; ...@@ -92,15 +88,14 @@ QUnit.config.testTimeout = 1000;
.always(start); .always(start);
}); });
asyncTest("set content of sheet", function () { asyncTest("set content of sheet", 4, function () {
expect(4);
var gadget, content, var gadget, content,
t0c0r0 = buildSelector(0,0,0), t0c0r0 = buildSelector(0,0,0),
t0c1r1 = buildSelector(0,1,1), t0c1r1 = buildSelector(0,1,1),
t2c0r0 = buildSelector(2,0,0), t2c0r0 = buildSelector(2,0,0),
t2c1r1 = buildSelector(2,1,1); t2c1r1 = buildSelector(2,1,1);
g.declareIframedGadget(gadgetURL, jqs_context) g.declareIframedGadget(jqsGadgetURL, gadget_context)
.then(function (gd) { .then(function (gd) {
iframeSelector(t0c0r0).html('c0r0Value'); iframeSelector(t0c0r0).html('c0r0Value');
iframeSelector(t0c1r1).html('c1r1Value'); iframeSelector(t0c1r1).html('c1r1Value');
...@@ -122,6 +117,7 @@ QUnit.config.testTimeout = 1000; ...@@ -122,6 +117,7 @@ QUnit.config.testTimeout = 1000;
}) })
.always(start); .always(start);
}); });
}); });
} (window, jQuery, QUnit, rJS)); } (window, jQuery, QUnit, rJS));
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment