ci: run cypress tests in parallel

.github/workflows/main.yml

@@ -55,45 +55,6 @@ jobs:
           COVERALLS_SERVICE_NAME: "Github Actions"
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
-  e2e:
-    name: E2E Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Set Node Version
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.13.0
-      - name: Restore yarn cache
-        uses: actions/cache@preview
-        with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles(format('{0}{1}', github.workspace, '/Composer/yarn.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: yarn install
-        run: yarn
-        working-directory: Composer
-      - name: yarn build:prod
-        run: yarn build:prod
-        working-directory: Composer
-      - name: yarn test:integration
-        continue-on-error: true
-        run: yarn test:integration
-        working-directory: Composer
-        env:
-          CYPRESS_COMPOSER_URL: http://localhost:5000
-      - name: Archive E2E Failures
-        continue-on-error: true
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: cypress
-          path: Composer/cypress/screenshots
-
   botproject:
     name: BotProject
     runs-on: windows-latest

.github/workflows/validate-pr.yml

@@ -1,6 +1,8 @@
 name: Pull Request Validation
 
-on: pull_request
+on:
+  pull_request:
+    types: [opened, reopened, edited]
 
 jobs:
   conventional-pr:

Composer/cypress.json

@@ -1,4 +1,5 @@
 {
+  "projectId": "27ikaq",
   "ignoreTestFiles": [
     "**/examples/*",
     "*.hot-update.js"

Composer/package.json

@@ -20,7 +20,7 @@
     "build:extensions": "yarn workspace @bfc/extensions build:all",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
-    "start": "cross-env NODE_ENV=production PORT=3000 concurrently --kill-others-on-fail \"npm:start:server\"",
+    "start": "cross-env NODE_ENV=production PORT=3000 yarn start:server",
     "startall": "concurrently --kill-others-on-fail \"npm:runtime\" \"npm:start\"",
     "start:dev": "concurrently  \"npm:start:client\" \"npm:start:server:dev\"",
     "start:client": "yarn workspace @bfc/client start",
@@ -29,12 +29,9 @@
     "runtime": "cd ../BotProject/CSharp/ && dotnet build && dotnet run",
     "test": "yarn typecheck && jest",
     "test:coverage": "yarn test --coverage --no-cache --reporters=default",
-    "test:integration": "start-server-and-test test:integration:start http://localhost:5000 test:integration:run",
-    "test:integration:prereport": "rimraf cypress/results",
-    "test:integration:start": "cd packages/server && node build/server.js",
+    "test:integration": "cypress run --browser chrome",
     "test:integration:open": "cypress open",
-    "test:integration:run": "yarn run test:integration:prereport && cypress run --reporter mocha-multi-reporters --reporter-options configFile=reporter-config.json --browser chrome",
-    "test:integration:clean": "rimraf ../MyBots/__Test* packages/server/data.json && git checkout ../MyBots",
+    "test:integration:clean": "rimraf ../MyBots/__Test* packages/server/data.json",
     "lint": "wsrun --exclude-missing --collect-logs --report lint",
     "lint:fix": "wsrun --exclude-missing --collect-logs --report lint:fix",
     "typecheck": "concurrently --kill-others-on-fail \"npm:typecheck:*\"",
@@ -68,7 +65,7 @@
     "babel-jest": "24.0.0",
     "concurrently": "^4.1.0",
     "coveralls": "^3.0.7",
-    "cypress": "^3.6.0",
+    "cypress": "^3.6.1",
     "cypress-plugin-tab": "^1.0.1",
     "cypress-testing-library": "^3.0.1",
     "eslint": "^5.15.1",
@@ -95,7 +92,6 @@
     "prettier": "^1.15.3",
     "react-testing-library": "^6.0.2",
     "rimraf": "^2.6.3",
-    "start-server-and-test": "^1.9.0",
     "typescript": "3.6.4",
     "wsrun": "^3.6.4"
   },

Composer/scripts/e2e.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+yarn start &
+SERVER_PID=$!
+
+npx cypress run --browser chrome --record --parallel --ci-build-id $BUILD_BUILDNUMBER --group "Azure CI"
+cleanup
+
+function cleanup {
+  kill -9 $SERVER_PID
+}
+
+# kill server process
+trap cleanup EXIT
+