From 705b86e95bae793f593beb5da2884ad8d80c01aa Mon Sep 17 00:00:00 2001 From: Sebastian Ang <22081109+sang2925@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:43:01 -0700 Subject: [PATCH] [WIP] JUST A TEST NEW MOON v1.2 (#125) * Upgraded moon to v1.2 and cypress to v12.10.0 --- .github/workflows/test.yml | 15 ++- .../e2e/redteam/hide-show-host.cy.js | 9 +- applications/redeye-e2e/src/support/e2e.js | 4 + .../redeye-e2e/src/support/explore.js | 4 +- package.json | 4 +- yarn.lock | 99 +++++++++---------- 6 files changed, 73 insertions(+), 62 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e59215a3..2f1a848b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,6 +26,9 @@ jobs: install: needs: ['prepare'] + container: + image: cypress/browsers:node16.16.0-chrome105-ff104-edge + options: --user 1001 runs-on: ubuntu-latest strategy: fail-fast: false @@ -55,6 +58,9 @@ jobs: RedTeamChrome: runs-on: ubuntu-latest + container: + image: cypress/browsers:node16.16.0-chrome105-ff104-edge + options: --user 1001 needs: [prepare, install] strategy: fail-fast: false @@ -82,7 +88,7 @@ jobs: - run: yarn install --immutable --inline-builds - name: Red Team Tests - Chrome v${{ matrix.node }} - uses: cypress-io/github-action@v5.3.1 + uses: cypress-io/github-action@v5 with: tag: node-${{ matrix.node }} start: yarn start:dev @@ -92,6 +98,7 @@ jobs: config: baseUrl=http://localhost:3500 record: true parallel: true + headed: true config-file: applications/redeye-e2e/cypress.config.js spec: applications/redeye-e2e/src/integration/e2e/redteam/**/**/**/*.cy.js ci-build-id: ${{ needs.prepare.outputs.uuid }} @@ -101,6 +108,9 @@ jobs: BlueTeamChrome: runs-on: ubuntu-latest + container: + image: cypress/browsers:node16.16.0-chrome105-ff104-edge + options: --user 1001 needs: [prepare, install] strategy: fail-fast: false @@ -128,7 +138,7 @@ jobs: - run: yarn install --immutable --inline-builds - name: 'Blue Team Tests - Chrome' - uses: cypress-io/github-action@v5.3.1 + uses: cypress-io/github-action@v5 with: tag: node-${{ matrix.node }} start: yarn start:blue @@ -138,6 +148,7 @@ jobs: config: baseUrl=http://localhost:3500 record: true parallel: true + headed: true config-file: applications/redeye-e2e/cypress.config.js spec: applications/redeye-e2e/src/integration/e2e/blueteam/**/*.cy.js ci-build-id: ${{ needs.prepare.outputs.uuid }} diff --git a/applications/redeye-e2e/src/integration/e2e/redteam/hide-show-host.cy.js b/applications/redeye-e2e/src/integration/e2e/redteam/hide-show-host.cy.js index 18225eaf..1b45d9f7 100644 --- a/applications/redeye-e2e/src/integration/e2e/redteam/hide-show-host.cy.js +++ b/applications/redeye-e2e/src/integration/e2e/redteam/hide-show-host.cy.js @@ -4,16 +4,17 @@ describe('Hide a host', () => { const camp = 'hideshowhost'; const fileName = 'gt.redeye'; - it('Hide host via Meta tab using toggle in left nav panel', () => { + it.only('Hide host via Meta tab using toggle in left nav panel', () => { cy.uploadCampaign(camp, fileName); // Search for new campaign by name cy.selectCampaign(camp); // Toggle switch to not show hidden items - cy.doNotShowHiddenItems(); + // Think it's turned off default on cypress + // cy.doNotShowHiddenItems(); - // Get the name of the first host + //Get the name of the first host cy.get('[cy-test=hostName]') .eq(1) .invoke('text') @@ -50,7 +51,7 @@ describe('Hide a host', () => { it('Hide host via Meta tab using toggle on main page', () => { // Toggle off switch for hidden items on the main page - cy.doNotShowHiddenItems(); + // cy.doNotShowHiddenItems(); // Search for campaign by name and open cy.selectCampaign(camp); diff --git a/applications/redeye-e2e/src/support/e2e.js b/applications/redeye-e2e/src/support/e2e.js index 592a49f9..1cbaba0e 100644 --- a/applications/redeye-e2e/src/support/e2e.js +++ b/applications/redeye-e2e/src/support/e2e.js @@ -11,6 +11,10 @@ Cypress.on('uncaught:exception', (err, runnable, promise) => { if (promise) { return false; } + if (err.message.includes('ResizeObserver loop limit exceeded')) { + // ignore the error + return false; + } }); export const hasOperationName = (req, operationName) => { diff --git a/applications/redeye-e2e/src/support/explore.js b/applications/redeye-e2e/src/support/explore.js index 547cbcb3..3b7c9f74 100644 --- a/applications/redeye-e2e/src/support/explore.js +++ b/applications/redeye-e2e/src/support/explore.js @@ -38,9 +38,11 @@ Cypress.Commands.add('clickExplorerMode', () => { Cypress.Commands.add('clickPresentationMode', () => { cy.get('[cy-test=presentation-mode').click(); cy.wait('@presentationItems'); + cy.get('div.bp4-spinner-annimation').should('not.exist'); cy.get('[cy-test=favorited]').should('be.visible'); cy.get('.superGraph').should('be.visible'); - cy.wait(800); + + cy.wait(1000); }); // CLICK SEARCH ON EXPLORER PANEL diff --git a/package.json b/package.json index ee16dbf4..8122ea85 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "@mikro-orm/entity-generator": "5.6.6", "@mikro-orm/migrations": "5.6.6", "@mikro-orm/seeder": "5.6.6", - "@moonrepo/cli": "^0.26.1", + "@moonrepo/cli": "^1.2.0", "@swc/cli": "~0.1.55", "@swc/core": "~1.2.143", "@swc/helpers": "~0.3.3", @@ -151,7 +151,7 @@ "builder-util": "^23.0.2", "concurrently": "^7.6.0", "cross-env": "^7.0.3", - "cypress": "^12.8.1", + "cypress": "^12.10.0", "cypress-multi-reporters": "^1.6.1", "dotenv": "^8.2.0", "eslint": "^8.22.0", diff --git a/yarn.lock b/yarn.lock index 228f97d1..afea4b59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2123,17 +2123,17 @@ __metadata: languageName: node linkType: hard -"@moonrepo/cli@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/cli@npm:0.26.1" - dependencies: - "@moonrepo/core-linux-arm64-gnu": ^0.26.1 - "@moonrepo/core-linux-arm64-musl": ^0.26.1 - "@moonrepo/core-linux-x64-gnu": ^0.26.1 - "@moonrepo/core-linux-x64-musl": ^0.26.1 - "@moonrepo/core-macos-arm64": ^0.26.1 - "@moonrepo/core-macos-x64": ^0.26.1 - "@moonrepo/core-windows-x64-msvc": ^0.26.1 +"@moonrepo/cli@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/cli@npm:1.2.0" + dependencies: + "@moonrepo/core-linux-arm64-gnu": ^1.2.0 + "@moonrepo/core-linux-arm64-musl": ^1.2.0 + "@moonrepo/core-linux-x64-gnu": ^1.2.0 + "@moonrepo/core-linux-x64-musl": ^1.2.0 + "@moonrepo/core-macos-arm64": ^1.2.0 + "@moonrepo/core-macos-x64": ^1.2.0 + "@moonrepo/core-windows-x64-msvc": ^1.2.0 detect-libc: ^2.0.1 dependenciesMeta: "@moonrepo/core-linux-arm64-gnu": @@ -2152,55 +2152,55 @@ __metadata: optional: true bin: moon: moon - checksum: 5d5283e342f016bc63065f1bd81b208fcc01bab131c3b4eeab873d05124ae330d76d5ae3cb71278d531ce29836263286790ee9e37015ec82cdb528d7ee904ded + checksum: d02f8e76b6bc7666a1d766882df7e9a264b396d0c2a8fd5dae1f1e6a234f565295e0987b5cd6ce03859c2ca83851ce31c84e148bb6d96b14f92282be9216edc6 languageName: node linkType: hard -"@moonrepo/core-linux-arm64-gnu@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-linux-arm64-gnu@npm:0.26.1" +"@moonrepo/core-linux-arm64-gnu@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-linux-arm64-gnu@npm:1.2.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@moonrepo/core-linux-arm64-musl@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-linux-arm64-musl@npm:0.26.1" +"@moonrepo/core-linux-arm64-musl@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-linux-arm64-musl@npm:1.2.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@moonrepo/core-linux-x64-gnu@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-linux-x64-gnu@npm:0.26.1" +"@moonrepo/core-linux-x64-gnu@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-linux-x64-gnu@npm:1.2.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@moonrepo/core-linux-x64-musl@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-linux-x64-musl@npm:0.26.1" +"@moonrepo/core-linux-x64-musl@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-linux-x64-musl@npm:1.2.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@moonrepo/core-macos-arm64@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-macos-arm64@npm:0.26.1" +"@moonrepo/core-macos-arm64@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-macos-arm64@npm:1.2.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@moonrepo/core-macos-x64@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-macos-x64@npm:0.26.1" +"@moonrepo/core-macos-x64@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-macos-x64@npm:1.2.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@moonrepo/core-windows-x64-msvc@npm:^0.26.1": - version: 0.26.1 - resolution: "@moonrepo/core-windows-x64-msvc@npm:0.26.1" +"@moonrepo/core-windows-x64-msvc@npm:^1.2.0": + version: 1.2.0 + resolution: "@moonrepo/core-windows-x64-msvc@npm:1.2.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -5594,14 +5594,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^5.1.0": - version: 5.1.0 - resolution: "commander@npm:5.1.0" - checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447 - languageName: node - linkType: hard - -"commander@npm:^6.2.0": +"commander@npm:^6.2.0, commander@npm:^6.2.1": version: 6.2.1 resolution: "commander@npm:6.2.1" checksum: d7090410c0de6bc5c67d3ca41c41760d6d268f3c799e530aafb73b7437d1826bbf0d2a3edac33f8b57cc9887b4a986dce307fa5557e109be40eadb7c43b21742 @@ -5958,9 +5951,9 @@ __metadata: languageName: node linkType: hard -"cypress@npm:^12.8.1": - version: 12.8.1 - resolution: "cypress@npm:12.8.1" +"cypress@npm:^12.10.0": + version: 12.10.0 + resolution: "cypress@npm:12.10.0" dependencies: "@cypress/request": ^2.88.10 "@cypress/xvfb": ^1.2.4 @@ -5976,7 +5969,7 @@ __metadata: check-more-types: ^2.24.0 cli-cursor: ^3.1.0 cli-table3: ~0.6.1 - commander: ^5.1.0 + commander: ^6.2.1 common-tags: ^1.8.0 dayjs: ^1.10.4 debug: ^4.3.4 @@ -5994,7 +5987,7 @@ __metadata: listr2: ^3.8.3 lodash: ^4.17.21 log-symbols: ^4.0.0 - minimist: ^1.2.6 + minimist: ^1.2.8 ospath: ^1.2.2 pretty-bytes: ^5.6.0 proxy-from-env: 1.0.0 @@ -6006,7 +5999,7 @@ __metadata: yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: a229f2b3ff20b1b533f6d4670303596aef596a394db77ea8eafe2fa8f175b79b9d48ba66262513fa806076be5c857e159539f6d8fd9acf4df9936a2fa649bf1e + checksum: 50eaae129df3bd15416113105a6f04d13949859af4cca7f0fc36c8b0e756bf3f6e058f43df574d92abe350c282872dec62ea22da8dc9b6528c827c0976fb14e0 languageName: node linkType: hard @@ -11076,10 +11069,10 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6": - version: 1.2.6 - resolution: "minimist@npm:1.2.6" - checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 languageName: node linkType: hard @@ -12867,7 +12860,7 @@ __metadata: "@mikro-orm/entity-generator": 5.6.6 "@mikro-orm/migrations": 5.6.6 "@mikro-orm/seeder": 5.6.6 - "@moonrepo/cli": ^0.26.1 + "@moonrepo/cli": ^1.2.0 "@openfonts/ibm-plex-mono_all": ^1.44.2 "@openfonts/ibm-plex-sans_all": ^1.44.2 "@swc/cli": ~0.1.55 @@ -12923,7 +12916,7 @@ __metadata: cors: ^2.8.5 cross-env: ^7.0.3 crypto-js: ^4.0.0 - cypress: ^12.8.1 + cypress: ^12.10.0 cypress-multi-reporters: ^1.6.1 d3: ^6.7.0 dayjs: ^1.11.7