Fix Element is not clickable at this point
This commit is contained in:
parent
bd2822ce1f
commit
7a5c2d5eff
4 changed files with 14 additions and 14 deletions
|
@ -405,7 +405,7 @@ feature 'Issues > Labels bulk assignment' do
|
|||
end
|
||||
|
||||
def update_issues
|
||||
find('.update-selected-issues').trigger('click')
|
||||
find('.update-selected-issues').send_keys(:return)
|
||||
wait_for_requests
|
||||
end
|
||||
|
||||
|
|
|
@ -23,11 +23,11 @@ feature 'Merge request conflict resolution', js: true do
|
|||
|
||||
within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
|
||||
all('button', text: 'Use ours').each do |button|
|
||||
button.click
|
||||
button.send_keys(:return)
|
||||
end
|
||||
end
|
||||
|
||||
click_button 'Commit conflict resolution'
|
||||
find_button('Commit conflict resolution').send_keys(:return)
|
||||
|
||||
expect(page).to have_content('All merge conflicts were resolved')
|
||||
merge_request.reload_diff
|
||||
|
@ -69,7 +69,7 @@ feature 'Merge request conflict resolution', js: true do
|
|||
execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");')
|
||||
end
|
||||
|
||||
click_button 'Commit conflict resolution'
|
||||
find_button('Commit conflict resolution').send_keys(:return)
|
||||
|
||||
expect(page).to have_content('All merge conflicts were resolved')
|
||||
merge_request.reload_diff
|
||||
|
|
|
@ -86,7 +86,7 @@ feature 'Diff note avatars', js: true do
|
|||
|
||||
it 'shows note avatar' do
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
find('.diff-notes-collapse').click
|
||||
find('.diff-notes-collapse').send_keys(:return)
|
||||
|
||||
expect(page).to have_selector('img.js-diff-comment-avatar', count: 1)
|
||||
end
|
||||
|
@ -94,7 +94,7 @@ feature 'Diff note avatars', js: true do
|
|||
|
||||
it 'shows comment on note avatar' do
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
find('.diff-notes-collapse').click
|
||||
find('.diff-notes-collapse').send_keys(:return)
|
||||
|
||||
expect(first('img.js-diff-comment-avatar')["data-original-title"]).to eq("#{note.author.name}: #{note.note.truncate(17)}")
|
||||
end
|
||||
|
@ -102,13 +102,13 @@ feature 'Diff note avatars', js: true do
|
|||
|
||||
it 'toggles comments when clicking avatar' do
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
find('.diff-notes-collapse').click
|
||||
find('.diff-notes-collapse').send_keys(:return)
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.notes_holder', visible: false)
|
||||
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
first('img.js-diff-comment-avatar').click
|
||||
first('img.js-diff-comment-avatar').send_keys(:return)
|
||||
end
|
||||
|
||||
expect(page).to have_selector('.notes_holder')
|
||||
|
@ -140,7 +140,7 @@ feature 'Diff note avatars', js: true do
|
|||
end
|
||||
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
find('.diff-notes-collapse').trigger('click')
|
||||
find('.diff-notes-collapse').send_keys(:return)
|
||||
|
||||
expect(page).to have_selector('img.js-diff-comment-avatar', count: 2)
|
||||
end
|
||||
|
@ -160,7 +160,7 @@ feature 'Diff note avatars', js: true do
|
|||
end
|
||||
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
find('.diff-notes-collapse').click
|
||||
find('.diff-notes-collapse').send_keys(:return)
|
||||
|
||||
expect(page).to have_selector('img.js-diff-comment-avatar', count: 3)
|
||||
expect(find('.diff-comments-more-count')).to have_content '+1'
|
||||
|
@ -178,7 +178,7 @@ feature 'Diff note avatars', js: true do
|
|||
|
||||
it 'shows extra comment count' do
|
||||
page.within find("[id='#{position.line_code(project.repository)}']") do
|
||||
find('.diff-notes-collapse').click
|
||||
find('.diff-notes-collapse').send_keys(:return)
|
||||
|
||||
expect(find('.diff-comments-more-count')).to have_content '+1'
|
||||
end
|
||||
|
|
|
@ -21,7 +21,7 @@ feature 'Project settings > Merge Requests', :js do
|
|||
|
||||
within('.sharing-permissions-form') do
|
||||
find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click
|
||||
click_on('Save changes')
|
||||
find('input[value="Save changes"]').send_keys(:return)
|
||||
end
|
||||
|
||||
expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds')
|
||||
|
@ -41,7 +41,7 @@ feature 'Project settings > Merge Requests', :js do
|
|||
|
||||
within('.sharing-permissions-form') do
|
||||
find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .project-feature-toggle').click
|
||||
click_on('Save changes')
|
||||
find('input[value="Save changes"]').send_keys(:return)
|
||||
end
|
||||
|
||||
expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds')
|
||||
|
@ -62,7 +62,7 @@ feature 'Project settings > Merge Requests', :js do
|
|||
|
||||
within('.sharing-permissions-form') do
|
||||
find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click
|
||||
click_on('Save changes')
|
||||
find('input[value="Save changes"]').send_keys(:return)
|
||||
end
|
||||
|
||||
expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds')
|
||||
|
|
Loading…
Reference in a new issue