summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2019-01-29 16:58:32 -0600
committerFatih Acet <acetfatih@gmail.com>2019-01-30 23:18:21 +0100
commit26f5c7aa7cac29b087748d546c1663d6080935f2 (patch)
treec2a363fd62d7d3a532ddad68311b3960cce0e9d9
parente725ee0c30650ea5041afe6bc36e15a5ff2f8a07 (diff)
downloadgitlab-ce-26f5c7aa7cac29b087748d546c1663d6080935f2.tar.gz
Fix task list feature specs
-rw-r--r--spec/features/task_lists_spec.rb26
1 files changed, 13 insertions, 13 deletions
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 9c9127980a1..e8c6c5e1832 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -170,8 +170,11 @@ describe 'Task Lists' do
expect(page).to have_content("2 of 7 tasks completed")
page.find('li.task-list-item', text: 'Task b').find('input').click
+ wait_for_requests
page.find('li.task-list-item ul li.task-list-item', text: 'Task a.2').find('input').click
+ wait_for_requests
page.find('li.task-list-item ol li.task-list-item', text: 'Task 1.1').find('input').click
+ wait_for_requests
expect(page).to have_content("5 of 7 tasks completed")
@@ -184,25 +187,22 @@ describe 'Task Lists' do
end
describe 'nested tasks', :js do
- context 'with Redcarpet' do
- let(:issue) { create(:issue, description: nested_tasks_markdown_redcarpet, author: user, project: project) }
+ let(:cache_version) { CacheMarkdownField::CACHE_COMMONMARK_VERSION }
+ let!(:issue) { create(:issue, description: nested_tasks_markdown, author: user, project: project,
+ cached_markdown_version: cache_version) }
- before do
- allow_any_instance_of(Banzai::Filter::MarkdownFilter).to receive(:engine).and_return('Redcarpet')
- visit_issue(project, issue)
- end
+ before do
+ visit_issue(project, issue)
+ end
+
+ context 'with Redcarpet' do
+ let(:cache_version) { CacheMarkdownField::CACHE_REDCARPET_VERSION }
+ let(:nested_tasks_markdown) { nested_tasks_markdown_redcarpet }
it_behaves_like 'shared nested tasks'
end
context 'with CommonMark' do
- let(:issue) { create(:issue, description: nested_tasks_markdown, author: user, project: project) }
-
- before do
- allow_any_instance_of(Banzai::Filter::MarkdownFilter).to receive(:engine).and_return('CommonMark')
- visit_issue(project, issue)
- end
-
it_behaves_like 'shared nested tasks'
end
end