From 2e3ddd6ed16ac7cebd0e3d8e088ff42d2b88dda0 Mon Sep 17 00:00:00 2001 From: jdescottes Date: Sun, 11 Aug 2013 10:45:56 +0200 Subject: [PATCH] Updating list name in index.html as well. Also fixed indentation in smoke_test.js --- piskel-boot.js | 2 +- tests/integration/casperjs/smoke_test.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/piskel-boot.js b/piskel-boot.js index f3933cb9..2ac97da7 100644 --- a/piskel-boot.js +++ b/piskel-boot.js @@ -22,7 +22,7 @@ scriptIndex ++; } }; - loadScript("script-load-list.js", "loadNextScript()"); + loadScript("piskel-script-list.js", "loadNextScript()"); } else { var script; if (window.location.href.indexOf("pack") != -1) { diff --git a/tests/integration/casperjs/smoke_test.js b/tests/integration/casperjs/smoke_test.js index bfb70ba2..45718440 100644 --- a/tests/integration/casperjs/smoke_test.js +++ b/tests/integration/casperjs/smoke_test.js @@ -1,15 +1,15 @@ casper .start(casper.cli.get('baseUrl')+"?debug") .then(function () { - this.wait(3000); + this.wait(3000); }) .then(function () { this.echo(casper.cli.get('baseUrl')+"?debug"); - // If there was a JS error after the page load, casper won't perform asserts + // If there was a JS error after the page load, casper won't perform asserts this.test.assertExists('html', 'Casper JS cannot assert DOM elements. A JS error has probably occured.'); this.test.assertExists('#drawing-canvas-container canvas', 'Check if drawing canvas element is created'); }) .run(function () { this.test.done(); - }); + }); \ No newline at end of file