summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-08-13 01:00:22 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-08-13 01:00:22 +0100
commitc9ac28faaa52062055250fc09fed94a94ebd13c2 (patch)
tree8263413dbdeea09ce70dd6ea0f71cbf17ed7cad1 /spec/features
parent8345f2e67f5137e94ecf50f49a17d94102776537 (diff)
downloadgitlab-ce-c9ac28faaa52062055250fc09fed94a94ebd13c2.tar.gz
Fix broken task list spec
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/participants_autocomplete_spec.rb6
-rw-r--r--spec/features/task_lists_spec.rb13
2 files changed, 8 insertions, 11 deletions
diff --git a/spec/features/participants_autocomplete_spec.rb b/spec/features/participants_autocomplete_spec.rb
index 5ba2b6273be..a22d548eef3 100644
--- a/spec/features/participants_autocomplete_spec.rb
+++ b/spec/features/participants_autocomplete_spec.rb
@@ -14,11 +14,7 @@ feature 'Member autocomplete', :js do
shared_examples "open suggestions when typing @" do
before do
page.within('.new-note') do
- if note.noteable_type === 'Issue'
- find('.js-vue-comment-form').send_keys('@')
- else
- find('#note_note').send_keys('@')
- end
+ find('#note_note').send_keys('@')
end
end
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 23e24527d4e..3d0eac8c4f2 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-feature 'Task Lists', js: true do
+feature 'Task Lists' do
include Warden::Test::Helpers
let(:project) { create(:project) }
@@ -181,7 +181,7 @@ feature 'Task Lists', js: true do
project: project, author: user)
end
- it 'renders for note body' do
+ it 'renders for note body', :js do
visit_issue(project, issue)
expect(page).to have_selector('.note ul.task-list', count: 1)
@@ -189,14 +189,14 @@ feature 'Task Lists', js: true do
expect(page).to have_selector('.note ul input[checked]', count: 2)
end
- it 'contains the required selectors' do
+ it 'contains the required selectors', :js do
visit_issue(project, issue)
expect(page).to have_selector('.note .js-task-list-container')
expect(page).to have_selector('.note .js-task-list-container .task-list .task-list-item .task-list-item-checkbox')
end
- it 'is only editable by author' do
+ it 'is only editable by author', :js do
visit_issue(project, issue)
expect(page).to have_selector('.js-task-list-container')
@@ -214,7 +214,7 @@ feature 'Task Lists', js: true do
project: project, author: user)
end
- it 'renders for note body' do
+ it 'renders for note body', :js do
visit_issue(project, issue)
expect(page).to have_selector('.note ul.task-list', count: 1)
@@ -229,7 +229,7 @@ feature 'Task Lists', js: true do
project: project, author: user)
end
- it 'renders for note body' do
+ it 'renders for note body', :js do
visit_issue(project, issue)
expect(page).to have_selector('.note ul.task-list', count: 1)
@@ -263,6 +263,7 @@ feature 'Task Lists', js: true do
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('a.btn-close')
end