summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-11 19:58:10 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-11 19:58:10 +0000
commitee14ac68a5c08566cc4a9afb4a7c6874f440019b (patch)
tree615e52cf5fc4457c688358488d203ee907485877 /features
parentd7b386ce4f2f2e75aae4cdc21bc5072f595d9027 (diff)
parent90ffb1c0dbed6f695cedb3b7ded2a1769136f238 (diff)
downloadgitlab-ce-ee14ac68a5c08566cc4a9afb4a7c6874f440019b.tar.gz
Merge branch 'group-activity-separate-tab' into 'master'
Move group activity feed to separate page for consistency with dashboard and project pages Fixes #14161. Part of #13480 See merge request !3157
Diffstat (limited to 'features')
-rw-r--r--features/groups.feature4
-rw-r--r--features/steps/shared/paths.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/features/groups.feature b/features/groups.feature
index a60c3860b83..419a5d3963d 100644
--- a/features/groups.feature
+++ b/features/groups.feature
@@ -15,6 +15,10 @@ Feature: Groups
Scenario: I should see group "Owned" dashboard list
When I visit group "Owned" page
Then I should see group "Owned" projects list
+
+ @javascript
+ Scenario: I should see group "Owned" activity feed
+ When I visit group "Owned" activity page
And I should see projects activity feed
Scenario: I should see group "Owned" issues list
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index da9d1503ebc..2bd8ea745e4 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -27,6 +27,10 @@ module SharedPaths
visit group_path(Group.find_by(name: "Owned"))
end
+ step 'I visit group "Owned" activity page' do
+ visit activity_group_path(Group.find_by(name: "Owned"))
+ end
+
step 'I visit group "Owned" issues page' do
visit issues_group_path(Group.find_by(name: "Owned"))
end