From 97b325a4a28206d921523e2ce34af0ac4be31bd0 Mon Sep 17 00:00:00 2001 From: Tristan Read Date: Mon, 22 Jul 2019 12:01:42 +0000 Subject: Add ability to embed metrics See https://gitlab.com/gitlab-org/gitlab-ce/issues/30423 --- spec/frontend/test_setup.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/frontend/test_setup.js') diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index 634c78ec029..e4d62b044ca 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -69,3 +69,9 @@ Object.entries(jqueryMatchers).forEach(([matcherName, matcherFactory]) => { // Tech debt issue TBD testUtilsConfig.logModifiedComponents = false; + +// Basic stub for MutationObserver +global.MutationObserver = () => ({ + disconnect: () => {}, + observe: () => {}, +}); -- cgit v1.2.1 From 3283e4397fab09be6fe9496b6a20ff08cc17fa5a Mon Sep 17 00:00:00 2001 From: Natalia Tepluhina Date: Tue, 6 Aug 2019 12:02:23 +0000 Subject: Revert "Fixed comparing value to undefined" This reverts commit d754beb74fbc06a2c744e15be4aa2831d8cef1c0. --- spec/frontend/test_setup.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'spec/frontend/test_setup.js') diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index e4d62b044ca..8b6f7802b15 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -75,3 +75,18 @@ global.MutationObserver = () => ({ disconnect: () => {}, observe: () => {}, }); + +Object.assign(global, { + requestIdleCallback(cb) { + const start = Date.now(); + return setTimeout(() => { + cb({ + didTimeout: false, + timeRemaining: () => Math.max(0, 50 - (Date.now() - start)), + }); + }); + }, + cancelIdleCallback(id) { + clearTimeout(id); + }, +}); -- cgit v1.2.1 From da306cdb0f3125d0b9682d11c2ec007cdfd1746f Mon Sep 17 00:00:00 2001 From: Nathan Friend Date: Mon, 12 Aug 2019 15:22:58 -0400 Subject: Convert spec/javascripts/environments/*rollback* tests to Jest This commit converts two Jasmine tests into Jest tests. --- spec/frontend/test_setup.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'spec/frontend/test_setup.js') diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index 8b6f7802b15..df8a625319b 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -6,6 +6,7 @@ import { config as testUtilsConfig } from '@vue/test-utils'; import { initializeTestTimeout } from './helpers/timeout'; import { loadHTMLFixture, setHTMLFixture } from './helpers/fixtures'; import { setupManualMocks } from './mocks/mocks_helper'; +import customMatchers from './matchers'; // Expose jQuery so specs using jQuery plugins can be imported nicely. // Here is an issue to explore better alternatives: @@ -67,6 +68,8 @@ Object.entries(jqueryMatchers).forEach(([matcherName, matcherFactory]) => { }); }); +expect.extend(customMatchers); + // Tech debt issue TBD testUtilsConfig.logModifiedComponents = false; -- cgit v1.2.1