Fix: read config file on Windows

And added test on all platforms for reading the config.
This commit is contained in:
Peter Hedenskog 2023-07-29 19:16:04 +02:00 committed by GitHub
parent 3a629d9a7b
commit f8da80f021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 5 deletions

View File

@ -31,4 +31,6 @@ jobs:
- name: Test WebPageReplay with Chrome
run: docker run --cap-add=NET_ADMIN --rm -v "$(pwd)":/sitespeed.io -e REPLAY=true -e LATENCY=100 sitespeedio/sitespeed.io https://www.sitespeed.io -n 3 -b chrome
- name: Test WebPageReplay with Firefox
run: docker run --cap-add=NET_ADMIN --rm -v "$(pwd)":/sitespeed.io --network=host -e REPLAY=true -e LATENCY=100 sitespeedio/sitespeed.io https://www.sitespeed.io -n 3 -b firefox --browsertime.firefox.acceptInsecureCerts true
run: docker run --cap-add=NET_ADMIN --rm -v "$(pwd)":/sitespeed.io --network=host -e REPLAY=true -e LATENCY=100 sitespeedio/sitespeed.io https://www.sitespeed.io -n 3 -b firefox --browsertime.firefox.acceptInsecureCerts true
- name: Run Chrome test with config
run: docker run --rm -v "$(pwd)":/sitespeed.io --network=host sitespeedio/sitespeed.io http://127.0.0.1:3001 -b chrome --config test/exampleConfig.json

View File

@ -67,4 +67,6 @@ jobs:
- name: Run test with Influx 1.8
run: bin/sitespeed.js http://127.0.0.1:3001/simple/ -n 1 --influxdb.host 127.0.0.1 --xvfb --logToFile
- name: Run test with Influx 2.6.1
run: bin/sitespeed.js http://127.0.0.1:3001/simple/ -n 1 --influxdb.host 127.0.0.1 --influxdb.port 8087 --influxdb.version 2 --influxdb.organisation sitespeed --influxdb.token sitespeed --xvfb
run: bin/sitespeed.js http://127.0.0.1:3001/simple/ -n 1 --influxdb.host 127.0.0.1 --influxdb.port 8087 --influxdb.version 2 --influxdb.organisation sitespeed --influxdb.token sitespeed --xvfb
- name: Run Chrome test with config
run: node bin/sitespeed.js --config test/exampleConfig.json http://127.0.0.1:3001/simple/ --xvfb

View File

@ -25,3 +25,5 @@ jobs:
run: (serve test/data/html/ -l 3001&)
- name: Run test
run: bin/sitespeed.js -b safari http://127.0.0.1:3001/
- name: Run Safari test with config
run: node bin/sitespeed.js -b safari --config test/exampleConfig.json http://127.0.0.1:3001/

View File

@ -29,4 +29,7 @@ jobs:
- name: Run Edge test with scripting
run: node bin/sitespeed.js -b edge --multi test/prepostscripts/multiWindows.cjs -n 1
shell: cmd
- name: Run Edge test with config
run: node bin/sitespeed.js -b edge --config test/exampleConfig.json https://www.sitespeed.io/
shell: cmd

View File

@ -2064,9 +2064,7 @@ export async function parseCommandLine() {
if (argv.config) {
const config = JSON.parse(
await readFileSync(
new URL(resolve(process.cwd(), argv.config), import.meta.url)
)
await readFileSync(resolve(process.cwd(), argv.config))
);
explicitOptions = merge(explicitOptions, config);
}

5
test/exampleConfig.json Normal file
View File

@ -0,0 +1,5 @@
{
"browsertime": {
"iterations" : 1
}
}