Merge branch 'winh-merge-request-commit-context' into 'master'

Display commit ID for discussions made on merge request commits

Closes #53953

See merge request gitlab-org/gitlab-ce!23837

1 files changed, 65 insertions, 8 deletions

diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/notes/components/noteable_discussion_spec.js
index 106a4ac2546..3aff2dd0641 100644
--- a/spec/javascripts/notes/components/noteable_discussion_spec.js
+++ b/spec/javascripts/notes/components/noteable_discussion_spec.js
@@ -133,8 +133,10 @@ describe('noteable_discussion component', () => {
     });
   });
 
-  describe('commit discussion', () => {
+  describe('action text', () => {
     const commitId = 'razupaltuff';
+    const truncatedCommitId = commitId.substr(0, 8);
+    let commitElement;
 
     beforeEach(() => {
       vm.$destroy();
@@ -143,7 +145,6 @@ describe('noteable_discussion component', () => {
         projectPath: 'something',
       };
 
-      vm.$destroy();
       vm = new Component({
         propsData: {
           discussion: {
@@ -159,17 +160,73 @@ describe('noteable_discussion component', () => {
         },
         store,
       }).$mount();
+
+      commitElement = vm.$el.querySelector('.commit-sha');
+    });
+
+    describe('for commit discussions', () => {
+      it('should display a monospace started a discussion on commit', () => {
+        expect(vm.$el).toContainText(`started a discussion on commit ${truncatedCommitId}`);
+        expect(commitElement).not.toBe(null);
+        expect(commitElement).toHaveText(truncatedCommitId);
+      });
     });
 
-    it('displays a monospace started a discussion on commit', () => {
-      const truncatedCommitId = commitId.substr(0, 8);
+    describe('for diff discussion with a commit id', () => {
+      it('should display started discussion on commit header', done => {
+        vm.discussion.for_commit = false;
 
-      expect(vm.$el).toContainText(`started a discussion on commit ${truncatedCommitId}`);
+        vm.$nextTick(() => {
+          expect(vm.$el).toContainText(`started a discussion on commit ${truncatedCommitId}`);
+          expect(commitElement).not.toBe(null);
 
-      const commitElement = vm.$el.querySelector('.commit-sha');
+          done();
+        });
+      });
 
-      expect(commitElement).not.toBe(null);
-      expect(commitElement).toHaveText(truncatedCommitId);
+      it('should display outdated change on commit header', done => {
+        vm.discussion.for_commit = false;
+        vm.discussion.active = false;
+
+        vm.$nextTick(() => {
+          expect(vm.$el).toContainText(
+            `started a discussion on an outdated change in commit ${truncatedCommitId}`,
+          );
+
+          expect(commitElement).not.toBe(null);
+
+          done();
+        });
+      });
+    });
+
+    describe('for diff discussions without a commit id', () => {
+      it('should show started a discussion on the diff text', done => {
+        Object.assign(vm.discussion, {
+          for_commit: false,
+          commit_id: null,
+        });
+
+        vm.$nextTick(() => {
+          expect(vm.$el).toContainText('started a discussion on the diff');
+
+          done();
+        });
+      });
+
+      it('should show discussion on older version text', done => {
+        Object.assign(vm.discussion, {
+          for_commit: false,
+          commit_id: null,
+          active: false,
+        });
+
+        vm.$nextTick(() => {
+          expect(vm.$el).toContainText('started a discussion on an old version of the diff');
+
+          done();
+        });
+      });
     });
   });
 });