Skip to content

Commit

Permalink
Merge branch 'develop' into fb/bump-snaps
Browse files Browse the repository at this point in the history
  • Loading branch information
FrederikBolding authored Sep 25, 2023
2 parents 72c2872 + 25a054d commit dd677d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:firefox:snaps --retries 2 --debug
yarn test:e2e:firefox:snaps --retries 2 --debug --build-type=flask
fi
no_output_timeout: 20m
- run:
Expand Down Expand Up @@ -1055,7 +1055,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:chrome:snaps --retries 2 --debug
yarn test:e2e:chrome:snaps --retries 2 --debug --build-type=flask
fi
no_output_timeout: 20m
- run:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ async function withFixtures(options, testSuite) {
console.log(
`[driver] Called '${prop}' with arguments ${JSON.stringify(
args,
)}`,
).slice(0, 200)}`, // limit the length of the log entry to 200 characters
);
return originalProperty.bind(target)(...args);
};
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ async function main() {
}
}

// These tests should only be ran on Flask for now.
// These tests should only be run on Flask for now.
if (buildType !== 'flask') {
const filteredTests = [
'settings-add-snap-account-toggle.spec.js',
Expand Down

0 comments on commit dd677d8

Please sign in to comment.