Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-pages-introdocs-pages-intro

4 files changed, 52 insertions, 55 deletions

diff --git a/spec/frontend/ide/lib/common/disposable_spec.js b/spec/frontend/ide/lib/common/disposable_spec.js
index af12ca15369..8596642eb7a 100644
--- a/spec/frontend/ide/lib/common/disposable_spec.js
+++ b/spec/frontend/ide/lib/common/disposable_spec.js
@@ -8,7 +8,7 @@ describe('Multi-file editor library disposable class', () => {
     instance = new Disposable();
 
     disposableClass = {
-      dispose: jasmine.createSpy('dispose'),
+      dispose: jest.fn().mockName('dispose'),
     };
   });
 
diff --git a/spec/frontend/ide/lib/diff/diff_spec.js b/spec/frontend/ide/lib/diff/diff_spec.js
index 57f3ac3d365..d9b088e2c12 100644
--- a/spec/frontend/ide/lib/diff/diff_spec.js
+++ b/spec/frontend/ide/lib/diff/diff_spec.js
@@ -9,60 +9,57 @@ describe('Multi-file editor library diff calculator', () => {
     });
 
     describe('modified', () => {
-      it('', () => {
-        const diff = computeDiff('123', '1234')[0];
-
-        expect(diff.added).toBeTruthy();
-        expect(diff.modified).toBeTruthy();
-        expect(diff.removed).toBeUndefined();
-      });
-
-      it('', () => {
-        const diff = computeDiff('123\n123\n123', '123\n1234\n123')[0];
-
-        expect(diff.added).toBeTruthy();
-        expect(diff.modified).toBeTruthy();
-        expect(diff.removed).toBeUndefined();
-        expect(diff.lineNumber).toBe(2);
-      });
+      it.each`
+        originalContent    | newContent          | lineNumber
+        ${'123'}           | ${'1234'}           | ${1}
+        ${'123\n123\n123'} | ${'123\n1234\n123'} | ${2}
+      `(
+        'marks line $lineNumber as added and modified but not removed',
+        ({ originalContent, newContent, lineNumber }) => {
+          const diff = computeDiff(originalContent, newContent)[0];
+
+          expect(diff.added).toBeTruthy();
+          expect(diff.modified).toBeTruthy();
+          expect(diff.removed).toBeUndefined();
+          expect(diff.lineNumber).toBe(lineNumber);
+        },
+      );
     });
 
     describe('added', () => {
-      it('', () => {
-        const diff = computeDiff('123', '123\n123')[0];
-
-        expect(diff.added).toBeTruthy();
-        expect(diff.modified).toBeUndefined();
-        expect(diff.removed).toBeUndefined();
-      });
-
-      it('', () => {
-        const diff = computeDiff('123\n123\n123', '123\n123\n1234\n123')[0];
-
-        expect(diff.added).toBeTruthy();
-        expect(diff.modified).toBeUndefined();
-        expect(diff.removed).toBeUndefined();
-        expect(diff.lineNumber).toBe(3);
-      });
+      it.each`
+        originalContent    | newContent               | lineNumber
+        ${'123'}           | ${'123\n123'}            | ${1}
+        ${'123\n123\n123'} | ${'123\n123\n1234\n123'} | ${3}
+      `(
+        'marks line $lineNumber as added but not modified and not removed',
+        ({ originalContent, newContent, lineNumber }) => {
+          const diff = computeDiff(originalContent, newContent)[0];
+
+          expect(diff.added).toBeTruthy();
+          expect(diff.modified).toBeUndefined();
+          expect(diff.removed).toBeUndefined();
+          expect(diff.lineNumber).toBe(lineNumber);
+        },
+      );
     });
 
     describe('removed', () => {
-      it('', () => {
-        const diff = computeDiff('123', '')[0];
-
-        expect(diff.added).toBeUndefined();
-        expect(diff.modified).toBeUndefined();
-        expect(diff.removed).toBeTruthy();
-      });
-
-      it('', () => {
-        const diff = computeDiff('123\n123\n123', '123\n123')[0];
-
-        expect(diff.added).toBeUndefined();
-        expect(diff.modified).toBeTruthy();
-        expect(diff.removed).toBeTruthy();
-        expect(diff.lineNumber).toBe(2);
-      });
+      it.each`
+        originalContent    | newContent    | lineNumber | modified
+        ${'123'}           | ${''}         | ${1}       | ${undefined}
+        ${'123\n123\n123'} | ${'123\n123'} | ${2}       | ${true}
+      `(
+        'marks line $lineNumber as removed',
+        ({ originalContent, newContent, lineNumber, modified }) => {
+          const diff = computeDiff(originalContent, newContent)[0];
+
+          expect(diff.added).toBeUndefined();
+          expect(diff.modified).toBe(modified);
+          expect(diff.removed).toBeTruthy();
+          expect(diff.lineNumber).toBe(lineNumber);
+        },
+      );
     });
 
     it('includes line number of change', () => {
diff --git a/spec/frontend/ide/lib/editor_options_spec.js b/spec/frontend/ide/lib/editor_options_spec.js
index d149a883166..b07a583b7c8 100644
--- a/spec/frontend/ide/lib/editor_options_spec.js
+++ b/spec/frontend/ide/lib/editor_options_spec.js
@@ -2,7 +2,7 @@ import editorOptions from '~/ide/lib/editor_options';
 
 describe('Multi-file editor library editor options', () => {
   it('returns an array', () => {
-    expect(editorOptions).toEqual(jasmine.any(Array));
+    expect(editorOptions).toEqual(expect.any(Array));
   });
 
   it('contains readOnly option', () => {
diff --git a/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js b/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js
index 8e0e3ae99a1..8e8b7f06ca2 100644
--- a/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js
+++ b/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js
@@ -9,7 +9,7 @@ describe('IDE file templates mutations', () => {
     state = createState();
   });
 
-  describe(types.REQUEST_TEMPLATE_TYPES, () => {
+  describe(`${types.REQUEST_TEMPLATE_TYPES}`, () => {
     it('sets isLoading', () => {
       mutations[types.REQUEST_TEMPLATE_TYPES](state);
 
@@ -17,7 +17,7 @@ describe('IDE file templates mutations', () => {
     });
   });
 
-  describe(types.RECEIVE_TEMPLATE_TYPES_ERROR, () => {
+  describe(`${types.RECEIVE_TEMPLATE_TYPES_ERROR}`, () => {
     it('sets isLoading', () => {
       state.isLoading = true;
 
@@ -27,7 +27,7 @@ describe('IDE file templates mutations', () => {
     });
   });
 
-  describe(types.RECEIVE_TEMPLATE_TYPES_SUCCESS, () => {
+  describe(`${types.RECEIVE_TEMPLATE_TYPES_SUCCESS}`, () => {
     it('sets isLoading to false', () => {
       state.isLoading = true;
 
@@ -43,7 +43,7 @@ describe('IDE file templates mutations', () => {
     });
   });
 
-  describe(types.SET_SELECTED_TEMPLATE_TYPE, () => {
+  describe(`${types.SET_SELECTED_TEMPLATE_TYPE}`, () => {
     it('sets selectedTemplateType', () => {
       mutations[types.SET_SELECTED_TEMPLATE_TYPE](state, 'type');
 
@@ -59,7 +59,7 @@ describe('IDE file templates mutations', () => {
     });
   });
 
-  describe(types.SET_UPDATE_SUCCESS, () => {
+  describe(`${types.SET_UPDATE_SUCCESS}`, () => {
     it('sets updateSuccess', () => {
       mutations[types.SET_UPDATE_SUCCESS](state, true);