Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 1 deletions

diff --git a/spec/frontend/diffs/store/mutations_spec.js b/spec/frontend/diffs/store/mutations_spec.js
index f486a53fc4d..ad05f27b325 100644
--- a/spec/frontend/diffs/store/mutations_spec.js
+++ b/spec/frontend/diffs/store/mutations_spec.js
@@ -51,6 +51,24 @@ describe('DiffsStoreMutations', () => {
     });
   });
 
+  describe('SET_DIFF_FILES', () => {
+    it('should set diffFiles in state', () => {
+      const state = {};
+
+      mutations[types.SET_DIFF_FILES](state, ['file', 'another file']);
+
+      expect(state.diffFiles.length).toEqual(2);
+    });
+
+    it('should not set anything except diffFiles in state', () => {
+      const state = {};
+
+      mutations[types.SET_DIFF_FILES](state, ['file', 'another file']);
+
+      expect(Object.keys(state)).toEqual(['diffFiles']);
+    });
+  });
+
   describe('SET_DIFF_DATA', () => {
     it('should set diff data type properly', () => {
       const state = {
diff --git a/spec/frontend/releases/components/app_edit_spec.js b/spec/frontend/releases/components/app_edit_spec.js
index e27c27b292a..bf66f5a5183 100644
--- a/spec/frontend/releases/components/app_edit_spec.js
+++ b/spec/frontend/releases/components/app_edit_spec.js
@@ -66,7 +66,7 @@ describe('Release edit component', () => {
 
     it('renders the description text at the top of the page', () => {
       expect(wrapper.find('.js-subtitle-text').text()).toBe(
-        'Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example v1.0, v2.0-pre.',
+        'Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0, v2.0-pre.',
       );
     });