summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Luís <me@andr3.net>2019-08-11 23:46:49 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-11 23:46:49 +0000
commitccce365ac5b5783031c84b950548a4a4940a787e (patch)
treecb336aa0d7d58f65815ea14e45ac7ebd395d1910
parent22dc7a0ca8ca9213e255b5d316ad9bbdc05cf41f (diff)
downloadgitlab-ce-ccce365ac5b5783031c84b950548a4a4940a787e.tar.gz
Update karma for new expansion cell markup
Also cleans up spec by: - Add missing `afterEach ... $destroy` - Add missing `done` call when `$nextTick` was used
-rw-r--r--app/assets/javascripts/diffs/components/diff_expansion_cell.vue2
-rw-r--r--spec/javascripts/diffs/components/diff_file_spec.js16
2 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
index 6c409688468..925385fa98a 100644
--- a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
+++ b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
@@ -213,7 +213,7 @@ export default {
<template>
<td :colspan="colspan">
- <div class="content">
+ <div class="content js-line-expansion-content">
<a
v-if="canExpandUp"
v-tooltip
diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js
index ef4589ada48..18da0a473d6 100644
--- a/spec/javascripts/diffs/components/diff_file_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_spec.js
@@ -15,8 +15,12 @@ describe('DiffFile', () => {
}).$mount();
});
+ afterEach(() => {
+ vm.$destroy();
+ });
+
describe('template', () => {
- it('should render component with file header, file content components', () => {
+ it('should render component with file header, file content components', done => {
const el = vm.$el;
const { file_hash, file_path } = vm.file;
@@ -30,9 +34,13 @@ describe('DiffFile', () => {
vm.file.renderIt = true;
- vm.$nextTick(() => {
- expect(el.querySelectorAll('.line_content').length).toBeGreaterThan(5);
- });
+ vm.$nextTick()
+ .then(() => {
+ expect(el.querySelectorAll('.line_content').length).toBeGreaterThanOrEqual(5);
+ expect(el.querySelectorAll('.js-line-expansion-content').length).toBe(1);
+ })
+ .then(done)
+ .catch(done.fail);
});
describe('collapsed', () => {