diff --git a/package.json b/package.json index 8336c604c6d45366ebed81ae7e21acbe601d5d8d..25a58a9a89e95e9ddd4eb4e0a6f90c1cdfe92ead 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "karma-sourcemap-loader": "^0.3.7", "karma-spec-reporter": "0.0.31", "karma-summary-reporter": "^1.3.3", - "karma-viewport": "^0.4.0", + "karma-viewport": "^0.4.1", "karma-webpack": "^2.0.4", "lunr": "^2.1.2", "lunr-languages": "^1.0.0", diff --git a/tests/.eslintrc b/tests/.eslintrc index 30c7321a9f169358c27976042ef97ba87c350425..4599df7fb917d8ea295c80dbed8379d3d88ff220 100644 --- a/tests/.eslintrc +++ b/tests/.eslintrc @@ -3,9 +3,9 @@ "jasmine": true }, "globals": { - "fixture": true, - "Ginseng": true, - "spyOnProperty": true + "ginseng": true, + "spyOnProperty": true, + "viewport": true }, "plugins": [ "jasmine" diff --git a/tests/karma.conf.js b/tests/karma.conf.js index 0e8aa15fc2a73e1b011d82ac1c445fbd13428680..3e783bad23210b46536b3b1d728a5e1dfa504681 100644 --- a/tests/karma.conf.js +++ b/tests/karma.conf.js @@ -81,7 +81,8 @@ module.exports = karma => { /* Proxy top-level folders */ proxies: { - "/extensions/": "/base/fixtures/extensions/" + "/extensions/": "/base/fixtures/extensions/", + "/layout/": "/base/fixtures/layout/" }, /* Preprocessors */ @@ -102,8 +103,7 @@ module.exports = karma => { /* Ginseng configuration */ ginseng: { client: { - context: "#viewport", - url: "/_ginseng" + context: "#viewport" } }, diff --git a/tests/snapshot/suites/extensions/admonition/index.js b/tests/snapshot/suites/extensions/admonition/index.js index e91eaa12de7b31985af9725ee260f5705051c82a..f7713d8fb0744efd5f030d0ab67bd6e59d4995c3 100644 --- a/tests/snapshot/suites/extensions/admonition/index.js +++ b/tests/snapshot/suites/extensions/admonition/index.js @@ -21,7 +21,7 @@ */ /* ---------------------------------------------------------------------------- - * Declarations + * Tests * ------------------------------------------------------------------------- */ /* Extensions */ @@ -32,8 +32,7 @@ describe("extensions", () => { /* Load fixtures */ beforeAll(done => { - viewport.element.src = "/extensions/admonition/_/index.html" - viewport.element.addEventListener("load", done) + viewport.load("/extensions/admonition/_/index.html", done) }) /* Reset viewport */ diff --git a/yarn.lock b/yarn.lock index 3d5e9c00f187a076be1b832dd91fa856459fbe13..a49a2df516335c9c653243dfec42c09960f74fe9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3626,9 +3626,9 @@ karma-summary-reporter@^1.3.3: dependencies: chalk "^1.1.3" -karma-viewport@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/karma-viewport/-/karma-viewport-0.3.0.tgz#c5e265666a8db1199a5a9aca38de08b4df33daca" +karma-viewport@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/karma-viewport/-/karma-viewport-0.4.1.tgz#e0923839d74ecae77284bc05ae90c14c57a78939" dependencies: jsonschema "^1.1.1"