summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-14 15:47:27 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-14 15:47:27 +0000
commit9c3643046b40e66a7754aabe2513ccdee292a4ef (patch)
tree46ec36c730e0b110e3aafa4d5377c3e23b371dca /features
parenta6cef2370b1b50766ba5f704d3b3ec4f88714d80 (diff)
parent35aca2d5fdd8d59e2e8ed4e6ce28838ea5bc7f86 (diff)
downloadgitlab-ce-9c3643046b40e66a7754aabe2513ccdee292a4ef.tar.gz
Merge branch 'issue-filter-tests' into 'master'
Fixed tests for MR & issue filters See merge request !3203
Diffstat (limited to 'features')
-rw-r--r--features/steps/dashboard/issues.rb8
-rw-r--r--features/steps/dashboard/merge_requests.rb20
2 files changed, 10 insertions, 18 deletions
diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb
index 3072c790a4a..f4a56865532 100644
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
@@ -36,11 +36,9 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
end
step 'I click "Authored by me" link' do
- execute_script('$("#assignee_id").val("")')
- execute_script('$(".js-user-search").first().click()')
- sleep 1
- execute_script("$('.dropdown-content li:contains(\"#{current_user.to_reference}\") a').click()")
- sleep 1
+ find("#assignee_id").set("")
+ find(".js-author-search", match: :first).click
+ find(".dropdown-menu-author li a", match: :first, text: current_user.to_reference).click
end
step 'I click "All" link' do
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index 7fc0e444e86..a2adc87f8ef 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -40,22 +40,16 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
end
step 'I click "Authored by me" link' do
- execute_script('$("#assignee_id").val("")')
- execute_script('$(".js-user-search").first().click()')
- sleep 0.5
- execute_script("$('.dropdown-content li:contains(\"#{current_user.to_reference}\") a').click()")
- sleep 2
+ find("#assignee_id").set("")
+ find(".js-author-search", match: :first).click
+ find(".dropdown-menu-author li a", match: :first, text: current_user.to_reference).click
end
step 'I click "All" link' do
- execute_script('$(".js-user-search").first().click()')
- sleep 0.5
- execute_script('$(".js-user-search").first().parent().find("li a").first().click()')
- sleep 2
- execute_script('$(".js-user-search").eq(1).click()')
- sleep 0.5
- execute_script('$(".js-user-search").eq(1).parent().find("li a").first().click()')
- sleep 2
+ find(".js-author-search").click
+ find(".dropdown-menu-author li a", match: :first).click
+ find(".js-assignee-search").click
+ find(".dropdown-menu-assignee li a", match: :first).click
end
def should_see(merge_request)