cubicweb: comparison web/test/jstests/test_ajax.js

Mercurial Mercurial > pub > hg > cubicweb / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

web/test/jstests/test_ajax.js

changeset 10430	2b1ea3e8e080
parent 10429	98ea2b865210
child 10431	7628a14d2209

equal deleted inserted replaced

-:98ea2b865210
+:2b1ea3e8e080
 }
 QUnit.test('test simple h1 inclusion (ajax_url0.html)', function (assert) {
 assert.expect(3);
 assert.equal(jQuery('#qunit-fixture').children().length, 0);
-stop();
+var done = assert.async();
 jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url0.html')
 .addCallback(function() {
 try {
 assert.equal(jQuery('#qunit-fixture').children().length, 1);
 assert.equal(jQuery('#qunit-fixture h1').html(), 'Hello');
 } finally {
-start();
+done();
 };
 }
 );
 });
 QUnit.test('test simple html head inclusion (ajax_url1.html)', function (assert) {
 assert.expect(6);
 var scriptsIncluded = jsSources();
 assert.equal(jQuery.inArray('http://foo.js', scriptsIncluded), - 1);
-stop();
+var done = assert.async();
 jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url1.html')
 .addCallback(function() {
 try {
 var origLength = scriptsIncluded.length;
 scriptsIncluded = jsSources();
 // check that <div class="ajaxHtmlHead"> has been removed
 assert.equal(jQuery('#qunit-fixture').children().length, 1);
 assert.equal(jQuery('div.ajaxHtmlHead').length, 0);
 assert.equal(jQuery('#qunit-fixture h1').html(), 'Hello');
 } finally {
-start();
+done();
 };
 }
 );
 });
 QUnit.test('test addCallback', function (assert) {
 assert.expect(3);
 assert.equal(jQuery('#qunit-fixture').children().length, 0);
-stop();
+var done = assert.async();
 var d = jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url0.html');
 d.addCallback(function() {
 try {
 assert.equal(jQuery('#qunit-fixture').children().length, 1);
 assert.equal(jQuery('#qunit-fixture h1').html(), 'Hello');
 } finally {
-start();
+done();
 };
 });
 });
 QUnit.test('test callback after synchronous request', function (assert) {
 },
 success: function(data, status) {
 deferred.success(data);
 }
 });
-stop();
+var done = assert.async();
 deferred.addCallback(function() {
 try {
 // add an assertion to ensure the callback is executed
 assert.ok(true, "callback is executed");
 } finally {
-start();
+done();
 };
 });
 });
 QUnit.test('test addCallback with parameters', function (assert) {
 assert.expect(3);
 assert.equal(jQuery('#qunit-fixture').children().length, 0);
-stop();
+var done = assert.async();
 var d = jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url0.html');
 d.addCallback(function(data, req, arg1, arg2) {
 try {
 assert.equal(arg1, 'Hello');
 assert.equal(arg2, 'world');
 } finally {
-start();
+done();
 };
 },
 'Hello', 'world');
 });
 try {
 assert.ok(true, "callback is executed");
 assert.equal(arg1, 'Hello');
 assert.equal(arg2, 'world');
 } finally {
-start();
+done();
 };
 },
 'Hello', 'world');
 deferred.addErrback(function() {
 // throw an exception to start errback chain
 try {
 throw this._error;
 } finally {
-start();
+done();
 };
 });
-stop();
+var done = assert.async();
 var result = jQuery.ajax({
 url: BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url0.html',
 async: false,
 beforeSend: function(xhr) {
 deferred._req = xhr;
 });
 });
 QUnit.test('test addErrback', function (assert) {
 assert.expect(1);
-stop();
+var done = assert.async();
 var d = jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/nonexistent.html');
 d.addCallback(function() {
 // should not be executed
 assert.ok(false, "callback is executed");
 });
 d.addErrback(function() {
 try {
 assert.ok(true, "errback is executed");
 } finally {
-start();
+done();
 };
 });
 });
 QUnit.test('test callback execution order', function (assert) {
 assert.expect(3);
 var counter = 0;
-stop();
+var done = assert.async();
 var d = jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url0.html');
 d.addCallback(function() {
-try {
+assert.equal(++counter, 1); // should be executed first
-assert.equal(++counter, 1); // should be executed first
+});
-} finally {
-start();
-};
-}
-);
 d.addCallback(function() {
 assert.equal(++counter, 2);
 });
 d.addCallback(function() {
-assert.equal(++counter, 3);
+try {
+assert.equal(++counter, 3);
+} finally {
+done();
+}
 });
 });
 QUnit.test('test already included resources are ignored (ajax_url1.html)', function (assert) {
 assert.expect(10);
 // NOTE:
 assert.equal(jQuery.inArray('http://foo.js', scriptsIncluded), -1);
 assert.equal(jQuery('head link').length, 1);
 /* use endswith because in pytest context we have an absolute path */
 assert.ok(jQuery('head link').attr('href').endswith('/qunit.css'), 'qunit.css is loaded');
-stop();
+var done = assert.async();
 jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url1.html')
 .addCallback(function() {
 var origLength = scriptsIncluded.length;
 scriptsIncluded = jsSources();
 try {
 // qunit.css is not added twice
 assert.equal(jQuery('head link').length, 1);
 /* use endswith because in pytest context we have an absolute path */
 assert.ok(jQuery('head link').attr('href').endswith('/qunit.css'), 'qunit.css is loaded');
 } finally {
-start();
+done();
 }
 }
 );
 });
 assert.deepEqual(res, ['foo', 'bar']);
 });
 QUnit.test('test event on CubicWeb', function (assert) {
 assert.expect(1);
-stop();
+var done = assert.async();
 var events = null;
 jQuery(CubicWeb).bind('server-response', function() {
 // check that server-response event on CubicWeb is triggered
 events = 'CubicWeb';
 });
 jQuery('#qunit-fixture').loadxhtml(BASE_URL + 'cwsoftwareroot/web/test/jstests/ajax_url0.html')
 .addCallback(function() {
 try {
 assert.equal(events, 'CubicWeb');
 } finally {
-start();
+done();
 };
 }
 );
 });
 QUnit.test('test event on node', function (assert) {
 assert.expect(3);
-stop();
+var done = assert.async();
 var nodes = [];
 jQuery('#qunit-fixture').bind('server-response', function() {
 nodes.push('node');
 });
 jQuery(CubicWeb).bind('server-response', function() {
 // check that server-response event on CubicWeb is triggered
 // only once and event server-response on node is triggered
 assert.equal(nodes[0], 'CubicWeb');
 assert.equal(nodes[1], 'node');
 } finally {
-start();
+done();
 };
 }
 );
 });
 });

cubicweb