summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-07-09 23:31:33 +0200
committerLukas Eipert <leipert@gitlab.com>2018-07-11 17:26:26 +0200
commit0ddedab5d59c259d454eee01bdc22832048bd7d4 (patch)
tree68fd2fdc02a43b52c0514761f59db2283911dd92
parent6a0ff9eb7cc5e95ba25ecd86aef34330c89bdeed (diff)
downloadgitlab-ce-49128-improve-log-output-of-jasmine-toequal.tar.gz
improve log output of jasmine `toEqual` with nested objects/arrays49128-improve-log-output-of-jasmine-toequal
-rw-r--r--package.json1
-rw-r--r--spec/javascripts/test_bundle.js11
-rw-r--r--yarn.lock8
3 files changed, 18 insertions, 2 deletions
diff --git a/package.json b/package.json
index 26b87c70e98..d494b06e97e 100644
--- a/package.json
+++ b/package.json
@@ -123,6 +123,7 @@
"ignore": "^3.3.7",
"istanbul": "^0.4.5",
"jasmine-core": "^2.9.0",
+ "jasmine-diff": "^0.1.3",
"jasmine-jquery": "^2.1.1",
"karma": "^2.0.2",
"karma-chrome-launcher": "^2.2.0",
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 0eff98bcc9d..f77040bb5c6 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.$ = $;
diff --git a/yarn.lock b/yarn.lock
index d844ae4f8e9..d478ed84f1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2522,7 +2522,7 @@ di@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-diff@^3.4.0:
+diff@^3.2.0, diff@^3.4.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -4554,6 +4554,12 @@ jasmine-core@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.9.0.tgz#bfbb56defcd30789adec5a3fbba8504233289c72"
+jasmine-diff@^0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
+ dependencies:
+ diff "^3.2.0"
+
jasmine-jquery@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz#d4095e646944a26763235769ab018d9f30f0d47b"