Merge pull request #32 from polem/update-jest-24

Updade jest to 24, and update tests
nordcloud · Nov 18, 2019 · f98b1e7 · f98b1e7
2 parents 2f21214 + 7db5372
commit f98b1e7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/__tests__/config.test.js b/__tests__/config.test.js
@@ -19,7 +19,7 @@ xdescribe('jest configuration', () => {
   });
 
   beforeEach(() => {
-    jest.spyOn(jestConfig, 'readConfig');
+    jest.spyOn(jestConfig, 'readConfigs');
 
     const tmp = testUtils.getTmpDirPath();
     fs.ensureDirSync(tmp);
@@ -126,9 +126,9 @@ xdescribe('jest configuration', () => {
       })
       .catch(e => expect(e).toBeUndefined())
       .then(() => {
-        expect(jestConfig.readConfig).toHaveBeenCalled();
+        expect(jestConfig.readConfigs).toHaveBeenCalled();
 
-        const [[globalConfig]] = jestConfig.readConfig.mock.calls;
+        const [[globalConfig]] = jestConfig.readConfigs.mock.calls;
 
         expect(globalConfig).toBeDefined();
         expect(globalConfig).toMatchObject({
@@ -180,9 +180,9 @@ xdescribe('jest configuration', () => {
       })
       .catch(err => expect(err).toBeUndefined())
       .then(() => {
-        expect(jestConfig.readConfig).toHaveBeenCalled();
+        expect(jestConfig.readConfigs).toHaveBeenCalled();
 
-        const [[globalConfig]] = jestConfig.readConfig.mock.calls;
+        const [[globalConfig]] = jestConfig.readConfigs.mock.calls;
 
         expect(globalConfig).toBeDefined();
         expect(globalConfig).toMatchObject({

diff --git a/__tests__/integration-options.test.js b/__tests__/integration-options.test.js
@@ -4,6 +4,7 @@ const Serverless = require('serverless');
 const execSync = require('child_process').execSync;
 const path = require('path');
 const fs = require('fs-extra');
+const stripAnsi = require('strip-ansi');
 const {
   getTmpDirPath,
   replaceTextInFile,
@@ -76,8 +77,9 @@ describe('integration', () => {
 
     return spawnPromise(serverlessExec, 'invoke test --stage prod')
       .then(({ stderr }) => {
-        expect(stderr).toContain('PASS');
-        return expect(stderr).toContain('Test Suites: 2 passed, 2 total');
+        const rawStderr = stripAnsi(stderr);
+        expect(rawStderr).toContain('PASS');
+        return expect(rawStderr).toContain('Test Suites: 2 passed, 2 total');
       });
   }, 120000);
 });
diff --git a/__tests__/integration8.10.test.js b/__tests__/integration8.10.test.js
@@ -4,6 +4,7 @@ const Serverless = require('serverless');
 const execSync = require('child_process').execSync;
 const path = require('path');
 const fs = require('fs-extra');
+const stripAnsi = require('strip-ansi');
 const { getTmpDirPath, replaceTextInFile, spawnPromise } = require('./test-utils');
 
 const serverless = new Serverless();
@@ -71,8 +72,9 @@ describe('integration', () => {
         "require('../.serverless_plugins/serverless-jest-plugin/index.js')",
       );
       return spawnPromise(serverlessExec, 'invoke test --stage prod').then(({ stderr }) => {
-        expect(stderr).toContain('PASS');
-        return expect(stderr).toContain('Test Suites: 2 passed, 2 total');
+        const rawStderr = stripAnsi(stderr);
+        expect(rawStderr).toContain('PASS');
+        return expect(rawStderr).toContain('Test Suites: 2 passed, 2 total');
       });
     },
     35000,

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "bluebird": "^3.5.2",
     "ejs": "^2.6.1",
     "fs-extra": "^3.0.0",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "lambda-wrapper": "^0.3.0",
     "yaml-edit": "^0.1.3"
   },
@@ -32,6 +32,7 @@
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.9.0",
-    "serverless": "^1.32.0"
+    "serverless": "^1.32.0",
+    "strip-ansi": "chalk/strip-ansi"
   }
 }