Move cypress to client folder (#3566)

getredash · Mar 24, 2019 · 25910e7 · 25910e7
1 parent 8e5ba80
commit 25910e7
Show file tree

Hide file tree

Showing 23 changed files with 20 additions and 11 deletions.
diff --git a/.circleci/Dockerfile.cypress b/.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
diff --git a/.circleci/config.yml b/.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

diff --git a/.gitignore b/.gitignore
@@ -24,5 +24,5 @@ node_modules
 .sass-cache
 npm-debug.log
 
-cypress/screenshots
-cypress/videos
+client/cypress/screenshots
+client/cypress/videos
diff --git a/cypress/cypress.js → client/cypress/cypress.js b/cypress/cypress.js → client/cypress/cypress.js
diff --git a/...s/integration/dashboard/dashboard_spec.js → ...s/integration/dashboard/dashboard_spec.js b/...s/integration/dashboard/dashboard_spec.js → ...s/integration/dashboard/dashboard_spec.js
diff --git a/...on/data-source/create_data_source_spec.js → ...on/data-source/create_data_source_spec.js b/...on/data-source/create_data_source_spec.js → ...on/data-source/create_data_source_spec.js
diff --git a/...tion/data-source/edit_data_source_spec.js → ...tion/data-source/edit_data_source_spec.js b/...tion/data-source/edit_data_source_spec.js → ...tion/data-source/edit_data_source_spec.js
diff --git a/...on/destination/create_destination_spec.js → ...on/destination/create_destination_spec.js b/...on/destination/create_destination_spec.js → ...on/destination/create_destination_spec.js
diff --git a/cypress/integration/group/edit_group_spec.js → ...ress/integration/group/edit_group_spec.js b/cypress/integration/group/edit_group_spec.js → ...ress/integration/group/edit_group_spec.js
diff --git a/cypress/integration/group/group_list_spec.js → ...ress/integration/group/group_list_spec.js b/cypress/integration/group/group_list_spec.js → ...ress/integration/group/group_list_spec.js
diff --git a/...ss/integration/query/create_query_spec.js → ...ss/integration/query/create_query_spec.js b/...ss/integration/query/create_query_spec.js → ...ss/integration/query/create_query_spec.js
diff --git a/...ss/integration/query/search_query_spec.js → ...ss/integration/query/search_query_spec.js b/...ss/integration/query/search_query_spec.js → ...ss/integration/query/search_query_spec.js
diff --git a/...on/settings/organization_settings_spec.js → ...on/settings/organization_settings_spec.js b/...on/settings/organization_settings_spec.js → ...on/settings/organization_settings_spec.js
diff --git a/...ess/integration/user/edit_profile_spec.js → ...ess/integration/user/edit_profile_spec.js b/...ess/integration/user/edit_profile_spec.js → ...ess/integration/user/edit_profile_spec.js
diff --git a/cypress/integration/user/login_spec.js → ...nt/cypress/integration/user/login_spec.js b/cypress/integration/user/login_spec.js → ...nt/cypress/integration/user/login_spec.js
diff --git a/cypress/integration/user/logout_spec.js → ...t/cypress/integration/user/logout_spec.js b/cypress/integration/user/logout_spec.js → ...t/cypress/integration/user/logout_spec.js
diff --git a/cypress/integration/user/user_list_spec.js → ...ypress/integration/user/user_list_spec.js b/cypress/integration/user/user_list_spec.js → ...ypress/integration/user/user_list_spec.js
diff --git a/cypress/plugins/index.js → client/cypress/plugins/index.js b/cypress/plugins/index.js → client/cypress/plugins/index.js
diff --git a/cypress/seed-data.js → client/cypress/seed-data.js b/cypress/seed-data.js → client/cypress/seed-data.js
diff --git a/cypress/support/commands.js → client/cypress/support/commands.js b/cypress/support/commands.js → 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',

diff --git a/cypress/support/index.js → client/cypress/support/index.js b/cypress/support/index.js → client/cypress/support/index.js
diff --git a/cypress.json b/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"
 }
diff --git a/package.json b/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}": [
-      "npm run lint:base",
-      "npm run test -- --bail --findRelatedTests"
-    ]
+    "linters": {
+      "client/**/*.{js,jsx}": [
+        "npm run lint:base",
+        "npm run test -- --bail --findRelatedTests"
+      ]
+    },
+    "ignore": ["client/dist/*"]
   }
 }