summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-14 16:38:52 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-14 16:38:52 +0000
commitd324bf84340b58452181eeadb68c64d1888b3f9e (patch)
treea10cfbb93aabd424d7d89edde73de41f44857f6e /features/project
parentd213758a9a8cee4f654fce9702e3954786961fae (diff)
parente8b3b92ddebc47595fe4b69dc5b5a3a6dd1365ab (diff)
downloadgitlab-ce-d324bf84340b58452181eeadb68c64d1888b3f9e.tar.gz
Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
Diffstat (limited to 'features/project')
-rw-r--r--features/project/group_links.feature16
-rw-r--r--features/project/team_management.feature5
2 files changed, 21 insertions, 0 deletions
diff --git a/features/project/group_links.feature b/features/project/group_links.feature
new file mode 100644
index 00000000000..2657c4487ad
--- /dev/null
+++ b/features/project/group_links.feature
@@ -0,0 +1,16 @@
+Feature: Project Group Links
+ Background:
+ Given I sign in as a user
+ And I own project "Shop"
+ And project "Shop" is shared with group "Ops"
+ And project "Shop" is not shared with group "Market"
+ And I visit project group links page
+
+ Scenario: I should see list of groups
+ Then I should see project already shared with group "Ops"
+ Then I should see project is not shared with group "Market"
+
+ @javascript
+ Scenario: I share project with group
+ When I select group "Market" for share
+ Then I should see project is shared with group "Market"
diff --git a/features/project/team_management.feature b/features/project/team_management.feature
index 06fb45c8bde..5888662fc3f 100644
--- a/features/project/team_management.feature
+++ b/features/project/team_management.feature
@@ -39,3 +39,8 @@ Feature: Project Team Management
And I click link "Import team from another project"
And I submit "Website" project for import team
Then I should see "Mike" in team list as "Reporter"
+
+ Scenario: See all members of projects shared group
+ Given I share project with group "OpenSource"
+ And I visit project "Shop" team page
+ Then I should see "Opensource" group user listing