Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #11840 from matrix-org/midhun/remove-sorry-cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
Johennes authored Nov 9, 2023
2 parents 7a0b1d5 + 46d3688 commit a3190cb
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 338 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,12 @@ jobs:
wait-on: "http://localhost:8080"
record: true
parallel: false
command: "yarn percy exec --parallel -- npx cypress-cloud run"
command: "yarn percy exec --parallel --"
ci-build-id: ${{ needs.prepare.outputs.uuid }}-${{ matrix.crypto }}
spec: cypress/e2e/[${{ matrix.segment }}]*/**
env:
# pass the Dashboard record key as an environment variable
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CURRENTS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CURRENTS_PROJECT_ID: ${{ github.repository }}
CURRENTS_API_URL: ${{ vars.CURRENTS_API_URL }}

# Use existing chromium rather than downloading another
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
Expand Down
13 changes: 1 addition & 12 deletions cypress/plugins/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ limitations under the License.

/// <reference types="cypress" />
import installLogsPrinter from "cypress-terminal-report/src/installLogsPrinter";
import cloudPlugin from "cypress-cloud/plugin";
import { initPlugins } from "cypress-plugin-init";

import PluginEvents = Cypress.PluginEvents;
Expand All @@ -36,17 +35,7 @@ import { mailhogDocker } from "./mailhog";
export default function (on: PluginEvents, config: PluginConfigOptions) {
initPlugins(
on,
[
cloudPlugin,
docker,
synapseDocker,
dendriteDocker,
slidingSyncProxyDocker,
webserver,
oAuthServer,
log,
mailhogDocker,
],
[docker, synapseDocker, dendriteDocker, slidingSyncProxyDocker, webserver, oAuthServer, log, mailhogDocker],
config,
);
installLogsPrinter(on, {
Expand Down
1 change: 0 additions & 1 deletion cypress/support/e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import "@percy/cypress";
import "cypress-real-events";
import "@testing-library/cypress/add-commands";
import installLogsCollector from "cypress-terminal-report/src/installLogsCollector";
import "cypress-cloud/support";

import "./config.json";
import "./homeserver";
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@
"chokidar": "^3.5.1",
"cypress": "^12.0.0",
"cypress-axe": "^1.0.0",
"cypress-cloud": "^2.0.0-beta.0",
"cypress-multi-reporters": "^1.6.1",
"cypress-plugin-init": "^0.0.8",
"cypress-real-events": "^1.7.1",
Expand Down
Loading

0 comments on commit a3190cb

Please sign in to comment.