1 files changed, 24 insertions, 14 deletions
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index a5d14aa19f1..8bd13caf2b0 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 feature 'Task Lists', feature: true do
   include Warden::Test::Helpers
 
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
   let(:user)    { create(:user) }
   let(:user2)   { create(:user) }
 
@@ -62,12 +62,15 @@ feature 'Task Lists', feature: true do
     visit namespace_project_issue_path(project.namespace, project, issue)
   end
 
-  describe 'for Issues' do
-    describe 'multiple tasks' do
+  describe 'for Issues', feature: true do
+    describe 'multiple tasks', js: true do
+      include WaitForVueResource
+
       let!(:issue) { create(:issue, description: markdown, author: user, project: project) }
 
       it 'renders' do
         visit_issue(project, issue)
+        wait_for_vue_resource
 
         expect(page).to have_selector('ul.task-list',      count: 1)
         expect(page).to have_selector('li.task-list-item', count: 6)
@@ -76,25 +79,24 @@ feature 'Task Lists', feature: true do
 
       it 'contains the required selectors' do
         visit_issue(project, issue)
+        wait_for_vue_resource
 
-        container = '.detail-page-description .description.js-task-list-container'
-
-        expect(page).to have_selector(container)
-        expect(page).to have_selector("#{container} .wiki .task-list .task-list-item .task-list-item-checkbox")
-        expect(page).to have_selector("#{container} .js-task-list-field")
-        expect(page).to have_selector('form.js-issuable-update')
+        expect(page).to have_selector(".wiki .task-list .task-list-item .task-list-item-checkbox")
         expect(page).to have_selector('a.btn-close')
       end
 
       it 'is only editable by author' do
         visit_issue(project, issue)
-        expect(page).to have_selector('.js-task-list-container')
+        wait_for_vue_resource
 
-        logout(:user)
+        expect(page).to have_selector(".wiki .task-list .task-list-item .task-list-item-checkbox")
 
+        logout(:user)
         login_as(user2)
         visit current_path
-        expect(page).not_to have_selector('.js-task-list-container')
+        wait_for_vue_resource
+
+        expect(page).to have_selector(".wiki .task-list .task-list-item .task-list-item-checkbox")
       end
 
       it 'provides a summary on Issues#index' do
@@ -103,11 +105,14 @@ feature 'Task Lists', feature: true do
       end
     end
 
-    describe 'single incomplete task' do
+    describe 'single incomplete task', js: true do
+      include WaitForVueResource
+
       let!(:issue) { create(:issue, description: singleIncompleteMarkdown, author: user, project: project) }
 
       it 'renders' do
         visit_issue(project, issue)
+        wait_for_vue_resource
 
         expect(page).to have_selector('ul.task-list',      count: 1)
         expect(page).to have_selector('li.task-list-item', count: 1)
@@ -116,15 +121,18 @@ feature 'Task Lists', feature: true do
 
       it 'provides a summary on Issues#index' do
         visit namespace_project_issues_path(project.namespace, project)
+
         expect(page).to have_content("0 of 1 task completed")
       end
     end
 
-    describe 'single complete task' do
+    describe 'single complete task', js: true do
+      include WaitForVueResource
       let!(:issue) { create(:issue, description: singleCompleteMarkdown, author: user, project: project) }
 
       it 'renders' do
         visit_issue(project, issue)
+        wait_for_vue_resource
 
         expect(page).to have_selector('ul.task-list',      count: 1)
         expect(page).to have_selector('li.task-list-item', count: 1)
@@ -133,6 +141,7 @@ feature 'Task Lists', feature: true do
 
       it 'provides a summary on Issues#index' do
         visit namespace_project_issues_path(project.namespace, project)
+
         expect(page).to have_content("1 of 1 task completed")
       end
     end
@@ -240,6 +249,7 @@ feature 'Task Lists', feature: true do
     end
 
     describe 'multiple tasks' do
+      let(:project) { create(:project, :repository) }
       let!(:merge) { create(:merge_request, :simple, description: markdown, author: user, source_project: project) }
 
       it 'renders for description' do