Commit c23bc263 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-form_spec-failure-wait_for_ajax-unneeded-command' into 'master'

Fix form_spec.rb

See merge request !11330
parents 75807f2a ce714d41
require 'rails_helper' require 'rails_helper'
describe 'New/edit issue', feature: true, js: true do describe 'New/edit issue', :feature, :js do
include GitlabRoutingHelper include GitlabRoutingHelper
include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::JavaScriptHelper
include WaitForAjax
let!(:project) { create(:project) } let!(:project) { create(:project) }
let!(:user) { create(:user)} let!(:user) { create(:user)}
...@@ -26,6 +27,8 @@ describe 'New/edit issue', feature: true, js: true do ...@@ -26,6 +27,8 @@ describe 'New/edit issue', feature: true, js: true do
describe 'multiple assignees' do describe 'multiple assignees' do
before do before do
click_button 'Unassigned' click_button 'Unassigned'
wait_for_ajax
end end
it 'unselects other assignees when unassigned is selected' do it 'unselects other assignees when unassigned is selected' do
...@@ -65,6 +68,9 @@ describe 'New/edit issue', feature: true, js: true do ...@@ -65,6 +68,9 @@ describe 'New/edit issue', feature: true, js: true do
expect(find('a', text: 'Assign to me')).to be_visible expect(find('a', text: 'Assign to me')).to be_visible
click_button 'Unassigned' click_button 'Unassigned'
wait_for_ajax
page.within '.dropdown-menu-user' do page.within '.dropdown-menu-user' do
click_link user2.name click_link user2.name
end end
...@@ -148,16 +154,15 @@ describe 'New/edit issue', feature: true, js: true do ...@@ -148,16 +154,15 @@ describe 'New/edit issue', feature: true, js: true do
it 'correctly updates the selected user when changing assignee' do it 'correctly updates the selected user when changing assignee' do
click_button 'Unassigned' click_button 'Unassigned'
wait_for_ajax
page.within '.dropdown-menu-user' do page.within '.dropdown-menu-user' do
click_link user.name click_link user.name
end end
expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match(user.id.to_s) expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match(user.id.to_s)
click_button user.name
expect(find('.dropdown-menu-user a.is-active').first(:xpath, '..')['data-user-id']).to eq(user.id.to_s) expect(find('.dropdown-menu-user a.is-active').first(:xpath, '..')['data-user-id']).to eq(user.id.to_s)
# check the ::before pseudo element to ensure checkmark icon is present # check the ::before pseudo element to ensure checkmark icon is present
expect(before_for_selector('.dropdown-menu-selectable a.is-active')).not_to eq('') expect(before_for_selector('.dropdown-menu-selectable a.is-active')).not_to eq('')
expect(before_for_selector('.dropdown-menu-selectable a:not(.is-active)')).to eq('') expect(before_for_selector('.dropdown-menu-selectable a:not(.is-active)')).to eq('')
...@@ -167,9 +172,6 @@ describe 'New/edit issue', feature: true, js: true do ...@@ -167,9 +172,6 @@ describe 'New/edit issue', feature: true, js: true do
end end
expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match(user2.id.to_s) expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match(user2.id.to_s)
click_button user2.name
expect(find('.dropdown-menu-user a.is-active').first(:xpath, '..')['data-user-id']).to eq(user2.id.to_s) expect(find('.dropdown-menu-user a.is-active').first(:xpath, '..')['data-user-id']).to eq(user2.id.to_s)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment