diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-12 11:53:27 +0000 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-12 11:53:27 +0000 |
commit | 1885b567e1d4d98b4140a3d24c1281a20a221180 (patch) | |
tree | b912bee7ae7da4e29ece2488be6c4c3b643bb14a /spec | |
parent | e012427cf32f0fb36aa80c89442e4731d0939e65 (diff) | |
download | gitlab-ce-1885b567e1d4d98b4140a3d24c1281a20a221180.tar.gz |
Fix form_spec.rb failure relating to wait_for_ajax and unneeded commands
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/form_spec.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb index 87adce3cddd..080de5f58a0 100644 --- a/spec/features/issues/form_spec.rb +++ b/spec/features/issues/form_spec.rb @@ -1,8 +1,9 @@ require 'rails_helper' -describe 'New/edit issue', feature: true, js: true do +describe 'New/edit issue', :feature, :js do include GitlabRoutingHelper include ActionView::Helpers::JavaScriptHelper + include WaitForAjax let!(:project) { create(:project) } let!(:user) { create(:user)} @@ -27,6 +28,8 @@ describe 'New/edit issue', feature: true, js: true do before do click_button 'Unassigned' end + + wait_for_ajax it 'unselects other assignees when unassigned is selected' do page.within '.dropdown-menu-user' do @@ -65,6 +68,9 @@ describe 'New/edit issue', feature: true, js: true do expect(find('a', text: 'Assign to me')).to be_visible click_button 'Unassigned' + + wait_for_ajax + page.within '.dropdown-menu-user' do click_link user2.name end @@ -148,16 +154,15 @@ describe 'New/edit issue', feature: true, js: true do it 'correctly updates the selected user when changing assignee' do click_button 'Unassigned' + + wait_for_ajax + page.within '.dropdown-menu-user' do click_link user.name end 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) - # 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:not(.is-active)')).to eq('') @@ -167,9 +172,6 @@ describe 'New/edit issue', feature: true, js: true do end 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) end end |