diff --git a/package-lock.json b/package-lock.json index cb42212c7..bf73196e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7772,16 +7772,16 @@ } }, "node_modules/puppeteer": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-25.2.0.tgz", - "integrity": "sha512-JPMPd/2+lgdkLhEyPqH895oR3ccMt1wSra6oewgjjTuLmo2s9zPZpKXQTFEIiA/fMKpiL01kjU3+2zPEReRWNg==", + "version": "25.2.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-25.2.1.tgz", + "integrity": "sha512-2D5RMkQH9FRhDU57a1/jV9xWoxqZvUjaZOYjAAPdRCEY8A01V5sxzyGOMs8XiKU9fPF91SOSwNYpHRu5SD958g==", "hasInstallScript": true, "dependencies": { "@puppeteer/browsers": "3.0.5", "chromium-bidi": "16.0.1", "devtools-protocol": "0.0.1638949", "lilconfig": "^3.1.3", - "puppeteer-core": "25.2.0", + "puppeteer-core": "25.2.1", "typed-query-selector": "^2.12.2" }, "bin": { @@ -7792,9 +7792,9 @@ } }, "node_modules/puppeteer-core": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-25.2.0.tgz", - "integrity": "sha512-jGhuGAlkgOcbyGRc0Cm9b/y4vvqoxhyAyl6a1diVe8F3sHsgTaQ60QQT5F3rGegTZV3prysgHVc+0LsvPZo3GA==", + "version": "25.2.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-25.2.1.tgz", + "integrity": "sha512-MwEZ4FFGJ1ZLOmu/04eISxoEMKtCnHyJBRFfgpwPPSYNG6gT6Xw1laNziFSV7uwDcx3jK+ATYIo9SfOd8Uhc3w==", "dependencies": { "@puppeteer/browsers": "3.0.5", "chromium-bidi": "16.0.1", @@ -14593,22 +14593,22 @@ "dev": true }, "puppeteer": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-25.2.0.tgz", - "integrity": "sha512-JPMPd/2+lgdkLhEyPqH895oR3ccMt1wSra6oewgjjTuLmo2s9zPZpKXQTFEIiA/fMKpiL01kjU3+2zPEReRWNg==", + "version": "25.2.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-25.2.1.tgz", + "integrity": "sha512-2D5RMkQH9FRhDU57a1/jV9xWoxqZvUjaZOYjAAPdRCEY8A01V5sxzyGOMs8XiKU9fPF91SOSwNYpHRu5SD958g==", "requires": { "@puppeteer/browsers": "3.0.5", "chromium-bidi": "16.0.1", "devtools-protocol": "0.0.1638949", "lilconfig": "^3.1.3", - "puppeteer-core": "25.2.0", + "puppeteer-core": "25.2.1", "typed-query-selector": "^2.12.2" } }, "puppeteer-core": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-25.2.0.tgz", - "integrity": "sha512-jGhuGAlkgOcbyGRc0Cm9b/y4vvqoxhyAyl6a1diVe8F3sHsgTaQ60QQT5F3rGegTZV3prysgHVc+0LsvPZo3GA==", + "version": "25.2.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-25.2.1.tgz", + "integrity": "sha512-MwEZ4FFGJ1ZLOmu/04eISxoEMKtCnHyJBRFfgpwPPSYNG6gT6Xw1laNziFSV7uwDcx3jK+ATYIo9SfOd8Uhc3w==", "requires": { "@puppeteer/browsers": "3.0.5", "chromium-bidi": "16.0.1", diff --git a/package.json b/package.json index 5aee9d446..913a9d7a2 100644 --- a/package.json +++ b/package.json @@ -72,5 +72,8 @@ "lines": 89 } } + }, + "allowScripts": { + "puppeteer@25.2.1": true } } diff --git a/test/integration-spec.yaml b/test/integration-spec.yaml index bcba584bd..e3fb5844a 100644 --- a/test/integration-spec.yaml +++ b/test/integration-spec.yaml @@ -864,7 +864,7 @@ options: phone: true metrics: - device: "Linux; Android 10; SM-G981B" + device: "Linux; Android 5.0; SM-G900P Build/LRX21T" viewport: "360x640" - url: "/devices.html" @@ -872,7 +872,7 @@ options: "phone-landscape": true metrics: - device: "Linux; Android 10; SM-G981B" + device: "Linux; Android 5.0; SM-G900P Build/LRX21T" viewport: "640x360" - url: "/devices.html" @@ -880,7 +880,7 @@ options: tablet: true metrics: - device: "Linux; Android 10; SM-T870" + device: "Linux; U; en-us; KFAPWI Build/JDQ39" viewport: "800x1280" - url: "/devices.html" @@ -888,7 +888,7 @@ options: "tablet-landscape": true metrics: - device: "Linux; Android 10; SM-T870" + device: "Linux; U; en-us; KFAPWI Build/JDQ39" viewport: "1280x800" # viewport @@ -1039,7 +1039,7 @@ options: phone: true metrics: - device: 'Linux; Android 10; SM-G981B' + device: 'Linux; Android 5.0; SM-G900P Build/LRX21T' #user-agent - url: "/user-agent.html" @@ -1047,7 +1047,7 @@ options: tablet: true metrics: - device: 'Linux; Android 10; SM-T870' + device: 'Linux; U; en-us; KFAPWI Build/JDQ39' # user-agent - url: "/user-agent.html" diff --git a/test/webroot/devices.html b/test/webroot/devices.html index 04b6240e9..6a02deb83 100644 --- a/test/webroot/devices.html +++ b/test/webroot/devices.html @@ -3,10 +3,13 @@ console.log(navigator.userAgent); console.log(window.outerWidth, window.outerHeight); - const match = navigator.userAgent.match(/Mozilla\/5\.0 \((.*)\) AppleWebKit\/(.*) \(KHTML, like Gecko\) Chrome\/(.*) Safari\/(.*) Phantomas\/(.*)/); + // e.g. Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3765.0 Mobile Safari/537.36 + // e.g. Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true + const match = navigator.userAgent.match(/Mozilla\/5\.0 \(([^)]+)\)/); (phantomas => { - phantomas.setMetric('device', match[1]); + phantomas.log('User agent: ', navigator.userAgent); + phantomas.setMetric('device', match && match[1] || 'n/a'); phantomas.setMetric('viewport', window.outerWidth + 'x' + window.outerHeight); })(window.__phantomas); diff --git a/test/webroot/user-agent.html b/test/webroot/user-agent.html index add757a13..841dab9ed 100644 --- a/test/webroot/user-agent.html +++ b/test/webroot/user-agent.html @@ -1,6 +1,6 @@