Commit 05d53105 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 5e3b5b60 c4d53811
...@@ -6,7 +6,7 @@ module QA ...@@ -6,7 +6,7 @@ module QA
element :push_events, "event_filter_link EventFilter::PUSH, _('Push events')" # rubocop:disable QA/ElementWithPattern element :push_events, "event_filter_link EventFilter::PUSH, _('Push events')" # rubocop:disable QA/ElementWithPattern
end end
def go_to_push_events def click_push_events
click_on 'Push events' click_on 'Push events'
end end
end end
......
...@@ -30,7 +30,7 @@ module QA ...@@ -30,7 +30,7 @@ module QA
end end
end end
def go_to_activity def click_activity
within_sidebar do within_sidebar do
click_element(:activity_link) click_element(:activity_link)
end end
......
...@@ -14,8 +14,8 @@ module QA ...@@ -14,8 +14,8 @@ module QA
end end
project_push.project.visit! project_push.project.visit!
Page::Project::Menu.perform(&:go_to_activity) Page::Project::Menu.perform(&:click_activity)
Page::Project::Activity.perform(&:go_to_push_events) Page::Project::Activity.perform(&:click_push_events)
expect(page).to have_content('pushed new branch master') expect(page).to have_content('pushed new branch master')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment