From 88e005bee703e04a58378f81b448a2970264e303 Mon Sep 17 00:00:00 2001 From: Caleb Mabry Date: Wed, 1 Feb 2023 15:47:48 -0500 Subject: Issues with versioning --- .github/workflows/test.yml | 2 ++ .nvmrc | Bin 16 -> 9 bytes 2 files changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa38050..8b3d85f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,8 @@ jobs: uses: actions/checkout@v1 - name: Setup Node uses: actions/setup-node@v1 + with: + node-version: 14 - name: Install Dependencies run: npm install - name: Run Tests diff --git a/.nvmrc b/.nvmrc index 15238e9..e093aa3 100644 Binary files a/.nvmrc and b/.nvmrc differ -- cgit From 0eabb5da1759439fd01e54dc986900448f483330 Mon Sep 17 00:00:00 2001 From: Caleb Mabry Date: Wed, 1 Feb 2023 15:53:37 -0500 Subject: Only deploy on pull requests and pushes to master --- .github/workflows/deploy.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b0d5ea4..50bde45 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,6 +1,12 @@ name: Deploy CI -on: [push] +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: build: -- cgit From 58fa5489a94b1fcb55f446d6b4e636268daffcd1 Mon Sep 17 00:00:00 2001 From: Caleb Mabry Date: Wed, 1 Feb 2023 15:55:47 -0500 Subject: Changes to test --- .github/workflows/test.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b3d85f..2c7a2c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,13 @@ name: Test CI -on: [push] +on: + push: + branches: + - master + pull_request: + branches: + - master + jobs: test: runs-on: ubuntu-latest -- cgit From 1a16ec09d57d32500c629c4a6df7f841e5c951c4 Mon Sep 17 00:00:00 2001 From: Caleb Mabry Date: Wed, 1 Feb 2023 16:31:05 -0500 Subject: Mock values that dont matter --- webAO/client/__tests__/setEmote.test.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/webAO/client/__tests__/setEmote.test.js b/webAO/client/__tests__/setEmote.test.js index 53bb68d..252fb2a 100644 --- a/webAO/client/__tests__/setEmote.test.js +++ b/webAO/client/__tests__/setEmote.test.js @@ -3,20 +3,14 @@ import Client from '../../client'; import fileExists from '../../utils/fileExists'; import transparentPng from '../../constants/transparentPng'; -jest.mock('../../client'); +jest.mock('../../viewport/utils/createMusic') jest.mock('../../utils/fileExists'); - +jest.mock('../../viewport/utils/createSfxAudio') +jest.mock('../../viewport/utils/createShoutAudio') +jest.mock('../../viewport/utils/createTestimonyAudio') describe('setEmote', () => { const AO_HOST = ''; - Client.mockReturnValue({ - viewport: { - lastChar: 'long', - chatmsg: { - name: 'byte', - }, - } - }); const client = new Client('127.0.0.1'); const firstExtension = '.gif'; -- cgit