Greenstand · dadiorchen · Dec 9, 2022 · Jun 16, 2023 · Jun 16, 2023 · Jun 17, 2023
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,7 +23,7 @@ module.exports = {
 
     // allow test files to use dev dependencies
     'import/no-extraneous-dependencies': [
-      'error',
+      'warn',
       {
         devDependencies: [
           '**/*.{test,cy,spec}.js',
@@ -71,6 +71,10 @@ module.exports = {
     'prefer-destructuring': 'warn',
     'no-unreachable': 'warn',
     'cypress/unsafe-to-chain-command': 'warn',
+    'import/no-extraneous-dependencies': 'warn',
+    'global-require': 'warn',
+    'import/extensions': 'warn',
+    'no-dupe-keys': 'warn',
   },
 
   reportUnusedDisableDirectives: true,

diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Run Component tests 🧪
         uses: cypress-io/github-action@v4
         with:
-          command: npx cypress run-ct
+          command: npm run cypress:run:component
 
       - name: Jest Unit Tests 🧪
         run: npx jest --ci

diff --git a/.lintstagedrc.js b/.lintstagedrc.js
@@ -5,11 +5,8 @@ module.exports = {
   // import alias for uniform pattern of imports
   'src/**/*.js': ['jscodeshift  -t scripts/codeshift.js'],
 
-  // format all file types recognized by prettier
-  '*': ['prettier --ignore-unknown --write'],
-
   // lint javascript after formatting
-  '*.{js,jsx}': ['eslint --fix --cache'],
+  '*.{js,jsx}': ['eslint --fix --cache', 'prettier --ignore-unknown --write'],
 
   // lint entire project if eslint settings changed, do not pass file name arguments
   '.eslint*': () => 'eslint . --cache',

diff --git a/.prettierignore b/.prettierignore
@@ -2,4 +2,8 @@
 **/dist/**
 package-lock.json
 coverage
-node_modules
+node_modules
+*.md
+*.yaml
+deployment*
+doc
diff --git a/.releaserc.json b/.releaserc.json
@@ -5,11 +5,6 @@
     "master",
     "next",
     "next-major",
-    {
-      "name": "beta",
-      "prerelease": true,
-      "channel": "beta"
-    },
     {
       "name": "v2",
       "prerelease": true,

diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ We recommend using Cypress's component testing tool to build components in isola
 **To run Cypress unit/component tests:**
 
 ```
-npm run cyu
+npm run cypress:open
 ```
 
 [Video tutorial for building component](https://loom.com/share/c750be68ecec4a9b99cb6921d2d2e041)
@@ -189,12 +189,6 @@ Also, integration tests bring some benefits for the development workflow - by mo
 
 **To run Cypress integration tests:**
 
-Open cypress test viewer
-
-```
-npm run cypress:open
-```
-
 Nextjs dev server + Cypress test viewer + nock
 
 ```
@@ -443,3 +437,4 @@ Sometimes we need to connect production data (map, tree) to debug, to do so, cop
 .
 .
 .
+.
diff --git a/cypress.config.js b/cypress.config.js
@@ -0,0 +1,34 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  viewportWidth: 1440,
+  viewportHeight: 800,
+  nodeVersion: 'system',
+
+  'cypress-watch-and-reload': {
+    watch: ['src/**'],
+  },
+
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config);
+    },
+    baseUrl: 'http://localhost:3000',
+    specPattern: 'cypress/tests/**/*.cy.{js,jsx,ts,tsx}',
+  },
+
+  component: {
+    setupNodeEvents(on, config) {},
+    supportFile: 'cypress/support/components-testing.js',
+    specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}',
+  },
+
+  component: {
+    devServer: {
+      framework: 'next',
+      bundler: 'webpack',
+    },
+  },
+});
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -17,7 +17,10 @@ module.exports = async (on, config) => {
   config.env.NEXT_PUBLIC_BASE = process.env.NEXT_PUBLIC_BASE;
 
   // exit if not using nock to mock nextjs ssr functions
-  if (!config.env.nock) return config;
+  if (!config.env.nock) {
+    console.warn("Cypress.env('nock') is not set, skipping nock preparation");
+    return config;
+  }
 
   const app = next({ dev: true });
   const handleNextRequests = app.getRequestHandler();

diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html
@@ -0,0 +1,14 @@
+<!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>
+    <!-- Used by Next.js to inject CSS. -->
+    <div id="__next_css__DO_NOT_USE__"></div>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>
diff --git a/cypress/support/component.js b/cypress/support/component.js
@@ -0,0 +1,27 @@
+// ***********************************************************
+// This example support/component.js 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.js using ES2015 syntax:
+import './commands';
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+import { mount } from 'cypress/react';
+
+Cypress.Commands.add('mount', mount);
+
+// Example use:
+// cy.mount(<MyComponent />)
diff --git a/cypress/support/index.js → cypress/support/e2e.js b/cypress/support/index.js → cypress/support/e2e.js
diff --git a/cypress/tests/integration/nockRoutes.js b/cypress/tests/integration/nockRoutes.js
@@ -107,7 +107,10 @@ export function getNockRoutes(
 }
 
 export function prepareNocks(props) {
-  if (!Cypress.env('nock')) return;
+  if (!Cypress.env('nock')) {
+    console.warn("Cypress.env('nock') is not set, skipping nock preparation");
+    return;
+  }
   cy.task('nocks', {
     hostname: Cypress.env('NEXT_PUBLIC_API'),
     routes: getNockRoutes(props),

diff --git a/cypress/tests/integration/planters/[planterid].cy.js b/cypress/tests/integration/planters/[planterid].cy.js
@@ -12,7 +12,6 @@ describe('Planter page', () => {
     cy.visit(path, {
       failOnStatusCode: false,
     });
-    cy.contains(planter.id);
     cy.get('.MuiTypography-h2').contains(/sebastian g/i);
     cy.screenshot();
   });

diff --git a/cypress/tests/integration/wallets/[walletid].cy.js b/cypress/tests/integration/wallets/[walletid].cy.js
@@ -154,7 +154,6 @@ describe('Planter page', () => {
     cy.visit(path, {
       failOnStatusCode: false,
     });
-    cy.contains(wallet.id);
     cy.get('.MuiTypography-h2')
       .eq(0)
       .contains(/Maynard.Stroman79/i);