diff --git a/package-lock.json b/package-lock.json index 841eba08..411f4ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -763,9 +763,9 @@ } }, "aws-sdk": { - "version": "2.279.1", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.279.1.tgz", - "integrity": "sha512-2vkvg53XaTmPYW6f7YFUEHfNGzOZqKzUboaEkjz/wblmQmDS7J5DO5KTv52wsNFOICBGXgZPCblwD+oP7iT8iA==", + "version": "2.280.1", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.280.1.tgz", + "integrity": "sha512-NdATmKYTWKvRsUo7F0hhMbSVbk4kHdQb8aWSJpXRccXsOTviNSxTIOvaube8RXT7nCz+S5CckJ/fPTUTVv/vQw==", "requires": { "buffer": "4.9.1", "events": "1.1.1", @@ -5868,15 +5868,16 @@ "dev": true }, "helmet": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.12.1.tgz", - "integrity": "sha512-/CsAcbPIHgiGde395IkHUZyRLW126RJ6AtxFy6Y6bxhd44Qq8cZ5BBFZ0xNUSbcgX57j32Emh3OhWz/0XgAB5Q==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.13.0.tgz", + "integrity": "sha512-rCYnlbOBkeP6fCo4sXZNu91vIAWlbVgolwnUANtnzPANRf2kJZ2a6yjRnCqG23Tyl2/ExvJ8bDg4xUdNCIWnrw==", "requires": { "dns-prefetch-control": "0.1.0", "dont-sniff-mimetype": "1.0.0", "expect-ct": "0.1.1", "frameguard": "3.0.0", - "helmet-csp": "2.7.0", + "helmet-crossdomain": "0.3.0", + "helmet-csp": "2.7.1", "hide-powered-by": "1.0.0", "hpkp": "2.0.0", "hsts": "2.1.0", @@ -5886,15 +5887,19 @@ "x-xss-protection": "1.1.0" } }, + "helmet-crossdomain": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz", + "integrity": "sha512-YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==" + }, "helmet-csp": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.0.tgz", - "integrity": "sha512-IGIAkWnxjRbgMXFA2/kmDqSIrIaSfZ6vhMHlSHw7jm7Gm9nVVXqwJ2B1YEpYrJsLrqY+w2Bbimk7snux9+sZAw==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.1.tgz", + "integrity": "sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==", "requires": { "camelize": "1.0.0", "content-security-policy-builder": "2.0.0", "dasherize": "2.0.0", - "lodash.reduce": "4.6.0", "platform": "1.3.5" } }, @@ -7502,11 +7507,6 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "lodash.reduce": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", - "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" - }, "lodash.template": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", @@ -13375,9 +13375,9 @@ "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" }, "puppeteer": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.6.0.tgz", - "integrity": "sha512-88epdIp3lw0LxI+sIHgdgZdq/u5zRnzgU2vJGvcyuGqHQrtRUeICTexTyT1KoKhTGG0mAKFRV9c7IJ179agm7A==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.6.1.tgz", + "integrity": "sha512-qz6DLwK+PhlBMjJZOMOsgVCnweYLtmiqnmJYUDPT++ElMz+cQgbsCNKPw4YDVpg3RTbsRX/pqQqr20zrp0cuKw==", "dev": true, "requires": { "debug": "3.1.0", @@ -16331,9 +16331,9 @@ } }, "webpack": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.1.tgz", - "integrity": "sha512-6jpzObU18y7lXDJz7XCLvzgrqcJ0rZ2jhKvnTivza9gM2GvPW93xxtmEll2GgmdC0zVQAtbHrH/9BtyMjSDZfA==", + "version": "4.16.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.2.tgz", + "integrity": "sha512-Fw+RtyJD9ekQ6Mh6e/hYeoafIKK6bP6qS7EVnZ3hejt+1Ah3JCJZTGE0e5S6Eq4ijIVht6ktWOEqJfm92+5MLw==", "dev": true, "requires": { "@webassemblyjs/ast": "1.5.13", diff --git a/package.json b/package.json index 4ae33937..5b0d9fec 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "changelog": "github-changes -o mozilla -r send --only-pulls --use-commit-body --no-merges", "contributors": "git shortlog -s | awk -F\\t '{print $2}' > CONTRIBUTORS", "release": "npm-run-all contributors changelog", - "test": "npm-run-all test:b*", + "test": "npm-run-all test:*", "test:backend": "nyc mocha --reporter=min test/backend", "test:frontend": "cross-env NODE_ENV=development node test/frontend/runner.js && nyc report --reporter=html", "test-integration": "docker-compose up --abort-on-container-exit --exit-code-from integration-tests --build --remove-orphans --quiet-pull && docker-compose down", @@ -98,7 +98,7 @@ "postcss-loader": "^2.1.5", "prettier": "^1.13.7", "proxyquire": "^1.8.0", - "puppeteer": "^1.5.0", + "puppeteer": "^1.6.1", "raven-js": "^3.26.4", "redis-mock": "^0.21.0", "require-from-string": "^2.0.2", @@ -112,14 +112,14 @@ "svgo-loader": "^2.1.0", "testpilot-ga": "^0.3.0", "val-loader": "^1.1.1", - "webpack": "^4.16.1", + "webpack": "^4.16.2", "webpack-cli": "^3.1.0", "webpack-dev-middleware": "^3.1.3", "webpack-manifest-plugin": "^2.0.3", "webpack-unassert-loader": "^1.2.0" }, "dependencies": { - "aws-sdk": "^2.279.1", + "aws-sdk": "^2.280.1", "babel-polyfill": "^6.26.0", "choo": "^6.12.1", "cldr-core": "^32.0.0", @@ -128,7 +128,7 @@ "express-ws": "^4.0.0", "fluent": "^0.6.4", "fluent-langneg": "^0.1.0", - "helmet": "^3.12.1", + "helmet": "^3.13.0", "mkdirp": "^0.5.1", "mozlog": "^2.2.0", "raven": "^2.6.3", diff --git a/test/frontend/tests/workflow-tests.js b/test/frontend/tests/workflow-tests.js index 70123820..04f5900b 100644 --- a/test/frontend/tests/workflow-tests.js +++ b/test/frontend/tests/workflow-tests.js @@ -3,7 +3,10 @@ import FileSender from '../../../app/fileSender'; import FileReceiver from '../../../app/fileReceiver'; const headless = /Headless/.test(navigator.userAgent); -const noSave = !headless; // only run the saveFile code if headless +// TODO: save on headless doesn't work as it used to since it now +// follows a link instead of fetch. Maybe there's a way to make it +// work? For now always set noSave. +const noSave = true || !headless; // only run the saveFile code if headless // FileSender uses a File in real life but a Blob works for testing const blob = new Blob([new ArrayBuffer(1024 * 128)], { type: 'text/plain' });