From b690d71d470026316f62ab1a5f9514563b779e0f Mon Sep 17 00:00:00 2001 From: Tom Ross Date: Mon, 21 Mar 2022 11:54:11 +0000 Subject: [PATCH] feat: fix cache issues --- .github/workflows/build.yml | 2 +- .prettierignore | 2 +- packages/web-functionality/jest-puppeteer.config.js | 1 - packages/web-functionality/jest.config.js | 1 - packages/web-functionality/package.json | 3 +-- packages/web-functionality/src/smoke.test.ts | 5 ++++- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4b301ac3..38fa479db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: # publish - name: release - if: github.event_name == 'push' + if: github.event_name == 'push' && github.ref == 'refs/heads/master' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.prettierignore b/.prettierignore index af584a9d3..e151b31a9 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,4 +4,4 @@ **/.vscode **/.vs **/packages/web-performance/reports -**/packages/web-performance/.lighthouseci \ No newline at end of file +**/packages/web-performance/.lighthouseci diff --git a/packages/web-functionality/jest-puppeteer.config.js b/packages/web-functionality/jest-puppeteer.config.js index b0f96759a..61ac78d9e 100644 --- a/packages/web-functionality/jest-puppeteer.config.js +++ b/packages/web-functionality/jest-puppeteer.config.js @@ -1,6 +1,5 @@ module.exports = { launch: { - headless: process.env.HEADLESS !== 'false', product: 'chrome', }, } diff --git a/packages/web-functionality/jest.config.js b/packages/web-functionality/jest.config.js index 89d518659..07c4e49ea 100644 --- a/packages/web-functionality/jest.config.js +++ b/packages/web-functionality/jest.config.js @@ -5,7 +5,6 @@ module.exports = { }, testMatch: ['/lib/**/*.test.js'], testPathIgnorePatterns: ['/node_modules/'], - transformIgnorePatterns: ['/node_modules/'], modulePathIgnorePatterns: ['/node_modules/'], testResultsProcessor: 'jest-junit', } diff --git a/packages/web-functionality/package.json b/packages/web-functionality/package.json index 3404343a5..95fea7bf4 100644 --- a/packages/web-functionality/package.json +++ b/packages/web-functionality/package.json @@ -31,8 +31,7 @@ }, "release": { "branches": [ - "main", - "tr/add-smoke-tests" + "main" ] }, "publishConfig": { diff --git a/packages/web-functionality/src/smoke.test.ts b/packages/web-functionality/src/smoke.test.ts index 0a47e3f76..4b57cad5e 100644 --- a/packages/web-functionality/src/smoke.test.ts +++ b/packages/web-functionality/src/smoke.test.ts @@ -9,7 +9,10 @@ describe('Smoke tests', () => { it('successful runs a search', async () => { // Update search input - await expect(page).toFill('.inputarea', 'repo:^github.com/sourcegraph/smoke-tests-test-repository$') + await expect(page).toFill( + '.test-query-input textarea', + 'repo:^github.com/sourcegraph/smoke-tests-test-repository$' + ) // Click search button await expect(page).toClick('.test-search-button')