Skip to content

Commit 0fede06

Browse files
committed
Merge branch 'develop' into unified-desktop-gui
* develop: (33 commits) fix: remove .json check from require_async, prevent child_process spawn (#18416) percy snapshot the tooltip visually, prevent it from being hidden fix: `everyNthFrame` should only be applied for Chrome 89+ (#18392) docs: General updates to contributing guide (#18283) chore: Update Chrome (beta) to 95.0.4638.40 (#18389) chore: use circleci timings split for e2e tests (#18367) fix: fixed title (#18370) chore(deps): update dependency electron to v14 🌟 (#18384) chore(server): share client route (#18215) fix: Prevent Cypress from crashing when argument parsing "spec: {}" (#18312) chore: update husky dev dependency to v7 (#18345) feat: add defineConfig function to help type config (#18302) chore: Update Chrome (stable) to 94.0.4606.71 (#18324) feat: allow to use TypeScript in the config file (#18300) allow select to be called with empty array (#18329) fix(vite-dev-server): windows `supportFile` + preserve optimize entries (#18286) chore: fix semantic-release dry run (#18332) fix(driver): improve status_code_flags_invalid error message (#18316) chore(deps): update dependency electron to v13.5.0 🌟 (#18318) chore: Update Chrome (stable) to 94.0.4606.61 and Chrome (beta) to 95.0.4638.32 (#18229) ...
2 parents ad4bfd2 + 32464f3 commit 0fede06

File tree

168 files changed

+122
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+122
-91
lines changed

CONTRIBUTING.md

Lines changed: 63 additions & 57 deletions

browser-versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"chrome:beta": "95.0.4638.32",
2+
"chrome:beta": "95.0.4638.40",
33
"chrome:stable": "94.0.4606.71"
44
}

circle.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,20 @@ commands:
460460
steps:
461461
- restore_cached_workspace
462462
- run:
463-
command: yarn workspace @packages/server test ./test/e2e/$(( $CIRCLE_NODE_INDEX ))_*spec* --browser <<parameters.browser>>
463+
command: |
464+
ALL_SPECS=`circleci tests glob "/root/cypress/packages/server/test/e2e/*spec*"`
465+
SPECS=
466+
for file in $ALL_SPECS; do
467+
# filter out non_root tests, they have their own stage
468+
if [[ "$file" == *"non_root"* ]]; then
469+
echo "Skipping $file"
470+
continue
471+
fi
472+
SPECS="$SPECS $file"
473+
done
474+
SPECS=`echo $SPECS | xargs -n 1 | circleci tests split --split-by=timings`
475+
echo SPECS=$SPECS
476+
yarn workspace @packages/server test $SPECS --browser <<parameters.browser>>
464477
- verify-mocha-results
465478
- store_test_results:
466479
path: /tmp/cypress
@@ -1038,9 +1051,6 @@ jobs:
10381051
- run: yarn test
10391052
# run type checking for each individual package
10401053
- run: yarn lerna run types
1041-
# check for compile errors with the releaserc scripts
1042-
- run: yarn test-npm-package-release-script
1043-
10441054
- verify-mocha-results:
10451055
expectedResultCount: 9
10461056
- store_test_results:

cli/README.md

Lines changed: 1 addition & 1 deletion

npm/vite-dev-server/src/startServer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export interface StartDevServerOptions {
1818
* @optional
1919
*/
2020
viteConfig?: Omit<InlineConfig, 'base' | 'root'>
21-
2221
/**
2322
* Path to an index.html file that will serve as the template in
2423
* which your components will be rendered.

packages/desktop-gui/cypress/integration/project_nav_spec.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,17 @@ describe('Project Nav', function () {
437437
cy.get('.browsers .fa-exclamation-triangle').trigger('mouseover')
438438

439439
cy.get('.cy-tooltip').should('contain', 'Cypress detected policy settings on your computer that may cause issues with using this browser. For more information, see')
440-
cy.get('.cy-tooltip a').click().then(function () {
440+
441+
// prevent tooltips from being hidden so we can snapshot the state
442+
// of the browser warning tooltip
443+
cy.percySnapshot({ elementOverrides: [] })
444+
445+
cy
446+
.get('.cy-tooltip a')
447+
.click()
448+
.then(function () {
441449
expect(this.ipc.externalOpen).to.be.calledWith('https://on.cypress.io/bad-browser-policy')
442450
})
443-
444-
cy.percySnapshot()
445451
})
446452
})
447453

packages/server/README.md

Lines changed: 3 additions & 3 deletions

0 commit comments

Comments
 (0)