Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2 files changed, 8 insertions, 0 deletions

diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index fe651e81dac..88a98a37807 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -251,6 +251,10 @@ module SharedPaths
     visit namespace_project_path(project.namespace, project)
   end
 
+  step 'I visit project "Shop" activity page' do
+    visit activity_namespace_project_path(project.namespace, project)
+  end
+
   step 'I visit project "Forked Shop" merge requests page' do
     visit namespace_project_merge_requests_path(@forked_project.namespace, @forked_project)
   end
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 3b94b7d8621..c67e5e4a06a 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -49,4 +49,8 @@ module SharedProjectTab
       expect(page).to have_content('Back to project')
     end
   end
+
+  step 'the active main tab should be Activity' do
+    ensure_active_main_tab('Activity')
+  end
 end