datahub-project · jjoyce0510 · Jan 5, 2023 · Jan 4, 2023 · Jan 4, 2023 · Jan 4, 2023
diff --git a/datahub-web-react/README.md b/datahub-web-react/README.md
@@ -53,15 +53,11 @@ Optionally you could also start the app with the mock server without running the
 
 ### Functional testing
 
-Automated functional testing is powered by Cypress and MirageJS. When running the web server with Cypress the port is set to 3010 so that the usual web server running on port 3000 used for development can be started without interruptions.
+In order to start a server and run frontend unit tests using react-testing-framework, run:
 
-#### During development
+`yarn test :e2e`
 
-`yarn test:e2e`
-
-#### CI
-
-`yarn test:e2e:ci`
+There are also more automated tests using Cypress in the `smoke-test` folder of the repository root.
 
 #### Troubleshooting
 `Error: error:0308010C:digital envelope routines::unsupported`: This error message shows up when using Node 17, due to an OpenSSL update related to md5.  

diff --git a/datahub-web-react/cypress.json b/datahub-web-react/cypress.json
diff --git a/datahub-web-react/cypress/.eslintrc.js b/datahub-web-react/cypress/.eslintrc.js
diff --git a/datahub-web-react/cypress/fixtures/example.json b/datahub-web-react/cypress/fixtures/example.json
diff --git a/datahub-web-react/cypress/helper/authHelper.ts b/datahub-web-react/cypress/helper/authHelper.ts
diff --git a/datahub-web-react/cypress/integration/Login.spec.ts b/datahub-web-react/cypress/integration/Login.spec.ts
diff --git a/datahub-web-react/cypress/integration/Search.spec.ts b/datahub-web-react/cypress/integration/Search.spec.ts
diff --git a/datahub-web-react/cypress/plugins/index.js b/datahub-web-react/cypress/plugins/index.js
diff --git a/datahub-web-react/cypress/support/index.js b/datahub-web-react/cypress/support/index.js
diff --git a/datahub-web-react/cypress/tsconfig.json b/datahub-web-react/cypress/tsconfig.json
diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
@@ -12,7 +12,6 @@
         "@ant-design/icons": "^4.3.0",
         "@apollo/client": "^3.3.19",
         "@craco/craco": "^6.1.1",
-        "@cypress/webpack-preprocessor": "5.8.0",
         "@data-ui/xy-chart": "^0.0.84",
         "@miragejs/graphql": "^0.1.11",
         "@monaco-editor/react": "^4.3.1",
@@ -50,7 +49,6 @@
         "color-hash": "^2.0.1",
         "craco-antd": "^1.19.0",
         "cronstrue": "^1.122.0",
-        "cypress": "7.3.0",
         "d3-scale": "^3.3.0",
         "d3-time-format": "^3.0.0",
         "deepmerge": "^4.2.2",
@@ -104,11 +102,8 @@
         "ec2-dev": "yarn run generate && CI=true;export CI;BROWSER=none craco start",
         "build": "yarn run generate && CI=false REACT_APP_MOCK=false craco build && rm -rf dist/ && cp -r build/yarn/ dist/ && rm -r build/yarn/",
         "test": "craco test",
-        "cy:run:ci": "cypress run",
         "pretest:e2e:ci": "yarn generate",
-        "test:e2e:ci": "start-server-and-test start:e2e 3010 cy:run:ci",
-        "cy:open": "cypress open",
-        "test:e2e": "start-server-and-test start:e2e 3010 cy:open",
+        "test:e2e": "start-server-and-test start:e2e 3010",
         "eject": "react-scripts eject",
         "generate": "graphql-codegen --config codegen.yml",
         "lint": "eslint . --ext .ts,.tsx --quiet",