chore(dev-deps): bump cypress and fix specs (#392)

hello-pangea · Aug 21, 2022 · 26bf701 · 26bf701
1 parent b990622
commit 26bf701
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 36 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -0,0 +1,13 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  pageLoadTimeout: 10000,
+  retries: 1,
+  viewportHeight: 600,
+  viewportWidth: 800,
+
+  e2e: {
+    baseUrl: 'http://localhost:9002',
+    specPattern: 'cypress/**/*.spec.ts',
+  },
+});
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/integration/reorder-lists.spec.ts b/cypress/integration/reorder-lists.spec.ts
@@ -23,6 +23,9 @@ describe('reorder lists', () => {
       .wait(timings.outOfTheWay * 1000)
       .trigger('keydown', { keyCode: keyCodes.space, force: true });
 
+    // we must wait before asserting the new order
+    cy.wait(timings.outOfTheWay * 1000);
+
     // order now 2, 1
     // note: not using get aliases as they where returning incorrect results
     cy.get('h4').eq(0).should('contain', 'BMO');

diff --git a/cypress/integration/reorder-virtual.spec.ts b/cypress/integration/reorder-virtual.spec.ts
@@ -40,6 +40,9 @@ describe('reorder: virtual', () => {
       force: true,
     });
 
+    // we must wait before asserting the new order
+    cy.wait(timings.outOfTheWay * 1000);
+
     // This is setting up a chain of commands and this test will not wait
     // for a 'promise' to resolve. Linting is getting confused by .then
     cy.get('@item-id').then((id) => {

diff --git a/cypress/integration/reorder.spec.ts b/cypress/integration/reorder.spec.ts
@@ -23,6 +23,9 @@ describe('reorder', () => {
       .wait(timings.outOfTheWay * 1000)
       .trigger('keydown', { keyCode: keyCodes.space, force: true });
 
+    // we must wait before asserting the new order
+    cy.wait(timings.outOfTheWay * 1000);
+
     // order now 2, 1
     // note: not using get aliases as they where returning incorrect results
     cy.get(getHandleSelector()).eq(0).should('contain', 'id:G2');

diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
diff --git a/cypress/support/commands.js → cypress/support/commands.ts b/cypress/support/commands.js → cypress/support/commands.ts
@@ -23,3 +23,5 @@
 //
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+
+export {};
diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>
diff --git a/cypress/support/component.ts b/cypress/support/component.ts
@@ -0,0 +1,36 @@
+// ***********************************************************
+// This example support/component.ts is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+import './commands';
+
+import { mount } from 'cypress/react18';
+
+// Augment the Cypress namespace to include type definitions for
+// your custom command.
+// Alternatively, can be defined in cypress/support/component.d.ts
+// with a <reference path="./component" /> at the top of your spec.
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    interface Chainable {
+      mount: typeof mount;
+    }
+  }
+}
+
+Cypress.Commands.add('mount', mount);
+
+// Example use:
+// cy.mount(<MyComponent />);
diff --git a/cypress/support/index.js → cypress/support/e2e.ts b/cypress/support/index.js → cypress/support/e2e.ts
@@ -13,8 +13,4 @@
 // https://on.cypress.io/configuration
 // ***********************************************************
 
-// Import commands.js using ES2015 syntax:
 import './commands';
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
diff --git a/package.json b/package.json
@@ -140,7 +140,7 @@
     "commitizen": "4.2.4",
     "cross-env": "7.0.3",
     "csstype": "3.0.11",
-    "cypress": "9.5.3",
+    "cypress": "10.6.0",
     "dotenv": "16.0.0",
     "emotion-theming": "11.0.0",
     "eslint": "8.13.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml