Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/@types/mocha-2.2.47
Browse files Browse the repository at this point in the history
  • Loading branch information
axelssonHakan committed Jan 26, 2018
2 parents 41c9621 + 07df049 commit 56259f2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -50,12 +50,12 @@
"precinct": "4.0.0",
"sinon": "4.2.0",
"sinon-chai": "2.14.0",
"source-map-support": "0.5.2",
"source-map-support": "0.5.0",
"test-exclude": "4.1.1",
"yargs": "10.1.1"
},
"devDependencies": {
"@types/chai": "4.1.1",
"@types/chai": "4.1.2",
"@types/mocha": "2.2.47",
"babel-core": "6.26.0",
"babel-plugin-istanbul": "4.1.5",
Expand Down
3 changes: 2 additions & 1 deletion src/cdp/connect.js
Expand Up @@ -31,7 +31,8 @@ module.exports = async function connect(argv, files, debugging) {

await Promise.all([DOM.enable(), DOMStorage.enable(), Network.enable(), Page.enable(), Runtime.enable(), Console.enable()]);
const sourceMapSupport = `${path.dirname(require.resolve('source-map-support'))}/browser-source-map-support.js`;
await Page.addScriptToEvaluateOnLoad({ scriptSource: `${getContent(sourceMapSupport)};sourceMapSupport.install();` });
await Page.addScriptToEvaluateOnLoad({ scriptSource: `${getContent(sourceMapSupport)};` });
await Page.addScriptToEvaluateOnLoad({ scriptSource: 'sourceMapSupport.install();' });
await Page.addScriptToEvaluateOnLoad({ scriptSource: injectMediator });
await Page.addScriptToEvaluateOnLoad({ scriptSource: injectMochaOptions });
await Page.addScriptToEvaluateOnLoad({ scriptSource: injectAwFiles });
Expand Down

0 comments on commit 56259f2

Please sign in to comment.