From 687da723fd9a91d211787fd23ca558db72f92117 Mon Sep 17 00:00:00 2001 From: "Kalle (Sendou)" <38327916+Sendouc@users.noreply.github.com> Date: Sat, 4 Dec 2021 15:22:33 +0200 Subject: [PATCH] Update tests --- app/components/Alert.tsx | 10 +- app/components/tournament/InfoBanner.tsx | 7 +- .../manage-roster.tsx | 2 +- app/services/tournament.ts | 1 - cypress.json | 3 +- cypress/integration/tournament.spec.ts | 4 +- package-lock.json | 125 +++--------------- package.json | 2 +- 8 files changed, 31 insertions(+), 123 deletions(-) diff --git a/app/components/Alert.tsx b/app/components/Alert.tsx index 2be6e25ab..a555a0244 100644 --- a/app/components/Alert.tsx +++ b/app/components/Alert.tsx @@ -1,16 +1,14 @@ import { AlertIcon } from "./icons/Alert"; -export function Alert({ - children, - type, -}: { +export function Alert(props: { children: React.ReactNode; type: "warning"; + "data-cy"?: string; }) { return ( -
+
- {children} + {props.children}
); } diff --git a/app/components/tournament/InfoBanner.tsx b/app/components/tournament/InfoBanner.tsx index f294b0b54..61033b535 100644 --- a/app/components/tournament/InfoBanner.tsx +++ b/app/components/tournament/InfoBanner.tsx @@ -125,7 +125,12 @@ function InfoBannerActionButton() { if (!user) { return (
- +
); } diff --git a/app/routes/to/$organization.$tournament/manage-roster.tsx b/app/routes/to/$organization.$tournament/manage-roster.tsx index 3dfaaed23..eb44122ad 100644 --- a/app/routes/to/$organization.$tournament/manage-roster.tsx +++ b/app/routes/to/$organization.$tournament/manage-roster.tsx @@ -46,7 +46,7 @@ export default function ManageRosterPage() { return (
{ownTeam.members.length < 4 && ( - + You need at least {TOURNAMENT_TEAM_ROSTER_MIN_SIZE} players in your roster to play (max {TOURNAMENT_TEAM_ROSTER_MAX_SIZE}) diff --git a/app/services/tournament.ts b/app/services/tournament.ts index 33cfffdce..ef78ae542 100644 --- a/app/services/tournament.ts +++ b/app/services/tournament.ts @@ -111,7 +111,6 @@ export async function findTournamentByNameForUrl({ bSortValue = Number( teamA.members.length >= TOURNAMENT_TEAM_ROSTER_MIN_SIZE ); - console.log({ aSortValue, bSortValue }); return aSortValue - bSortValue; }); } diff --git a/cypress.json b/cypress.json index 693152630..34592579b 100644 --- a/cypress.json +++ b/cypress.json @@ -1,5 +1,6 @@ { "pluginsFile": "cypress/plugins/index.cjs", "baseUrl": "http://localhost:3000", - "watchForFileChanges": false + "watchForFileChanges": false, + "experimentalSourceRewriting": true } diff --git a/cypress/integration/tournament.spec.ts b/cypress/integration/tournament.spec.ts index 8b2efcd03..812e418c3 100644 --- a/cypress/integration/tournament.spec.ts +++ b/cypress/integration/tournament.spec.ts @@ -19,12 +19,12 @@ describe("Before tournament starts", () => { cy.wait("@tournaments"); cy.getCy("team-name-input").clear().type("Team Olive V2"); cy.getCy("register-submit-button").click(); - cy.contains("You need at least 4 players in your roster to play (max 6)"); + cy.getCy("team-size-alert"); }); it("Can view details of the tournament", () => { cy.visit("/to/sendou/in-the-zone-x"); - cy.contains("Log in to register"); + cy.getCy("log-in-to-join-button"); cy.getCy("map-pool-nav-link").click(); cy.contains("24 maps"); diff --git a/package-lock.json b/package-lock.json index 664873121..991814a63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@types/react": "^17.0.37", "@types/react-dom": "^17.0.11", "concurrently": "^6.4.0", - "cypress": "^9.1.0", + "cypress": "^9.1.1", "prettier": "2.5.0", "prisma": "^3.6.0", "stylelint": "^14.1.0", @@ -119,9 +119,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.9", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.9.tgz", - "integrity": "sha512-6md3dtAd3DXfTEXFb2Yde3TSaqpYsSBw3a1VFwAC9Fscu2B0DtY2Venu35csZyJj09XNkPMGRoE4ZXUdtkI+zg==", + "version": "2.88.10", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", + "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -131,7 +131,6 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.3", "http-signature": "~1.3.6", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -1877,13 +1876,13 @@ "dev": true }, "node_modules/cypress": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.1.0.tgz", - "integrity": "sha512-fyXcCN51vixkPrz/vO/Qy6WL3hKYJzCQFeWofOpGOFewVVXrGfmfSOGFntXpzWBXsIwPn3wzW0HOFw51jZajNQ==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.1.1.tgz", + "integrity": "sha512-yWcYD8SEQ8F3okFbRPqSDj5V0xhrZBT5QRIH+P1J2vYvtEmZ4KGciHE7LCcZZLILOrs7pg4WNCqkj/XRvReQlQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.7", + "@cypress/request": "^2.88.10", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "^6.0.2", @@ -2929,12 +2928,6 @@ "node": ">=8" } }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, "node_modules/fastest-levenshtein": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", @@ -3369,51 +3362,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/har-validator/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/har-validator/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, "node_modules/hard-rejection": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", @@ -8199,9 +8147,9 @@ } }, "@cypress/request": { - "version": "2.88.9", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.9.tgz", - "integrity": "sha512-6md3dtAd3DXfTEXFb2Yde3TSaqpYsSBw3a1VFwAC9Fscu2B0DtY2Venu35csZyJj09XNkPMGRoE4ZXUdtkI+zg==", + "version": "2.88.10", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", + "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -8211,7 +8159,6 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.3", "http-signature": "~1.3.6", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -9627,12 +9574,12 @@ "dev": true }, "cypress": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.1.0.tgz", - "integrity": "sha512-fyXcCN51vixkPrz/vO/Qy6WL3hKYJzCQFeWofOpGOFewVVXrGfmfSOGFntXpzWBXsIwPn3wzW0HOFw51jZajNQ==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.1.1.tgz", + "integrity": "sha512-yWcYD8SEQ8F3okFbRPqSDj5V0xhrZBT5QRIH+P1J2vYvtEmZ4KGciHE7LCcZZLILOrs7pg4WNCqkj/XRvReQlQ==", "dev": true, "requires": { - "@cypress/request": "^2.88.7", + "@cypress/request": "^2.88.10", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "^6.0.2", @@ -10384,12 +10331,6 @@ "micromatch": "^4.0.4" } }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, "fastest-levenshtein": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", @@ -10721,42 +10662,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, - "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - } - } - }, "hard-rejection": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", diff --git a/package.json b/package.json index 13dc18d72..e28c25339 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@types/react": "^17.0.37", "@types/react-dom": "^17.0.11", "concurrently": "^6.4.0", - "cypress": "^9.1.0", + "cypress": "^9.1.1", "prettier": "2.5.0", "prisma": "^3.6.0", "stylelint": "^14.1.0",