From 88502a3db16b8490cde33e07b5130e9a5b318b64 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 24 Dec 2017 10:54:00 +0800 Subject: [PATCH] test(all): remove console output when testing --- .babelrc | 9 ++++++++- package.json | 4 ++++ resources/assets/src/js/__tests__/admin.test.js | 3 --- resources/assets/src/js/__tests__/common.test.js | 9 +-------- yarn.lock | 4 ++++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.babelrc b/.babelrc index 10f3787d..82b89979 100644 --- a/.babelrc +++ b/.babelrc @@ -5,5 +5,12 @@ "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] } }] - ] + ], + "env": { + "test": { + "plugins": [ + "transform-remove-console" + ] + } + } } diff --git a/package.json b/package.json index c9893e9f..208e0e02 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,11 @@ "codecov": "codecov -F js", "dev": "gulp watch" }, + "jest": { + "timers": "fake" + }, "devDependencies": { + "babel-plugin-transform-remove-console": "^6.8.5", "babel-preset-env": "^1.6.1", "codecov": "^3.0.0", "del": "^3.0.0", diff --git a/resources/assets/src/js/__tests__/admin.test.js b/resources/assets/src/js/__tests__/admin.test.js index 5f9b1358..7209a9a6 100644 --- a/resources/assets/src/js/__tests__/admin.test.js +++ b/resources/assets/src/js/__tests__/admin.test.js @@ -1130,7 +1130,6 @@ describe('tests for "common" module', () => { window.document.cookie = ''; window.docCookies = docCookies; window.fetch = fetch; - window.console.log = jest.fn(); window.blessing = { site_name: 'inm', base_url: 'http://tdkr.mur', @@ -1147,11 +1146,9 @@ describe('tests for "common" module', () => { data: { site_name: 'inm', site_url: 'http://tdkr.mur', version: '8.1.0' } }); expect(window.document.cookie).not.toBe(''); - expect(console.log).toBeCalledWith('Feedback sent. Thank you!'); await sendFeedback(); expect(fetch).toHaveBeenCalledTimes(1); - expect(console.log).toHaveBeenCalledTimes(1); }); it('initialize data tables', () => { diff --git a/resources/assets/src/js/__tests__/common.test.js b/resources/assets/src/js/__tests__/common.test.js index 1b5b2d79..bb6bb1e1 100644 --- a/resources/assets/src/js/__tests__/common.test.js +++ b/resources/assets/src/js/__tests__/common.test.js @@ -144,19 +144,11 @@ describe('tests for "notify" module', () => { }); it('show ajax error', () => { - const warn = jest.fn(); - window.console.warn = warn; window.trans = jest.fn(key => key); $.fn.modal = jest.fn(); const showAjaxError = require(modulePath).showAjaxError; - showAjaxError('error'); - expect(warn).toBeCalledWith('error'); - - showAjaxError({}); - expect(warn).toBeCalledWith('Empty Ajax response body.'); - showAjaxError({ responseText: 'error' }); expect(window.trans).toBeCalledWith('general.fatalError'); }); @@ -366,6 +358,7 @@ describe('tests for "utils" module', () => { expect(func.mock.calls.length).toBe(1); done(); }, 100); + jest.runAllTimers(); expect(() => debounce(func, 'string')).toThrow(); expect(() => debounce('not a function', 100)).toThrow(); diff --git a/yarn.lock b/yarn.lock index 0b57023b..d7a41151 100644 --- a/yarn.lock +++ b/yarn.lock @@ -691,6 +691,10 @@ babel-plugin-transform-regenerator@^6.22.0: dependencies: regenerator-transform "^0.10.0" +babel-plugin-transform-remove-console@^6.8.5: + version "6.8.5" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.5.tgz#fde9d2d3d725530b0fadd8d31078402410386810" + babel-plugin-transform-strict-mode@^6.24.1: version "6.24.1" resolved "http://registry.npm.taobao.org/babel-plugin-transform-strict-mode/download/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"