Merge pull request #183 from caleb-mabry/fix-pipeline

Fix Test on Pipeline

4 files changed, 22 insertions, 13 deletions

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index eaf50c1..36f2cb8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,7 +1,13 @@
 name: Deploy CI
 
-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+    
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa38050..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
@@ -9,6 +16,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
--- a/.nvmrc
+++ b/.nvmrc
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';