summaryrefslogtreecommitdiff
path: root/spec/javascripts/diffs/components/diff_file_spec.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-12-06 14:39:29 +0000
committerPhil Hughes <me@iamphill.com>2018-12-06 14:39:29 +0000
commit2ed65be1c339346d316dfb2403fc06b82713cf21 (patch)
tree3fa233719f254ed16438799f040b40067ec49185 /spec/javascripts/diffs/components/diff_file_spec.js
parent71da313cd43bcbbbc8ec483944f887bacc518d81 (diff)
downloadgitlab-ce-2ed65be1c339346d316dfb2403fc06b82713cf21.tar.gz
Fixed renamed and mode changed diff viewers
Renders mode changed and renamed file merge request diff viewers on the frontend. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
Diffstat (limited to 'spec/javascripts/diffs/components/diff_file_spec.js')
-rw-r--r--spec/javascripts/diffs/components/diff_file_spec.js26
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js
index 51bb4807960..1af49282c36 100644
--- a/spec/javascripts/diffs/components/diff_file_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_spec.js
@@ -74,6 +74,32 @@ describe('DiffFile', () => {
});
});
+ it('should be collapsed for renamed files', done => {
+ vm.file.renderIt = true;
+ vm.file.collapsed = false;
+ vm.file.highlighted_diff_lines = null;
+ vm.file.renamed_file = true;
+
+ vm.$nextTick(() => {
+ expect(vm.$el.innerText).not.toContain('This diff is collapsed');
+
+ done();
+ });
+ });
+
+ it('should be collapsed for mode changed files', done => {
+ vm.file.renderIt = true;
+ vm.file.collapsed = false;
+ vm.file.highlighted_diff_lines = null;
+ vm.file.mode_changed = true;
+
+ vm.$nextTick(() => {
+ expect(vm.$el.innerText).not.toContain('This diff is collapsed');
+
+ done();
+ });
+ });
+
it('should have loading icon while loading a collapsed diffs', done => {
vm.file.collapsed = true;
vm.isLoadingCollapsedDiff = true;