Merge branch '32178-prevent-merge-on-sha-change' into 'master'

Add "SHA mismatch" state to the MR widget

Closes #32178

See merge request !11316

3 files changed, 41 insertions, 0 deletions

diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
new file mode 100644
index 00000000000..5fb1d69a8b3
--- /dev/null
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
@@ -0,0 +1,16 @@
+import Vue from 'vue';
+import shaMismatchComponent from '~/vue_merge_request_widget/components/states/mr_widget_sha_mismatch';
+
+describe('MRWidgetSHAMismatch', () => {
+  describe('template', () => {
+    const Component = Vue.extend(shaMismatchComponent);
+    const vm = new Component({
+      el: document.createElement('div'),
+    });
+    it('should have correct elements', () => {
+      expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy();
+      expect(vm.$el.querySelector('button').getAttribute('disabled')).toBeTruthy();
+      expect(vm.$el.innerText).toContain('The source branch HEAD has recently changed. Please reload the page and review the changes before merging.');
+    });
+  });
+});
diff --git a/spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js b/spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js
index ee944f4d4e5..9a331d99865 100644
--- a/spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js
+++ b/spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js
@@ -25,6 +25,9 @@ describe('getStateKey', () => {
     context.canBeMerged = true;
     expect(bound()).toEqual('readyToMerge');
 
+    context.hasSHAChanged = true;
+    expect(bound()).toEqual('shaMismatch');
+
     context.isPipelineBlocked = true;
     expect(bound()).toEqual('pipelineBlocked');
 
diff --git a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
new file mode 100644
index 00000000000..56dd0198ae2
--- /dev/null
+++ b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
@@ -0,0 +1,22 @@
+import MergeRequestStore from '~/vue_merge_request_widget/stores/mr_widget_store';
+import mockData from '../mock_data';
+
+describe('MergeRequestStore', () => {
+  describe('setData', () => {
+    let store;
+
+    beforeEach(() => {
+      store = new MergeRequestStore(mockData);
+    });
+
+    it('should set hasSHAChanged when the diff SHA changes', () => {
+      store.setData({ ...mockData, diff_head_sha: 'a-different-string' });
+      expect(store.hasSHAChanged).toBe(true);
+    });
+
+    it('should not set hasSHAChanged when other data changes', () => {
+      store.setData({ ...mockData, work_in_progress: !mockData.work_in_progress });
+      expect(store.hasSHAChanged).toBe(false);
+    });
+  });
+});