Add latest changes from gitlab-org/gitlab@master

8 files changed, 53 insertions, 97 deletions

diff --git a/spec/frontend/content_editor/extensions/inline_diff_spec.js b/spec/frontend/content_editor/extensions/inline_diff_spec.js
new file mode 100644
index 00000000000..63cdf665e7f
--- /dev/null
+++ b/spec/frontend/content_editor/extensions/inline_diff_spec.js
@@ -0,0 +1,27 @@
+import { inputRegexAddition, inputRegexDeletion } from '~/content_editor/extensions/inline_diff';
+
+describe('content_editor/extensions/inline_diff', () => {
+  describe.each`
+    inputRegex            | description             | input                         | matches
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'hello{+world+}'}           | ${true}
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'hello{+ world +}'}         | ${true}
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'hello {+ world+}'}         | ${true}
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'{+hello world +}'}         | ${true}
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'{+hello with \nnewline+}'} | ${false}
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'{+open only'}              | ${false}
+    ${inputRegexAddition} | ${'inputRegexAddition'} | ${'close only+}'}             | ${false}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'hello{-world-}'}           | ${true}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'hello{- world -}'}         | ${true}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'hello {- world-}'}         | ${true}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'{-hello world -}'}         | ${true}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'{+hello with \nnewline+}'} | ${false}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'{-open only'}              | ${false}
+    ${inputRegexDeletion} | ${'inputRegexDeletion'} | ${'close only-}'}             | ${false}
+  `('$description', ({ inputRegex, input, matches }) => {
+    it(`${matches ? 'matches' : 'does not match'}: "${input}"`, () => {
+      const match = new RegExp(inputRegex).test(input);
+
+      expect(match).toBe(matches);
+    });
+  });
+});
diff --git a/spec/frontend/fixtures/api_markdown.yml b/spec/frontend/fixtures/api_markdown.yml
index fd496ab6327..e4ca38804a7 100644
--- a/spec/frontend/fixtures/api_markdown.yml
+++ b/spec/frontend/fixtures/api_markdown.yml
@@ -8,6 +8,10 @@
   markdown: '_emphasized text_'
 - name: inline_code
   markdown: '`code`'
+- name: inline_diff
+  markdown: |-
+    * {-deleted-}
+    * {+added+}
 - name: subscript
   markdown: H<sub>2</sub>O
 - name: superscript
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js
index 331c9c2c14d..09eac636cae 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js
@@ -61,40 +61,16 @@ describe('BranchToken', () => {
     wrapper.destroy();
   });
 
-  describe('computed', () => {
-    beforeEach(async () => {
-      wrapper = createComponent({ value: { data: mockBranches[0].name } });
-
-      wrapper.setData({
-        branches: mockBranches,
-      });
-
-      await wrapper.vm.$nextTick();
-    });
-
-    describe('currentValue', () => {
-      it('returns lowercase string for `value.data`', () => {
-        expect(wrapper.vm.currentValue).toBe('main');
-      });
-    });
-
-    describe('activeBranch', () => {
-      it('returns object for currently present `value.data`', () => {
-        expect(wrapper.vm.activeBranch).toEqual(mockBranches[0]);
-      });
-    });
-  });
-
   describe('methods', () => {
     beforeEach(() => {
       wrapper = createComponent();
     });
 
-    describe('fetchBranchBySearchTerm', () => {
+    describe('fetchBranches', () => {
       it('calls `config.fetchBranches` with provided searchTerm param', () => {
         jest.spyOn(wrapper.vm.config, 'fetchBranches');
 
-        wrapper.vm.fetchBranchBySearchTerm('foo');
+        wrapper.vm.fetchBranches('foo');
 
         expect(wrapper.vm.config.fetchBranches).toHaveBeenCalledWith('foo');
       });
@@ -102,7 +78,7 @@ describe('BranchToken', () => {
       it('sets response to `branches` when request is succesful', () => {
         jest.spyOn(wrapper.vm.config, 'fetchBranches').mockResolvedValue({ data: mockBranches });
 
-        wrapper.vm.fetchBranchBySearchTerm('foo');
+        wrapper.vm.fetchBranches('foo');
 
         return waitForPromises().then(() => {
           expect(wrapper.vm.branches).toEqual(mockBranches);
@@ -112,7 +88,7 @@ describe('BranchToken', () => {
       it('calls `createFlash` with flash error message when request fails', () => {
         jest.spyOn(wrapper.vm.config, 'fetchBranches').mockRejectedValue({});
 
-        wrapper.vm.fetchBranchBySearchTerm('foo');
+        wrapper.vm.fetchBranches('foo');
 
         return waitForPromises().then(() => {
           expect(createFlash).toHaveBeenCalledWith({
@@ -124,7 +100,7 @@ describe('BranchToken', () => {
       it('sets `loading` to false when request completes', () => {
         jest.spyOn(wrapper.vm.config, 'fetchBranches').mockRejectedValue({});
 
-        wrapper.vm.fetchBranchBySearchTerm('foo');
+        wrapper.vm.fetchBranches('foo');
 
         return waitForPromises().then(() => {
           expect(wrapper.vm.loading).toBe(false);
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js
index 778a214f97e..c2d61fd9f05 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/emoji_token_spec.js
@@ -67,40 +67,16 @@ describe('EmojiToken', () => {
     wrapper.destroy();
   });
 
-  describe('computed', () => {
-    beforeEach(async () => {
-      wrapper = createComponent({ value: { data: mockEmojis[0].name } });
-
-      wrapper.setData({
-        emojis: mockEmojis,
-      });
-
-      await wrapper.vm.$nextTick();
-    });
-
-    describe('currentValue', () => {
-      it('returns lowercase string for `value.data`', () => {
-        expect(wrapper.vm.currentValue).toBe(mockEmojis[0].name);
-      });
-    });
-
-    describe('activeEmoji', () => {
-      it('returns object for currently present `value.data`', () => {
-        expect(wrapper.vm.activeEmoji).toEqual(mockEmojis[0]);
-      });
-    });
-  });
-
   describe('methods', () => {
     beforeEach(() => {
       wrapper = createComponent();
     });
 
-    describe('fetchEmojiBySearchTerm', () => {
+    describe('fetchEmojis', () => {
       it('calls `config.fetchEmojis` with provided searchTerm param', () => {
         jest.spyOn(wrapper.vm.config, 'fetchEmojis');
 
-        wrapper.vm.fetchEmojiBySearchTerm('foo');
+        wrapper.vm.fetchEmojis('foo');
 
         expect(wrapper.vm.config.fetchEmojis).toHaveBeenCalledWith('foo');
       });
@@ -108,7 +84,7 @@ describe('EmojiToken', () => {
       it('sets response to `emojis` when request is successful', () => {
         jest.spyOn(wrapper.vm.config, 'fetchEmojis').mockResolvedValue(mockEmojis);
 
-        wrapper.vm.fetchEmojiBySearchTerm('foo');
+        wrapper.vm.fetchEmojis('foo');
 
         return waitForPromises().then(() => {
           expect(wrapper.vm.emojis).toEqual(mockEmojis);
@@ -118,7 +94,7 @@ describe('EmojiToken', () => {
       it('calls `createFlash` with flash error message when request fails', () => {
         jest.spyOn(wrapper.vm.config, 'fetchEmojis').mockRejectedValue({});
 
-        wrapper.vm.fetchEmojiBySearchTerm('foo');
+        wrapper.vm.fetchEmojis('foo');
 
         return waitForPromises().then(() => {
           expect(createFlash).toHaveBeenCalledWith({
@@ -130,7 +106,7 @@ describe('EmojiToken', () => {
       it('sets `loading` to false when request completes', () => {
         jest.spyOn(wrapper.vm.config, 'fetchEmojis').mockRejectedValue({});
 
-        wrapper.vm.fetchEmojiBySearchTerm('foo');
+        wrapper.vm.fetchEmojis('foo');
 
         return waitForPromises().then(() => {
           expect(wrapper.vm.loading).toBe(false);
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js
index bd654c5a9cb..a609aaa1c4e 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/iteration_token_spec.js
@@ -1,5 +1,6 @@
 import { GlFilteredSearchToken, GlFilteredSearchTokenSegment } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
+import waitForPromises from 'helpers/wait_for_promises';
 import createFlash from '~/flash';
 import IterationToken from '~/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue';
 import { mockIterationToken } from '../mock_data';
@@ -13,6 +14,7 @@ describe('IterationToken', () => {
   const createComponent = ({ config = mockIterationToken, value = { data: '' } } = {}) =>
     mount(IterationToken, {
       propsData: {
+        active: false,
         config,
         value,
       },
@@ -69,7 +71,7 @@ describe('IterationToken', () => {
       config: { ...mockIterationToken, fetchIterations: fetchIterationsSpy },
     });
 
-    await wrapper.vm.$nextTick();
+    await waitForPromises();
 
     expect(createFlash).toHaveBeenCalledWith({
       message: 'There was a problem fetching iterations.',
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js
index 74ceb03bb96..529844817d3 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js
@@ -14,12 +14,7 @@ import { sortMilestonesByDueDate } from '~/milestones/milestone_utils';
 import { DEFAULT_MILESTONES } from '~/vue_shared/components/filtered_search_bar/constants';
 import MilestoneToken from '~/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue';
 
-import {
-  mockMilestoneToken,
-  mockMilestones,
-  mockRegularMilestone,
-  mockEscapedMilestone,
-} from '../mock_data';
+import { mockMilestoneToken, mockMilestones, mockRegularMilestone } from '../mock_data';
 
 jest.mock('~/flash');
 jest.mock('~/milestones/milestone_utils');
@@ -70,37 +65,12 @@ describe('MilestoneToken', () => {
     wrapper.destroy();
   });
 
-  describe('computed', () => {
-    beforeEach(async () => {
-      // Milestone title with spaces is always enclosed in quotations by component.
-      wrapper = createComponent({ value: { data: `"${mockEscapedMilestone.title}"` } });
-
-      wrapper.setData({
-        milestones: mockMilestones,
-      });
-
-      await wrapper.vm.$nextTick();
-    });
-
-    describe('currentValue', () => {
-      it('returns lowercase string for `value.data`', () => {
-        expect(wrapper.vm.currentValue).toBe('"5.0 rc1"');
-      });
-    });
-
-    describe('activeMilestone', () => {
-      it('returns object for currently present `value.data`', () => {
-        expect(wrapper.vm.activeMilestone).toEqual(mockEscapedMilestone);
-      });
-    });
-  });
-
   describe('methods', () => {
-    describe('fetchMilestoneBySearchTerm', () => {
+    describe('fetchMilestones', () => {
       it('calls `config.fetchMilestones` with provided searchTerm param', () => {
         jest.spyOn(wrapper.vm.config, 'fetchMilestones');
 
-        wrapper.vm.fetchMilestoneBySearchTerm('foo');
+        wrapper.vm.fetchMilestones('foo');
 
         expect(wrapper.vm.config.fetchMilestones).toHaveBeenCalledWith('foo');
       });
@@ -110,7 +80,7 @@ describe('MilestoneToken', () => {
           data: mockMilestones,
         });
 
-        wrapper.vm.fetchMilestoneBySearchTerm();
+        wrapper.vm.fetchMilestones();
 
         return waitForPromises().then(() => {
           expect(wrapper.vm.milestones).toEqual(mockMilestones);
@@ -121,7 +91,7 @@ describe('MilestoneToken', () => {
       it('calls `createFlash` with flash error message when request fails', () => {
         jest.spyOn(wrapper.vm.config, 'fetchMilestones').mockRejectedValue({});
 
-        wrapper.vm.fetchMilestoneBySearchTerm('foo');
+        wrapper.vm.fetchMilestones('foo');
 
         return waitForPromises().then(() => {
           expect(createFlash).toHaveBeenCalledWith({
@@ -133,7 +103,7 @@ describe('MilestoneToken', () => {
       it('sets `loading` to false when request completes', () => {
         jest.spyOn(wrapper.vm.config, 'fetchMilestones').mockRejectedValue({});
 
-        wrapper.vm.fetchMilestoneBySearchTerm('foo');
+        wrapper.vm.fetchMilestones('foo');
 
         return waitForPromises().then(() => {
           expect(wrapper.vm.loading).toBe(false);
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/weight_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/weight_token_spec.js
index 9a72be636cd..e788c742736 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/weight_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/weight_token_spec.js
@@ -12,6 +12,7 @@ describe('WeightToken', () => {
   const createComponent = ({ config = mockWeightToken, value = { data: '' } } = {}) =>
     mount(WeightToken, {
       propsData: {
+        active: false,
         config,
         value,
       },
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ef229489241..48e56051fc5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -704,7 +704,7 @@ RSpec.describe User do
           user.notification_email = email.email
 
           expect(user).to be_invalid
-          expect(user.errors[:notification_email]).to include('is not an email you own')
+          expect(user.errors[:notification_email]).to include(_('must be an email you have verified'))
         end
       end
 
@@ -723,7 +723,7 @@ RSpec.describe User do
           user.public_email = email.email
 
           expect(user).to be_invalid
-          expect(user.errors[:public_email]).to include('is not an email you own')
+          expect(user.errors[:public_email]).to include(_('must be an email you have verified'))
         end
       end