Skip to content

Commit 90b3037

Browse files
authored
Merge branch 'main' into fix/export-types
2 parents 6cbeff3 + c777009 commit 90b3037

File tree

8 files changed

+215
-189
lines changed

8 files changed

+215
-189
lines changed

.circleci/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ jobs:
145145
- run: *run_yarn_install
146146
- save_cache: *save_yarn_cache
147147
- run: *restore_dist_folders
148+
- run:
149+
name: Setup git user
150+
command: |
151+
git config --global user.email "[email protected]"
152+
git config --global user.name "algolia-bot"
148153
- run:
149154
name: Release if needed
150155
command: yarn run shipjs trigger

cypress.config.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { defineConfig } from 'cypress';
2+
3+
export default defineConfig({
4+
projectId: 'nf9rdc',
5+
e2e: {
6+
baseUrl: 'http://localhost:3000',
7+
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
8+
},
9+
});

cypress.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

cypress/integration/search/actions.spec.ts renamed to cypress/e2e/search/actions.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('Recent and Favorites', () => {
114114
cy.visit(Cypress.config().baseUrl!);
115115
cy.openModal();
116116
cy.typeQueryMatching();
117-
cy.get('#docsearch-item-0 > a').click({ force: true }).wait(3000);
117+
cy.get('#docsearch-item-0 > a').click({ force: true }).wait(1000);
118118
cy.openModal();
119119
cy.contains('Recent').should('be.visible');
120120
});

cypress/plugins/index.js

Lines changed: 0 additions & 23 deletions
This file was deleted.
File renamed without changes.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"cy:run:chrome": "yarn run cy:run --browser chrome",
2222
"cy:run:edge": "yarn run cy:run --browser edge",
2323
"cy:run:firefox": "yarn run cy:run --browser firefox",
24-
"cy:run": "start-server-and-test 'yarn website:test' http://localhost:3000 'cypress run --spec 'cypress/integration/**/*' --headless'",
24+
"cy:run": "start-server-and-test 'yarn website:test' http://localhost:3000 'cypress run --spec 'cypress/e2e/**/*' --headless'",
2525
"cy:verify": "cypress verify",
2626
"lint:css": "stylelint **/src/**/*.css",
2727
"lint": "eslint --ext .js,.ts,.tsx .",
@@ -58,11 +58,11 @@
5858
"babel-plugin-module-resolver": "4.0.0",
5959
"bundlesize2": "0.0.31",
6060
"cssnano": "4.1.10",
61-
"cypress": "9.6.1",
61+
"cypress": "13.15.1",
6262
"eslint": "8.55.0",
6363
"eslint-config-algolia": "20.0.0",
6464
"eslint-config-prettier": "8.10.0",
65-
"eslint-plugin-cypress": "2.14.0",
65+
"eslint-plugin-cypress": "4.1.0",
6666
"eslint-plugin-eslint-comments": "3.2.0",
6767
"eslint-plugin-import": "2.29.0",
6868
"eslint-plugin-jest": "27.6.0",

yarn.lock

Lines changed: 197 additions & 158 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)