diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-17 14:06:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-17 14:06:09 +0000 |
| commit | c52afd166d3cadd3809fb837a2f2915f41ebb6e4 (patch) | |
| tree | 9e07a1a86826b9dee2164175a41b0b13c476a4fe /spec/features | |
| parent | 0159de4a4bdc76a505441d4908dd23b12a472896 (diff) | |
| parent | 4e84ec8a9ea47041fe6cffe9373377f72f7d53a9 (diff) | |
| download | gitlab-ce-c52afd166d3cadd3809fb837a2f2915f41ebb6e4.tar.gz | |
Merge branch 'issue_26714' into 'master'
Fix 'reset-email' link spec
Closes #26714
See merge request !9317
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/issues_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index 755162a1eb5..094f645a077 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -382,7 +382,9 @@ describe 'Issues', feature: true do it 'changes incoming email address token', js: true do find('.issue-email-modal-btn').click previous_token = find('input#issue_email').value - find('.incoming-email-token-reset').click + find('.incoming-email-token-reset').trigger('click') + + wait_for_ajax expect(page).to have_no_field('issue_email', with: previous_token) new_token = project1.new_issue_address(@user.reload) @@ -636,7 +638,7 @@ describe 'Issues', feature: true do it 'removes due date from issue' do date = Date.today.at_beginning_of_month + 2.days - + page.within '.due_date' do click_link 'Edit' |