diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 1460cfc0..811f7f04 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -1,7 +1,11 @@ server: http://localhost:16981 load: + - librarian/static/scripts/jquery.js + - librarian/static/scripts/qunit-1.17.1.js - librarian/static/scripts/equiv.js - librarian/static/scripts/QUnitAdapter.js + - librarian/static/scripts/utils/isbn-verify.js - librarian/static/scripts/tests/isbn-verify.js + - librarian/static/scripts/utils/visual-queue.js - librarian/static/scripts/tests/visual-queue.js diff --git a/librarian/static/scripts/tests/isbn-verify.js b/librarian/static/scripts/tests/isbn-verify.js index d3df322a..8ece32b9 100644 --- a/librarian/static/scripts/tests/isbn-verify.js +++ b/librarian/static/scripts/tests/isbn-verify.js @@ -1,16 +1,16 @@ -QUnit.test("stripExtraneousTest", function(assert){ - assert.equal(stripExtraneous("3.1 4 1 5 92-653"), "3141592653"); +test("stripExtraneousTest", function(assert){ + equals(stripExtraneous("3.1 4 1 5 92-653"), "3141592653", "test"); }); -QUnit.test("isbn13Test", function(assert){ - assert.ok(verifyISBN13("9780981467306"), "Positive test"); - assert.ok(!verifyISBN13("0156453800"), "Negative test, wrong length"); - assert.ok(!verifyISBN13("3141592653589"), "Negative test, ok length"); +test("isbn13Test", function(assert){ + ok(verifyISBN13("9780981467306"), "Positive test"); + ok(!verifyISBN13("0156453800"), "Negative test, wrong length"); + ok(!verifyISBN13("3141592653589"), "Negative test, ok length"); }); -QUnit.test("isbn10Test", function(assert){ - assert.ok(verifyISBN10("0156453800")); - assert.ok(verifyISBN10("1553650808")); - assert.ok(!verifyISBN10("9780981467306"), "Negative test, wrong length"); - assert.ok(!verifyISBN10("3141592653"), "Negative test, ok length"); +test("isbn10Test", function(assert){ + ok(verifyISBN10("0156453800")); + ok(verifyISBN10("1553650808")); + ok(!verifyISBN10("9780981467306"), "Negative test, wrong length"); + ok(!verifyISBN10("3141592653"), "Negative test, ok length"); }); diff --git a/librarian/static/scripts/tests/visual-queue.js b/librarian/static/scripts/tests/visual-queue.js index 4c6cb600..d8f43eb8 100644 --- a/librarian/static/scripts/tests/visual-queue.js +++ b/librarian/static/scripts/tests/visual-queue.js @@ -1,14 +1,14 @@ -QUnit.module("Q Tests", { - "beforeEach":function(){ +module("Q Tests", { + "setup":function(){ var qContainer = document.createElement("div"); this.q = new VisualQueue(qContainer, null); } }); -QUnit.test("simple count test", function(assert){ +test("simple count test", function(assert){ var item1 = document.createElement("div"); item1.id = "item1"; this.q.enqueue(item1); - assert.equal(this.q.queueCounter, 1); + equals(this.q.queueCounter, 1, "one item"); this.q.remove(item1.id); - assert.equal(this.q.queueCounter, 0); + equals(this.q.queueCounter, 0, "no more items"); });