From 1ab0a93b38c6bdb710eb932d26db36e11fc3cca1 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:01:27 +0100 Subject: [PATCH 1/8] test: only run integration tests --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30e309950..4964421aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,6 +100,7 @@ jobs: cache-key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} start: npm run start wait-on: 'http://localhost:3000' + spec: ./tests/cypress/integration/**/*.spec.js project: ./tests browser: chrome quiet: true From 9ae766a6f75328c4fd09527cda9746282ba4f511 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:05:45 +0100 Subject: [PATCH 2/8] test: only run integration tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4964421aa..f1e91505d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,7 @@ jobs: cache-key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} start: npm run start wait-on: 'http://localhost:3000' - spec: ./tests/cypress/integration/**/*.spec.js + spec: ./tests/cypress/integration/**/*.spec.{js,ts} project: ./tests browser: chrome quiet: true From 9caa95a25136b5a2c72d155dcac108b87a092c62 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:32:56 +0100 Subject: [PATCH 3/8] test: try using test spec matrix --- .github/workflows/build.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1e91505d..6aeacf3e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,6 +76,19 @@ jobs: strategy: matrix: node-version: [16] + test-spec: [ + "./tests/cypress/integration/**/*.spec.{js,ts}", + "./demos/src/Commands/**/*.spec.{js,ts}", + "./demos/src/Examples/**/*.spec.{js,ts}", + "./demos/src/Experiments/**/*.spec.{js,ts}", + "./demos/src/Extensions/**/*.spec.{js,ts}", + "./demos/src/GuideContent/**/*.spec.{js,ts}", + "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}", + "./demos/src/GuideNodeViews/**/*.spec.{js,ts}", + "./demos/src/Marks/**/*.spec.{js,ts}", + "./demos/src/Nodes/**/*.spec.{js,ts}", + "./demos/src/Overview/**/*.spec.{js,ts}", + ] steps: - uses: actions/checkout@v3.3.0 @@ -100,7 +113,7 @@ jobs: cache-key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} start: npm run start wait-on: 'http://localhost:3000' - spec: ./tests/cypress/integration/**/*.spec.{js,ts} + spec: ${{ matrix.test-spec }} project: ./tests browser: chrome quiet: true From 0623d7466fec3c18d476a92c7bf29c85ede6ba77 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:42:07 +0100 Subject: [PATCH 4/8] test: try using test spec matrix --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6aeacf3e4..9f8856ec6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,17 +77,17 @@ jobs: matrix: node-version: [16] test-spec: [ - "./tests/cypress/integration/**/*.spec.{js,ts}", - "./demos/src/Commands/**/*.spec.{js,ts}", - "./demos/src/Examples/**/*.spec.{js,ts}", - "./demos/src/Experiments/**/*.spec.{js,ts}", - "./demos/src/Extensions/**/*.spec.{js,ts}", - "./demos/src/GuideContent/**/*.spec.{js,ts}", - "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}", - "./demos/src/GuideNodeViews/**/*.spec.{js,ts}", - "./demos/src/Marks/**/*.spec.{js,ts}", - "./demos/src/Nodes/**/*.spec.{js,ts}", - "./demos/src/Overview/**/*.spec.{js,ts}", + { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" }, + { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" }, + { name: "Demos/Examples", "./demos/src/Examples/**/*.spec.{js,ts}" }, + { name: "Demos/Experiments", "./demos/src/Experiments/**/*.spec.{js,ts}" }, + { name: "Demos/Extensions", "./demos/src/Extensions/**/*.spec.{js,ts}" }, + { name: "Demos/GuideContent", "./demos/src/GuideContent/**/*.spec.{js,ts}" }, + { name: "Demos/GuideGettingStarted", "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" }, + # { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" }, + { name: "Demos/Marks", "./demos/src/Marks/**/*.spec.{js,ts}" }, + { name: "Demos/Nodes", "./demos/src/Nodes/**/*.spec.{js,ts}" }, + { name: "Demos/Overview", "./demos/src/Overview/**/*.spec.{js,ts}" }, ] steps: @@ -113,7 +113,7 @@ jobs: cache-key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} start: npm run start wait-on: 'http://localhost:3000' - spec: ${{ matrix.test-spec }} + spec: ${{ matrix.test-spec.spec }} project: ./tests browser: chrome quiet: true From 5f06dfb5e7874264bf3fc2aae8644e82a5f0a1b6 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:44:12 +0100 Subject: [PATCH 5/8] test: try using test spec matrix --- .github/workflows/build.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f8856ec6..bc07e9358 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,19 +76,18 @@ jobs: strategy: matrix: node-version: [16] - test-spec: [ - { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" }, - { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" }, - { name: "Demos/Examples", "./demos/src/Examples/**/*.spec.{js,ts}" }, - { name: "Demos/Experiments", "./demos/src/Experiments/**/*.spec.{js,ts}" }, - { name: "Demos/Extensions", "./demos/src/Extensions/**/*.spec.{js,ts}" }, - { name: "Demos/GuideContent", "./demos/src/GuideContent/**/*.spec.{js,ts}" }, - { name: "Demos/GuideGettingStarted", "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" }, - # { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" }, - { name: "Demos/Marks", "./demos/src/Marks/**/*.spec.{js,ts}" }, - { name: "Demos/Nodes", "./demos/src/Nodes/**/*.spec.{js,ts}" }, - { name: "Demos/Overview", "./demos/src/Overview/**/*.spec.{js,ts}" }, - ] + test-spec: + - { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" }, + - { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" }, + - { name: "Demos/Examples", "./demos/src/Examples/**/*.spec.{js,ts}" }, + - { name: "Demos/Experiments", "./demos/src/Experiments/**/*.spec.{js,ts}" }, + - { name: "Demos/Extensions", "./demos/src/Extensions/**/*.spec.{js,ts}" }, + - { name: "Demos/GuideContent", "./demos/src/GuideContent/**/*.spec.{js,ts}" }, + - { name: "Demos/GuideGettingStarted", "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" }, + #- { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" }, + - { name: "Demos/Marks", "./demos/src/Marks/**/*.spec.{js,ts}" }, + - { name: "Demos/Nodes", "./demos/src/Nodes/**/*.spec.{js,ts}" }, + - { name: "Demos/Overview", "./demos/src/Overview/**/*.spec.{js,ts}" }, steps: - uses: actions/checkout@v3.3.0 @@ -106,7 +105,7 @@ jobs: id: build-packages run: npm run build:pm - - name: Run tests with Cypress + - name: Test ${{ matrix.test-spec.name }} id: cypress uses: cypress-io/github-action@v5.0.9 with: From 0d648fb9a1115766e9026ffec1475ee54c0c2dde Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:45:35 +0100 Subject: [PATCH 6/8] test: try using test spec matrix --- .github/workflows/build.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc07e9358..2dbb6389a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,17 +77,17 @@ jobs: matrix: node-version: [16] test-spec: - - { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" }, - - { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" }, - - { name: "Demos/Examples", "./demos/src/Examples/**/*.spec.{js,ts}" }, - - { name: "Demos/Experiments", "./demos/src/Experiments/**/*.spec.{js,ts}" }, - - { name: "Demos/Extensions", "./demos/src/Extensions/**/*.spec.{js,ts}" }, - - { name: "Demos/GuideContent", "./demos/src/GuideContent/**/*.spec.{js,ts}" }, - - { name: "Demos/GuideGettingStarted", "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" }, - #- { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" }, - - { name: "Demos/Marks", "./demos/src/Marks/**/*.spec.{js,ts}" }, - - { name: "Demos/Nodes", "./demos/src/Nodes/**/*.spec.{js,ts}" }, - - { name: "Demos/Overview", "./demos/src/Overview/**/*.spec.{js,ts}" }, + - { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" } + - { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" } + - { name: "Demos/Examples", "./demos/src/Examples/**/*.spec.{js,ts}" } + - { name: "Demos/Experiments", "./demos/src/Experiments/**/*.spec.{js,ts}" } + - { name: "Demos/Extensions", "./demos/src/Extensions/**/*.spec.{js,ts}" } + - { name: "Demos/GuideContent", "./demos/src/GuideContent/**/*.spec.{js,ts}" } + - { name: "Demos/GuideGettingStarted", "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" } + #- { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" } + - { name: "Demos/Marks", "./demos/src/Marks/**/*.spec.{js,ts}" } + - { name: "Demos/Nodes", "./demos/src/Nodes/**/*.spec.{js,ts}" } + - { name: "Demos/Overview", "./demos/src/Overview/**/*.spec.{js,ts}" } steps: - uses: actions/checkout@v3.3.0 From f2f91425ec4a0a9eac6760bfcca815dcde49e012 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 13:59:10 +0100 Subject: [PATCH 7/8] test: try using test spec matrix --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dbb6389a..ceca8871c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,15 +79,15 @@ jobs: test-spec: - { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" } - { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" } - - { name: "Demos/Examples", "./demos/src/Examples/**/*.spec.{js,ts}" } - - { name: "Demos/Experiments", "./demos/src/Experiments/**/*.spec.{js,ts}" } - - { name: "Demos/Extensions", "./demos/src/Extensions/**/*.spec.{js,ts}" } - - { name: "Demos/GuideContent", "./demos/src/GuideContent/**/*.spec.{js,ts}" } - - { name: "Demos/GuideGettingStarted", "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" } + - { name: "Demos/Examples", spec: "./demos/src/Examples/**/*.spec.{js,ts}" } + - { name: "Demos/Experiments", spec: "./demos/src/Experiments/**/*.spec.{js,ts}" } + - { name: "Demos/Extensions", spec: "./demos/src/Extensions/**/*.spec.{js,ts}" } + - { name: "Demos/GuideContent", spec: "./demos/src/GuideContent/**/*.spec.{js,ts}" } + - { name: "Demos/GuideGettingStarted", spec: "./demos/src/GuideGettingStarted/**/*.spec.{js,ts}" } #- { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" } - - { name: "Demos/Marks", "./demos/src/Marks/**/*.spec.{js,ts}" } - - { name: "Demos/Nodes", "./demos/src/Nodes/**/*.spec.{js,ts}" } - - { name: "Demos/Overview", "./demos/src/Overview/**/*.spec.{js,ts}" } + - { name: "Demos/Marks", spec: "./demos/src/Marks/**/*.spec.{js,ts}" } + - { name: "Demos/Nodes", spec: "./demos/src/Nodes/**/*.spec.{js,ts}" } + - { name: "Demos/Overview", spec: "./demos/src/Overview/**/*.spec.{js,ts}" } steps: - uses: actions/checkout@v3.3.0 From 0f12783b5061abfe2da1e79443f61d6f5de9b698 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Fri, 3 Mar 2023 14:13:12 +0100 Subject: [PATCH 8/8] tests: update test branches --- .github/workflows/build.yml | 7 +++++-- demos/src/Commands/InsertContent/Vue/index.spec.js | 11 ----------- demos/src/Overview/Installation/Vue/index.spec.js | 5 ----- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 demos/src/Commands/InsertContent/Vue/index.spec.js delete mode 100644 demos/src/Overview/Installation/Vue/index.spec.js diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ceca8871c..f968a04c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,9 +7,12 @@ on: push: branches: - main + - develop + - release/* pull_request: branches: - main + - develop jobs: lint: @@ -78,7 +81,7 @@ jobs: node-version: [16] test-spec: - { name: "Integration", spec: "./tests/cypress/integration/**/*.spec.{js,ts}" } - - { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" } + #- { name: "Demos/Commands", spec: "./demos/src/Commands/**/*.spec.{js,ts}" } - { name: "Demos/Examples", spec: "./demos/src/Examples/**/*.spec.{js,ts}" } - { name: "Demos/Experiments", spec: "./demos/src/Experiments/**/*.spec.{js,ts}" } - { name: "Demos/Extensions", spec: "./demos/src/Extensions/**/*.spec.{js,ts}" } @@ -87,7 +90,7 @@ jobs: #- { name: "Demos/GuideNodeViews", "./demos/src/GuideNodeViews/**/*.spec.{js,ts}" } - { name: "Demos/Marks", spec: "./demos/src/Marks/**/*.spec.{js,ts}" } - { name: "Demos/Nodes", spec: "./demos/src/Nodes/**/*.spec.{js,ts}" } - - { name: "Demos/Overview", spec: "./demos/src/Overview/**/*.spec.{js,ts}" } + #- { name: "Demos/Overview", spec: "./demos/src/Overview/**/*.spec.{js,ts}" } steps: - uses: actions/checkout@v3.3.0 diff --git a/demos/src/Commands/InsertContent/Vue/index.spec.js b/demos/src/Commands/InsertContent/Vue/index.spec.js deleted file mode 100644 index 8daa40447..000000000 --- a/demos/src/Commands/InsertContent/Vue/index.spec.js +++ /dev/null @@ -1,11 +0,0 @@ -context('/src/Commands/InsertContent/Vue/', () => { - before(() => { - cy.visit('/src/Commands/InsertContent/Vue/') - }) - - beforeEach(() => { - cy.get('.ProseMirror').then(([{ editor }]) => { - editor.commands.clearContent() - }) - }) -}) diff --git a/demos/src/Overview/Installation/Vue/index.spec.js b/demos/src/Overview/Installation/Vue/index.spec.js deleted file mode 100644 index 65267f856..000000000 --- a/demos/src/Overview/Installation/Vue/index.spec.js +++ /dev/null @@ -1,5 +0,0 @@ -context('/src/Overview/Installation/Vue/', () => { - before(() => { - cy.visit('/src/Overview/Installation/Vue/') - }) -})