diff --git a/index.js b/index.js index e80238b..2b8b76d 100755 --- a/index.js +++ b/index.js @@ -16,13 +16,7 @@ var jsdomBrowser = function (baseBrowserDecorator, config) { this.name = "jsdom"; this._start = function (url) { - var virtualConsole = null; - if (jsdom.JSDOM) { // Indicate jsdom >= 10.0.0 and a new API - if (config.redirectConsole) { - virtualConsole = new jsdom.VirtualConsole().sendTo(console); - } - var jsdomOptions = { resources: "usable", runScripts: "dangerously", @@ -35,13 +29,8 @@ var jsdomBrowser = function (baseBrowserDecorator, config) { jsdom.JSDOM.fromURL(url, jsdomOptions); } else { - if (config.redirectConsole) { - virtualConsole = jsdom.createVirtualConsole().sendTo(console); - } - var jsdomOptions = { url: url, - virtualConsole: virtualConsole, features : { FetchExternalResources: ["script", "iframe"], ProcessExternalResources: ["script"] diff --git a/test/console-redirection-test.js b/test/console-redirection-test.js deleted file mode 100644 index 6604d08..0000000 --- a/test/console-redirection-test.js +++ /dev/null @@ -1,33 +0,0 @@ -let { createKarmaTest, waitToExit, WriteableBuffer } = require("./test-helper"); - -describe("with redirectConsole: true", function () { - it("should redirect console from jsdom to node", async function () { - let process = await createKarmaTest({ redirectConsole: true }, function () { - console.log("foo bar"); - }); - - let writable = process.stdout.pipe(new WriteableBuffer()); - - await waitToExit(process); - - if (writable.getContents().toString().indexOf("foo bar") === -1) { - throw new Error("Expected stdout to contain 'foo bar'"); - } - }); -}); - -describe("with redirectConsole: false (default)", function () { - it("should omit console output from jsdom", async function () { - let process = await createKarmaTest({}, function () { - console.log("foo bar"); - }); - - let writable = process.stdout.pipe(new WriteableBuffer()); - - await waitToExit(process); - - if (writable.getContents().toString().indexOf("foo bar") !== -1) { - throw new Error("Expected stdout to not contain 'foo bar'"); - } - }); -}); diff --git a/test/test-helper/index.js b/test/test-helper/index.js index 9bf53a6..5d0550e 100644 --- a/test/test-helper/index.js +++ b/test/test-helper/index.js @@ -8,8 +8,6 @@ let { randomBytes } = require("crypto"); let { exec, spawn } = require("./child_process"); -let { Writable } = require("stream"); - function generateRandomFilePath () { return join( tmpdir(), @@ -57,26 +55,7 @@ function waitToExit (process) { }); } -class WriteableBuffer extends Writable { - constructor (options) { - super(options); - - this.chunks = []; - } - - _write (chunk, encoding, callback) { - this.chunks.push(chunk); - - callback(); - } - - getContents () { - return Buffer.concat(this.chunks); - } -} - module.exports = { createKarmaTest, waitToExit, - WriteableBuffer };