Skip to content

Commit

Permalink
Merge pull request #415 from angrykoala/dev
Browse files Browse the repository at this point in the history
2.6.2
  • Loading branch information
angrykoala authored Sep 17, 2019
2 parents 9485379 + 7b28661 commit f1fe690
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2.6.2 / ####-##-##
==================

* Dependencies updated
* Puppeteer updated to 1.20.0
* AddScript will no longer fail with bypassCSP disabled

2.6.1 / 2019-09-05
==================

Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wendigo",
"version": "2.6.1",
"version": "2.6.2",
"description": "A proper monster for front-end automated testing",
"engines": {
"node": ">=8.0.0"
Expand All @@ -17,7 +17,7 @@
"eslint": "eslint . --ext .js",
"markdown-lint": "markdownlint -c .markdownlint.json ./*.md",
"tsc": "rm -rf dist && tsc",
"prepublishOnly": "npm run eslint && npm run markdown-lint && npm test",
"prepublishOnly": "npm run tslint && npm run markdown-lint && npm test",
"tslint": "tslint *.ts lib/*.ts lib/*/*.ts lib/*/*/*.ts"
},
"repository": {
Expand All @@ -42,18 +42,18 @@
"dependencies": {
"compositer": "^1.3.5",
"is-class": "0.0.8",
"puppeteer": "~1.19.0"
"puppeteer": "~1.20.0"
},
"devDependencies": {
"@types/mocha": "^5.2.7",
"@types/node": "^12.7.4",
"@types/node": "^12.7.5",
"@types/puppeteer": "~1.19.1",
"basic-auth": "^2.0.1",
"eslint": "^6.3.0",
"eslint": "^6.4.0",
"express": "^4.17.1",
"markdownlint-cli": "^0.18.0",
"mocha": "^6.2.0",
"tslint": "^5.19.0",
"typescript": "^3.6.2"
"tslint": "^5.20.0",
"typescript": "^3.6.3"
}
}
7 changes: 2 additions & 5 deletions tests/browser/open.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,12 @@ describe("Open", function() {
await browser2.close();
});

it("Add JS Script Fail CSP", async() => {
it("Add JS Script Without Bypass CSP", async() => {
const browser2 = await Wendigo.createBrowser({
bypassCSP: false
});
await browser2.open(configUrls.index);
await utils.assertThrowsAsync(async() => {
await browser2.addScript(path.join(__dirname, "..", "dummy_server/static/worker.js"));
}, `InjectScriptError: [addScript] Error injecting scripts. This may be caused by the page Content Security Policy. Make sure the option bypassCSP is set to true in Wendigo.`); // eslint-disable-line max-len

await browser2.addScript(path.join(__dirname, "..", "dummy_server/static/worker.js"));
await browser2.close();
});

Expand Down

0 comments on commit f1fe690

Please sign in to comment.