diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-16 02:46:29 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-07-16 02:46:29 +0300 |
commit | 2735e5f1c2859ad496bc4f7bd820a7be33f97527 (patch) | |
tree | 8f12b534fd0f46bcd5e3aaab6f1f2c7e69e8d00f /features | |
parent | 2d96c66d63d480f24fd023fe73bf95e67d5ad257 (diff) |
Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"
This reverts merge request !4970
Diffstat (limited to 'features')
-rw-r--r-- | features/project/issues/issues.feature | 1 | ||||
-rw-r--r-- | features/steps/project/forked_merge_requests.rb | 12 | ||||
-rw-r--r-- | features/steps/project/issues/issues.rb | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 80670063ea0..358e622b736 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -37,7 +37,6 @@ Feature: Project Issues And I submit new issue "500 error on profile" Then I should see issue "500 error on profile" - @javascript Scenario: I submit new unassigned issue with labels Given project "Shop" has labels: "bug", "feature", "enhancement" And I click link "New Issue" diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb index 8f71dfdd899..6b56a77b832 100644 --- a/features/steps/project/forked_merge_requests.rb +++ b/features/steps/project/forked_merge_requests.rb @@ -135,17 +135,19 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps end step 'I click "Assign to" dropdown"' do - click_button 'Assignee' + first('.ajax-users-select').click end step 'I should see the target project ID in the input selector' do - expect(find('.js-assignee-search')["data-project-id"]).to eq "#{@project.id}" + expect(page).to have_selector("input[data-project-id=\"#{@project.id}\"]") end step 'I should see the users from the target project ID' do - expect(page).to have_content 'Unassigned' - expect(page).to have_content current_user.name - expect(page).to have_content @project.users.first.name + expect(page).to have_selector('.user-result', visible: true, count: 3) + users = page.all('.user-name') + expect(users[0].text).to eq 'Unassigned' + expect(users[1].text).to eq current_user.name + expect(users[2].text).to eq @project.users.first.name end # Verify a link is generated against the correct project diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index b785e15f70e..35f166c7c08 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -82,8 +82,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps step 'I submit new issue "500 error on profile" with label \'bug\'' do fill_in "issue_title", with: "500 error on profile" - click_button "Label" - click_link "bug" + select 'bug', from: "Labels" click_button "Submit issue" end |