summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-16 07:12:12 +0000
committerPhil Hughes <me@iamphill.com>2016-07-20 10:48:02 +0100
commitf0691ec7c589543f9e294bf0d9cbc9eea2c2f166 (patch)
tree6b2a56398936a8cb5dd12587d42c9b02065d631b /spec/features
parentef2edcc10007d5d838acf278ed1e9e0c07cdc4fc (diff)
downloadgitlab-ce-f0691ec7c589543f9e294bf0d9cbc9eea2c2f166.tar.gz
Revert "Merge branch 'revert-bdb6f1e6' into 'master'"
This reverts merge request !5290
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/issues/move_spec.rb2
-rw-r--r--spec/features/issues_spec.rb5
2 files changed, 3 insertions, 4 deletions
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 7773c486b4e..055210399a7 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -55,7 +55,7 @@ feature 'issue move to another project' do
first('.select2-choice').click
end
- fill_in('s2id_autogen2_search', with: new_project_search.name)
+ fill_in('s2id_autogen1_search', with: new_project_search.name)
page.within '.select2-drop' do
expect(page).to have_content(new_project_search.name)
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index d51c9abea19..d00cffa4e2b 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -50,9 +50,8 @@ describe 'Issues', feature: true do
expect(page).to have_content "Assignee #{@user.name}"
- first('#s2id_issue_assignee_id').click
- sleep 2 # wait for ajax stuff to complete
- first('.user-result').click
+ first('.js-user-search').click
+ click_link 'Unassigned'
click_button 'Save changes'