Merge pull request #578 from martinvanzijl/issue_457_create_team_with_repo_access_fix

GHOrganization.createTeam now adds team to specified repositories

Author: bitwiseman

src/main/java/org/kohsuke/github/GHOrganization.java

@@ -239,7 +239,7 @@ public GHTeam createTeam(String name, Permission p, Collection<GHRepository> rep
         Requester post = new Requester(root).with("name", name).with("permission", p);
         List<String> repo_names = new ArrayList<String>();
         for (GHRepository r : repositories) {
-            repo_names.add(r.getName());
+            repo_names.add(login + "/" + r.getName());
         }
         post.with("repo_names",repo_names);
         return post.method("POST").to("/orgs/" + login + "/teams", GHTeam.class).wrapUp(this);

src/test/java/org/kohsuke/github/GHOrganizationTest.java

@@ -11,8 +11,24 @@
 public class GHOrganizationTest extends AbstractGitHubWireMockTest {
 
     public static final String GITHUB_API_TEST = "github-api-test";
+    public static final String TEAM_NAME_CREATE = "create-team-test";
 
 
+    @Before
+    @After
+    public void cleanUpTeam() throws IOException {
+        // Cleanup is only needed when proxying
+        if (!mockGitHub.isUseProxy()) {
+            return;
+        }
+
+        GHTeam team = gitHubBeforeAfter.getOrganization(GITHUB_API_TEST_ORG).
+            getTeamByName(TEAM_NAME_CREATE);
+        if (team != null) {
+            team.delete();
+        }
+    }
+
     @Test
     public void testCreateRepository() throws IOException {
         cleanupRepository(GITHUB_API_TEST_ORG + '/' + GITHUB_API_TEST);
@@ -57,4 +73,17 @@ public void testInviteUser() throws IOException {
         // Check the invitation has worked.
         // assertTrue(org.hasMember(user));
     }
+
+
+    @Test
+    public void testCreateTeamWithRepoAccess() throws IOException {
+        String REPO_NAME = "github-api";
+
+        GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
+        GHRepository repo = org.getRepository(REPO_NAME);
+
+        // Create team with access to repository. Check access was granted.
+        GHTeam team = org.createTeam(TEAM_NAME_CREATE, GHOrganization.Permission.PUSH, repo);
+        Assert.assertTrue(team.getRepositories().containsKey(REPO_NAME));
+    }
 }

src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org-8c23f18e-d928-4e88-851d-fa36feecf615.json

@@ -0,0 +1,41 @@
+{
+  "login": "github-api-test-org",
+  "id": 7544739,
+  "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+  "url": "https://api.github.com/orgs/github-api-test-org",
+  "repos_url": "https://api.github.com/orgs/github-api-test-org/repos",
+  "events_url": "https://api.github.com/orgs/github-api-test-org/events",
+  "hooks_url": "https://api.github.com/orgs/github-api-test-org/hooks",
+  "issues_url": "https://api.github.com/orgs/github-api-test-org/issues",
+  "members_url": "https://api.github.com/orgs/github-api-test-org/members{/member}",
+  "public_members_url": "https://api.github.com/orgs/github-api-test-org/public_members{/member}",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+  "description": null,
+  "is_verified": false,
+  "has_organization_projects": true,
+  "has_repository_projects": true,
+  "public_repos": 10,
+  "public_gists": 0,
+  "followers": 0,
+  "following": 0,
+  "html_url": "https://github.com/github-api-test-org",
+  "created_at": "2014-05-10T19:39:11Z",
+  "updated_at": "2015-04-20T00:42:30Z",
+  "type": "Organization",
+  "total_private_repos": 0,
+  "owned_private_repos": 0,
+  "private_gists": 0,
+  "disk_usage": 132,
+  "collaborators": 0,
+  "billing_email": "[email protected]",
+  "default_repository_permission": "none",
+  "members_can_create_repositories": false,
+  "two_factor_requirement_enabled": false,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "private_repos": 0,
+    "filled_seats": 7,
+    "seats": 0
+  }
+}

src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org_teams-3459b05f-6e47-4c41-be60-83c125bf180b.json

@@ -0,0 +1,42 @@
+{
+  "name": "create-team-test",
+  "id": 3501817,
+  "node_id": "MDQ6VGVhbTM1MDE4MTc=",
+  "slug": "create-team-test",
+  "description": null,
+  "privacy": "secret",
+  "url": "https://api.github.com/teams/3501817",
+  "html_url": "https://github.com/orgs/github-api-test-org/teams/create-team-test",
+  "members_url": "https://api.github.com/teams/3501817/members{/member}",
+  "repositories_url": "https://api.github.com/teams/3501817/repos",
+  "permission": "push",
+  "created_at": "2019-11-01T16:29:09Z",
+  "updated_at": "2019-11-01T16:29:09Z",
+  "members_count": 0,
+  "repos_count": 1,
+  "organization": {
+    "login": "github-api-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/github-api-test-org",
+    "repos_url": "https://api.github.com/orgs/github-api-test-org/repos",
+    "events_url": "https://api.github.com/orgs/github-api-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/github-api-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/github-api-test-org/issues",
+    "members_url": "https://api.github.com/orgs/github-api-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/github-api-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 10,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/github-api-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2015-04-20T00:42:30Z",
+    "type": "Organization"
+  }
+}