summaryrefslogtreecommitdiff
path: root/spec/javascripts/diffs/components
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-08-07 13:12:48 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-08-08 10:46:17 +0200
commit3e9965f767a4bef594e2e589e1cf3af8a68b9107 (patch)
treed699a21deb446e7b3ab8669b1b874018681b6968 /spec/javascripts/diffs/components
parent259e54402af87a41bc72a3b1035e435d302144ca (diff)
downloadgitlab-ce-3e9965f767a4bef594e2e589e1cf3af8a68b9107.tar.gz
Fix for diff_file specs
Diffstat (limited to 'spec/javascripts/diffs/components')
-rw-r--r--spec/javascripts/diffs/components/diff_file_spec.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js
index 7a4616ec8eb..44a38f7ca82 100644
--- a/spec/javascripts/diffs/components/diff_file_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_spec.js
@@ -22,11 +22,18 @@ describe('DiffFile', () => {
expect(el.id).toEqual(fileHash);
expect(el.classList.contains('diff-file')).toEqual(true);
+
expect(el.querySelectorAll('.diff-content.hidden').length).toEqual(0);
expect(el.querySelector('.js-file-title')).toBeDefined();
expect(el.querySelector('.file-title-name').innerText.indexOf(filePath) > -1).toEqual(true);
expect(el.querySelector('.js-syntax-highlight')).toBeDefined();
- expect(el.querySelectorAll('.line_content').length > 5).toEqual(true);
+
+ expect(vm.file.renderIt).toEqual(false);
+ vm.file.renderIt = true;
+
+ vm.$nextTick(() => {
+ expect(el.querySelectorAll('.line_content').length > 5).toEqual(true);
+ });
});
describe('collapsed', () => {
@@ -34,6 +41,7 @@ describe('DiffFile', () => {
expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(1);
expect(vm.file.collapsed).toEqual(false);
vm.file.collapsed = true;
+ vm.file.renderIt = true;
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(0);