Move cypress to client folder (#3566)

.circleci/Dockerfile.cypress

@@ -6,7 +6,7 @@ WORKDIR $APP
 COPY package.json $APP/package.json
 RUN npm run cypress:install > /dev/null
 
-COPY cypress $APP/cypress
+COPY client/cypress $APP/client/cypress
 COPY cypress.json $APP/cypress.json
 
 RUN ./node_modules/.bin/cypress verify

.circleci/config.yml

@@ -72,7 +72,7 @@ jobs:
           name: Setup Redash server
           command: |
             npm run cypress start
-            docker-compose run cypress node ./cypress/cypress.js db-seed
+            docker-compose run cypress npm run cypress db-seed
       - run:
           name: Execute Cypress tests
           command: npm run cypress run-ci

.gitignore

@@ -24,5 +24,5 @@ node_modules
 .sass-cache
 npm-debug.log
 
-cypress/screenshots
+client/cypress/screenshots
-cypress/videos
+client/cypress/videos

client/cypress/support/commands.js

@@ -1,4 +1,4 @@
-import '@percy/cypress';
+import '@percy/cypress'; // eslint-disable-line import/no-extraneous-dependencies
 
 Cypress.Commands.add('login', (email = 'admin@redash.io', password = 'password') => cy.request({
   url: '/login',

cypress.json

@@ -1,4 +1,10 @@
 {
   "baseUrl": "http://localhost:5000",
-  "video": false
+  "video": false,
+  "fixturesFolder": "client/cypress/fixtures",
+  "integrationFolder": "client/cypress/integration",
+  "pluginsFile": "client/cypress/plugins/index.js",
+  "screenshotsFolder": "client/cypress/screenshots",
+  "videosFolder": "client/cypress/videos",
+  "supportFile": "client/cypress/support/index.js"
 }

package.json

@@ -16,7 +16,7 @@
     "test": "TZ=Africa/Khartoum jest",
     "test:watch": "jest --watch",
     "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2",
-    "cypress": "node cypress/cypress.js"
+    "cypress": "node client/cypress/cypress.js"
   },
   "repository": {
     "type": "git",
@@ -155,9 +155,12 @@
     }
   },
   "lint-staged": {
-    "client/app/**/*.{js,jsx}": [
+    "linters": {
+      "client/**/*.{js,jsx}": [
         "npm run lint:base",
         "npm run test -- --bail --findRelatedTests"
       ]
+    },
+    "ignore": ["client/dist/*"]
   }
 }