kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '13439-fix-broken-karma-test-on-ee-side' into 'master' 

Fix broken master: Update karma for new expansion cell markup

Closes gitlab-ee#13439

See merge request gitlab-org/gitlab-ce!31694
This commit is contained in:
Paul Slaughter 2019-08-11 23:46:50 +00:00
parent 22dc7a0ca8 ccce365ac5
commit 7daf1f41be
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/diffs/components/diff_expansion_cell.vue
View File

@ -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

16
spec/javascripts/diffs/components/diff_file_spec.js
View File

@ -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', () => {