From 5dbf994d8e432c571a3fafb2c4019047dc9f789a Mon Sep 17 00:00:00 2001 From: jamelreid Date: Sat, 15 Jan 2022 13:58:25 -0500 Subject: [PATCH 1/8] Added steps to tests condition evaluation --- .github/workflows/pr-smoke-test.yml | 33 +++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-smoke-test.yml b/.github/workflows/pr-smoke-test.yml index a875d04c4d6..406307c0489 100644 --- a/.github/workflows/pr-smoke-test.yml +++ b/.github/workflows/pr-smoke-test.yml @@ -50,7 +50,7 @@ jobs: UPDATE_WC: 1 DEFAULT_TIMEOUT_OVERRIDE: 120000 run: | - pnpx wc-e2e test:e2e tests/e2e/specs/smoke-tests/update-woocommerce.js + pnpx wc-e2e test:e2e tests/e2e/specs/smoke-tests/update-woocommerce.j - name: Post Smoke tests results comment on PR if: always() @@ -81,7 +81,7 @@ jobs: UPDATE_WC: 1 DEFAULT_TIMEOUT_OVERRIDE: 120000 run: | - pnpx wc-e2e test:e2e + pnpx wc-e2e test:e2e tests/e2e/specs/smoke-tests/update-woocommerce.j - name: Post E2E tests results comment on PR if: always() @@ -101,3 +101,32 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} labels: 'run: smoke tests' + + - name: Remove label from pull request 2. + if: | + always() && + ${{ contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) }} + uses: actions-ecosystem/action-remove-labels@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + labels: 'run: smoke tests' + + - name: Remove label from pull request 3. + if: | + ${{ always() + && contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) + }} + uses: actions-ecosystem/action-remove-labels@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + labels: 'run: smoke tests' + + - name: Remove label from pull request 4. + if: | + always() + && contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) + + uses: actions-ecosystem/action-remove-labels@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + labels: 'run: smoke tests' From bb2810abf9cb63983e0a234d4ea1430db083e745 Mon Sep 17 00:00:00 2001 From: jamelreid Date: Sat, 15 Jan 2022 14:07:16 -0500 Subject: [PATCH 2/8] Fixed commands and removed test steps --- .github/workflows/pr-smoke-test.yml | 31 ++--------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pr-smoke-test.yml b/.github/workflows/pr-smoke-test.yml index 406307c0489..01344186e80 100644 --- a/.github/workflows/pr-smoke-test.yml +++ b/.github/workflows/pr-smoke-test.yml @@ -50,7 +50,7 @@ jobs: UPDATE_WC: 1 DEFAULT_TIMEOUT_OVERRIDE: 120000 run: | - pnpx wc-e2e test:e2e tests/e2e/specs/smoke-tests/update-woocommerce.j + pnpx wc-e2e test:e2e tests/e2e/specs/smoke-tests/update-woocommerce.js - name: Post Smoke tests results comment on PR if: always() @@ -81,7 +81,7 @@ jobs: UPDATE_WC: 1 DEFAULT_TIMEOUT_OVERRIDE: 120000 run: | - pnpx wc-e2e test:e2e tests/e2e/specs/smoke-tests/update-woocommerce.j + pnpx wc-e2e test:e2e - name: Post E2E tests results comment on PR if: always() @@ -96,36 +96,9 @@ jobs: await script({github, context}) - name: Remove label from pull request. - if: always() && ${{ contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) }} - uses: actions-ecosystem/action-remove-labels@v1 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - labels: 'run: smoke tests' - - - name: Remove label from pull request 2. - if: | - always() && - ${{ contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) }} - uses: actions-ecosystem/action-remove-labels@v1 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - labels: 'run: smoke tests' - - - name: Remove label from pull request 3. - if: | - ${{ always() - && contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) - }} - uses: actions-ecosystem/action-remove-labels@v1 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - labels: 'run: smoke tests' - - - name: Remove label from pull request 4. if: | always() && contains( github.event.pull_request.labels.*.name, format('run{0} smoke tests', ':')) - uses: actions-ecosystem/action-remove-labels@v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} From af8fedf6f6f7c6b6f4383766d1367b9bd1d98e89 Mon Sep 17 00:00:00 2001 From: jamelreid Date: Tue, 18 Jan 2022 11:46:09 -0500 Subject: [PATCH 3/8] Removed whitespace --- .github/workflows/pr-smoke-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-smoke-test.yml b/.github/workflows/pr-smoke-test.yml index 01344186e80..97cf35a0676 100644 --- a/.github/workflows/pr-smoke-test.yml +++ b/.github/workflows/pr-smoke-test.yml @@ -102,4 +102,4 @@ jobs: uses: actions-ecosystem/action-remove-labels@v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} - labels: 'run: smoke tests' + labels: 'run: smoke tests' From 9cd3c6976d6326b5b8f61be84181f1793fa425f9 Mon Sep 17 00:00:00 2001 From: jamelreid Date: Fri, 21 Jan 2022 17:51:46 -0500 Subject: [PATCH 4/8] Used resolveLocalE2ePath for path to test results --- packages/js/e2e-environment/bin/post-results-to-github-pr.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/js/e2e-environment/bin/post-results-to-github-pr.js b/packages/js/e2e-environment/bin/post-results-to-github-pr.js index 319c10510dc..daa39d48d68 100644 --- a/packages/js/e2e-environment/bin/post-results-to-github-pr.js +++ b/packages/js/e2e-environment/bin/post-results-to-github-pr.js @@ -1,7 +1,8 @@ const fs = require( 'fs' ); const path = require( 'path' ); +const { resolveLocalE2ePath } = require( '../utils' ); -const resultsFile = path.resolve( __dirname, '../test-results.json' ); +const resultsFile = resolveLocalE2ePath( 'test-results.json' ); const buildOutput = ( results ) => { const { TITLE, SMOKE_TEST_URL } = process.env; From b46e6815975ad58dfdc7fbcff55803fc9dc72415 Mon Sep 17 00:00:00 2001 From: jamelreid Date: Mon, 24 Jan 2022 10:22:29 -0500 Subject: [PATCH 5/8] Updated path to test-results.json --- .../js/e2e-environment/bin/post-results-to-github-pr.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/js/e2e-environment/bin/post-results-to-github-pr.js b/packages/js/e2e-environment/bin/post-results-to-github-pr.js index daa39d48d68..1e45140484e 100644 --- a/packages/js/e2e-environment/bin/post-results-to-github-pr.js +++ b/packages/js/e2e-environment/bin/post-results-to-github-pr.js @@ -1,8 +1,7 @@ const fs = require( 'fs' ); const path = require( 'path' ); -const { resolveLocalE2ePath } = require( '../utils' ); -const resultsFile = resolveLocalE2ePath( 'test-results.json' ); +const resultsFile = path.resolve( __dirname, '../../../../plugins/woocommerce/tests/e2e/test-results.json' ); const buildOutput = ( results ) => { const { TITLE, SMOKE_TEST_URL } = process.env; @@ -27,7 +26,8 @@ module.exports = async ( { github, context } ) => { output = buildOutput( results ); } else { - output = `## Test Results Not Found!`; + output = `## Test Results Not Found! \n\n`; + output += 'The path to the `test-results.json` file may need to be updated in the `post-results-to-github-pr.js` script'; } await github.rest.issues.createComment( { From 48bfc2c3b20bf55af47d4225bd1e3ad825016cbf Mon Sep 17 00:00:00 2001 From: jamelreid Date: Tue, 25 Jan 2022 11:41:28 -0500 Subject: [PATCH 6/8] Made summary output more dynamic --- .../bin/post-results-to-github-pr.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/js/e2e-environment/bin/post-results-to-github-pr.js b/packages/js/e2e-environment/bin/post-results-to-github-pr.js index 1e45140484e..8327e0030ed 100644 --- a/packages/js/e2e-environment/bin/post-results-to-github-pr.js +++ b/packages/js/e2e-environment/bin/post-results-to-github-pr.js @@ -5,14 +5,22 @@ const resultsFile = path.resolve( __dirname, '../../../../plugins/woocommerce/te const buildOutput = ( results ) => { const { TITLE, SMOKE_TEST_URL } = process.env; + const resultKeys = Object.keys( results ); let output = `## ${ TITLE }:\n\n`; output += `**Test URL:** ${ SMOKE_TEST_URL }\n`; - output += `**Total Number of Passed Tests:** ${ results.numTotalTests }\n`; - output += `**Total Number of Failed Tests:** ${ results.numFailedTests }\n`; - output += `**Total Number of Test Suites:** ${ results.numTotalTestSuites }\n`; - output += `**Total Number of Passed Test Suites:** ${ results.numPassedTestSuites }\n`; - output += `**Total Number of Failed Test Suites:** ${ results.numFailedTestSuites }\n`; + + resultKeys.forEach( ( key ) => { + // The keys that we care about all start with 'num' + if ( key.includes( 'num' ) ) { + // match only capitalized words + const words = key.match( /[A-Z][a-z]+/g ); + + output += `**Total Number of ${ words.join( ' ' ) }:** ${ + results[ key ] + }\n`; + } + } ); return output; }; From bba4a3a1a4ef79cc1c4829fb06c93bf228b68db1 Mon Sep 17 00:00:00 2001 From: jamelreid Date: Tue, 25 Jan 2022 15:13:18 -0500 Subject: [PATCH 7/8] Updated file path --- packages/js/e2e-environment/bin/post-results-to-github-pr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/e2e-environment/bin/post-results-to-github-pr.js b/packages/js/e2e-environment/bin/post-results-to-github-pr.js index 8327e0030ed..203e637a812 100644 --- a/packages/js/e2e-environment/bin/post-results-to-github-pr.js +++ b/packages/js/e2e-environment/bin/post-results-to-github-pr.js @@ -1,7 +1,7 @@ const fs = require( 'fs' ); const path = require( 'path' ); -const resultsFile = path.resolve( __dirname, '../../../../plugins/woocommerce/tests/e2e/test-results.json' ); +const resultsFile = path.resolve( __dirname, '../test-results.json' ); const buildOutput = ( results ) => { const { TITLE, SMOKE_TEST_URL } = process.env; From 7d42347537498c6bd0166b47daca3ebde547ae4e Mon Sep 17 00:00:00 2001 From: jamelreid Date: Tue, 1 Feb 2022 13:27:25 -0500 Subject: [PATCH 8/8] Updated test not found output --- packages/js/e2e-environment/bin/post-results-to-github-pr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/e2e-environment/bin/post-results-to-github-pr.js b/packages/js/e2e-environment/bin/post-results-to-github-pr.js index 203e637a812..aea203077a8 100644 --- a/packages/js/e2e-environment/bin/post-results-to-github-pr.js +++ b/packages/js/e2e-environment/bin/post-results-to-github-pr.js @@ -35,7 +35,7 @@ module.exports = async ( { github, context } ) => { output = buildOutput( results ); } else { output = `## Test Results Not Found! \n\n`; - output += 'The path to the `test-results.json` file may need to be updated in the `post-results-to-github-pr.js` script'; + output += 'The path to the `test-results.json` file may need to be updated.'; } await github.rest.issues.createComment( {