diff --git a/package.json b/package.json index 13f02d1a55c..e46b73cddd3 100644 --- a/package.json +++ b/package.json @@ -195,6 +195,7 @@ "jest": "27.5.0", "jest-canvas-mock": "2.3.1", "jest-date-mock": "1.0.8", + "jest-fail-on-console": "2.3.0", "jest-junit": "13.0.0", "jest-matcher-utils": "27.5.0", "jest-mock-console": "1.2.3", diff --git a/public/app/features/dashboard/state/DashboardModel.test.ts b/public/app/features/dashboard/state/DashboardModel.test.ts index f83d14d75d0..1a79a7f8aa1 100644 --- a/public/app/features/dashboard/state/DashboardModel.test.ts +++ b/public/app/features/dashboard/state/DashboardModel.test.ts @@ -506,8 +506,10 @@ describe('DashboardModel', () => { describe('Given model with time', () => { let model: DashboardModel; + let consoleWarnSpy: jest.SpyInstance; beforeEach(() => { + consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {}); model = new DashboardModel({ time: { from: 'now-6h', @@ -521,6 +523,10 @@ describe('DashboardModel', () => { }; }); + afterEach(() => { + consoleWarnSpy.mockRestore(); + }); + it('hasTimeChanged should be true', () => { expect(model.hasTimeChanged()).toBeTruthy(); }); diff --git a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx index aaea83fea93..8d0e8d367f0 100644 --- a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx +++ b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx @@ -37,6 +37,11 @@ jest.mock('../hooks/usePluginConfig.tsx', () => ({ })), })); +jest.mock('../helpers.ts', () => ({ + ...jest.requireActual('../helpers.ts'), + updatePanels: jest.fn(), +})); + const renderPluginDetails = ( pluginOverride: Partial, { diff --git a/public/test/setupTests.ts b/public/test/setupTests.ts index 3fcfc535ef5..2d4eeaae51f 100644 --- a/public/test/setupTests.ts +++ b/public/test/setupTests.ts @@ -1,4 +1,8 @@ import '@testing-library/jest-dom'; +import failOnConsole from 'jest-fail-on-console'; import { matchers } from './matchers'; +failOnConsole({ + shouldFailOnLog: true, +}); expect.extend(matchers); diff --git a/yarn.lock b/yarn.lock index 699034aacd4..f27741ffa37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20933,6 +20933,7 @@ __metadata: jest: 27.5.0 jest-canvas-mock: 2.3.1 jest-date-mock: 1.0.8 + jest-fail-on-console: 2.3.0 jest-junit: 13.0.0 jest-matcher-utils: 27.5.0 jest-mock-console: 1.2.3 @@ -23609,6 +23610,15 @@ __metadata: languageName: node linkType: hard +"jest-fail-on-console@npm:2.3.0": + version: 2.3.0 + resolution: "jest-fail-on-console@npm:2.3.0" + dependencies: + chalk: ^4.1.0 + checksum: b0ce97a5f6bc11226a1eecb9406c98e42ce5e7197310019f3cb27495b43cc1d01aaee36b094ea46a23deffcb62b246ddccd5dfdefe525b72d8dad2c9f1f634ee + languageName: node + linkType: hard + "jest-get-type@npm:^26.3.0": version: 26.3.0 resolution: "jest-get-type@npm:26.3.0"