diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-07-14 01:58:28 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-07-14 01:58:28 +0300 |
commit | 632c395e1809715bd3c01e2733a2f8a357136a49 (patch) | |
tree | 402df1f0fb3cbb01746cfc59c6bf4c0ea4f940e2 /spec/javascripts/test_bundle.js | |
parent | 1e5369c7a60678ade3a0f39f3429cb2dd0a269fd (diff) | |
parent | 0ddedab5d59c259d454eee01bdc22832048bd7d4 (diff) |
Merge branch '49128-improve-log-output-of-jasmine-toequal' into 'master'
Resolve "Improve log output of jasmine `toEqual` diffs"
Closes #49128
See merge request gitlab-org/gitlab-ce!20557
Diffstat (limited to 'spec/javascripts/test_bundle.js')
-rw-r--r-- | spec/javascripts/test_bundle.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index a0ca8f8b4c3..bc00fdfd73c 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -6,6 +6,7 @@ import '~/commons'; import Vue from 'vue'; import VueResource from 'vue-resource'; import Translate from '~/vue_shared/translate'; +import jasmineDiff from 'jasmine-diff'; import { getDefaultAdapter } from '~/lib/utils/axios_utils'; import { FIXTURES_PATH, TEST_HOST } from './test_constants'; @@ -35,7 +36,15 @@ Vue.use(Translate); jasmine.getFixtures().fixturesPath = FIXTURES_PATH; jasmine.getJSONFixtures().fixturesPath = FIXTURES_PATH; -beforeAll(() => jasmine.addMatchers(customMatchers)); +beforeAll(() => { + jasmine.addMatchers( + jasmineDiff(jasmine, { + colors: true, + inline: true, + }), + ); + jasmine.addMatchers(customMatchers); +}); // globalize common libraries window.$ = $; |