diff options
author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-03-26 16:40:25 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-03-26 16:40:25 +0000 |
commit | 01c40ae29f489e0e2229298a3667764ff34fbbc3 (patch) | |
tree | 3d5d259e0f66e748c3d906030ba1aa2dd73dc787 /spec/javascripts/vue_shared | |
parent | 8947103ff62f96708ff08eea48cbb6a8a249e398 (diff) | |
parent | f95838800f5dd48e7ab9079738c63e1a3523a3ba (diff) | |
download | gitlab-ce-01c40ae29f489e0e2229298a3667764ff34fbbc3.tar.gz |
Merge branch 'dm-md-css' into 'master'
Untangle Markdown/Diffs/Notes CSS mess
See merge request gitlab-org/gitlab-ce!26493
Diffstat (limited to 'spec/javascripts/vue_shared')
-rw-r--r-- | spec/javascripts/vue_shared/components/markdown/field_spec.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js index 79e0e756a7a..02d73e1849a 100644 --- a/spec/javascripts/vue_shared/components/markdown/field_spec.js +++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js @@ -5,7 +5,7 @@ import fieldComponent from '~/vue_shared/components/markdown/field.vue'; function assertMarkdownTabs(isWrite, writeLink, previewLink, vm) { expect(writeLink.parentNode.classList.contains('active')).toEqual(isWrite); expect(previewLink.parentNode.classList.contains('active')).toEqual(!isWrite); - expect(vm.$el.querySelector('.md-preview').style.display).toEqual(isWrite ? 'none' : ''); + expect(vm.$el.querySelector('.md-preview-holder').style.display).toEqual(isWrite ? 'none' : ''); } describe('Markdown field component', () => { @@ -80,7 +80,9 @@ describe('Markdown field component', () => { previewLink.click(); Vue.nextTick(() => { - expect(vm.$el.querySelector('.md-preview').textContent.trim()).toContain('Loading…'); + expect(vm.$el.querySelector('.md-preview-holder').textContent.trim()).toContain( + 'Loading…', + ); done(); }); @@ -90,7 +92,7 @@ describe('Markdown field component', () => { previewLink.click(); setTimeout(() => { - expect(vm.$el.querySelector('.md-preview').innerHTML).toContain( + expect(vm.$el.querySelector('.md-preview-holder').innerHTML).toContain( '<p>markdown preview</p>', ); |