Clean up E2E testing configurations (#3360)

.github/workflows/test.yml

@@ -86,7 +86,7 @@ jobs:
         make e2e-serve-${{ matrix.fleet-tier }} &
         sleep 3
         make e2e-setup
-        yarn cypress run --config-file cypress-${{ matrix.fleet-tier }}.json
+        yarn cypress run --config-file cypress/cypress-${{ matrix.fleet-tier }}.json
 
     - name: Upload artifacts
       if: failure()

Makefile

@@ -238,10 +238,10 @@ e2e-setup:
 	./build/fleetctl user create --context e2e --email=observer@example.com --name observer --password=user123# --global-role=observer
 	./build/fleetctl user create --context e2e --email=sso_user@example.com --name "SSO user" --sso=true
 
-e2e-serve-free:
+e2e-serve-free: e2e-reset-db
 	./build/fleet serve --mysql_address=localhost:3307 --mysql_username=root --mysql_password=toor --mysql_database=e2e --server_address=0.0.0.0:8642
 
-e2e-serve-premium:
+e2e-serve-premium: e2e-reset-db
 	./build/fleet serve  --dev_license --mysql_address=localhost:3307 --mysql_username=root --mysql_password=toor --mysql_database=e2e --server_address=0.0.0.0:8642
 
 changelog:

cypress.json

@@ -1,11 +0,0 @@
-{
-  "baseUrl": "https://localhost:8642",
-  "fixturesFolder": false,
-  "testFiles": "**/*.ts",
-  "defaultCommandTimeout": 8000,
-  "retries": {
-    "runMode": 1,
-    "openMode": 0
-  },
-  "videoUploadOnPasses": false
-}

package.json

@@ -8,11 +8,11 @@
     "prettier:check": "prettier --check frontend/**/*.{jsx,js,tsx,ts} ./cypress/**/*.{js,ts}",
     "test": "jest",
     "e2e-browser": "cypress open",
-    "e2e-browser:free": "yarn cypress open --config-file cypress-free.json",
-    "e2e-browser:premium": "yarn cypress open --config-file cypress-premium.json",
+    "e2e-browser:free": "yarn cypress open --config-file cypress/cypress-free.json",
+    "e2e-browser:premium": "yarn cypress open --config-file cypress/cypress-premium.json",
     "e2e-cli": "cypress run",
-    "e2e-cli:free": "yarn cypress run --config-file cypress-free.json",
-    "e2e-cli:premium": "yarn cypress run --config-file cypress-premium.json",
+    "e2e-cli:free": "yarn cypress run --config-file cypress/cypress-free.json",
+    "e2e-cli:premium": "yarn cypress run --config-file cypress/cypress-premium.json",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook"
   },