summaryrefslogtreecommitdiff
path: root/spec/frontend/test_setup.js
diff options
context:
space:
mode:
authorNathan Friend <nathan@gitlab.com>2019-08-12 15:22:58 -0400
committerNathan Friend <nathan@gitlab.com>2019-08-12 15:22:58 -0400
commitda306cdb0f3125d0b9682d11c2ec007cdfd1746f (patch)
tree8873c93631737d1989703c9d52b1de34ab133446 /spec/frontend/test_setup.js
parent22f3142b83fb08589eb1212cc378996975b2157f (diff)
downloadgitlab-ce-da306cdb0f3125d0b9682d11c2ec007cdfd1746f.tar.gz
Convert spec/javascripts/environments/*rollback* tests to Jest61800-migrate-environment-rollback-tests-to-jest
This commit converts two Jasmine tests into Jest tests.
Diffstat (limited to 'spec/frontend/test_setup.js')
-rw-r--r--spec/frontend/test_setup.js3
1 files changed, 3 insertions, 0 deletions
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;