From ab68a59b25cc0c6b1a52640b9feb3c6dde93047b Mon Sep 17 00:00:00 2001 From: Javaru Date: Mon, 27 Jul 2020 15:50:32 -0400 Subject: [PATCH 01/20] Added MAINTAIN and TRIAGE to GHOrganization.Permission enum --- src/main/java/org/kohsuke/github/GHOrganization.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java index 004cc0752..fd9188b4b 100644 --- a/src/main/java/org/kohsuke/github/GHOrganization.java +++ b/src/main/java/org/kohsuke/github/GHOrganization.java @@ -421,7 +421,7 @@ public class GHOrganization extends GHPerson { * The enum Permission. */ public enum Permission { - ADMIN, PUSH, PULL + ADMIN, MAINTAIN, PUSH, TRIAGE, PULL } /** From 36ab05c265ed1e32ccf888024368f095c3db7bbd Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 24 Jul 2020 18:47:41 -0300 Subject: [PATCH 02/20] PullRequest.setMilestone should use the Issue API --- src/main/java/org/kohsuke/github/GHIssue.java | 6 +- .../org/kohsuke/github/GHMilestoneTest.java | 18 + .../__files/orgs_hub4j-test-org-2.json | 47 +++ .../repos_hub4j-test-org_github-api-3.json | 332 +++++++++++++++ .../repos_hub4j-test-org_github-api-5.json | 332 +++++++++++++++ ...ub4j-test-org_github-api_issues_370-7.json | 89 +++++ ...ub4j-test-org_github-api_issues_370-9.json | 53 +++ ...ub4j-test-org_github-api_milestones-4.json | 37 ++ ...pos_hub4j-test-org_github-api_pulls-6.json | 341 ++++++++++++++++ ...ub4j-test-org_github-api_pulls_370-10.json | 341 ++++++++++++++++ ...hub4j-test-org_github-api_pulls_370-8.json | 377 ++++++++++++++++++ .../__files/user-1.json | 46 +++ .../mappings/orgs_hub4j-test-org-2.json | 47 +++ .../repos_hub4j-test-org_github-api-3.json | 50 +++ .../repos_hub4j-test-org_github-api-5.json | 49 +++ ...ub4j-test-org_github-api_issues_370-7.json | 53 +++ ...ub4j-test-org_github-api_issues_370-9.json | 53 +++ ...ub4j-test-org_github-api_milestones-4.json | 54 +++ ...pos_hub4j-test-org_github-api_pulls-6.json | 54 +++ ...ub4j-test-org_github-api_pulls_370-10.json | 49 +++ ...hub4j-test-org_github-api_pulls_370-8.json | 50 +++ .../mappings/user-1.json | 47 +++ 22 files changed, 2522 insertions(+), 3 deletions(-) create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/orgs_hub4j-test-org-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-7.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-9.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_milestones-4.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/orgs_hub4j-test-org-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-7.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-9.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_milestones-4.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-10.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-8.json create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/user-1.json diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 274f89671..9251c5e32 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -239,7 +239,7 @@ public class GHIssue extends GHObject implements Reactable { } private void editIssue(String key, Object value) throws IOException { - root.createRequest().with(key, value).method("PATCH").withUrlPath(getIssuesApiRoute()).send(); + root.createRequest().withNullable(key, value).method("PATCH").withUrlPath(getIssuesApiRoute()).send(); } /** @@ -296,9 +296,9 @@ public class GHIssue extends GHObject implements Reactable { */ public void setMilestone(GHMilestone milestone) throws IOException { if (milestone == null) { - editNullable("milestone", null); + editIssue("milestone", null); } else { - edit("milestone", milestone.getNumber()); + editIssue("milestone", milestone.getNumber()); } } diff --git a/src/test/java/org/kohsuke/github/GHMilestoneTest.java b/src/test/java/org/kohsuke/github/GHMilestoneTest.java index 0eb08df1d..19df30802 100644 --- a/src/test/java/org/kohsuke/github/GHMilestoneTest.java +++ b/src/test/java/org/kohsuke/github/GHMilestoneTest.java @@ -70,6 +70,24 @@ public class GHMilestoneTest extends AbstractGitHubWireMockTest { assertEquals(null, issue.getMilestone()); } + @Test + public void testUnsetMilestoneFromPullRequest() throws IOException { + GHRepository repo = getRepository(); + GHMilestone milestone = repo.createMilestone("Unset Test Milestone", "For testUnsetMilestone"); + GHPullRequest p = getRepository() + .createPullRequest("testUnsetMilestoneFromPullRequest", "test/stable", "master", "## test"); + + // set the milestone + p.setMilestone(milestone); + p = repo.getPullRequest(p.getNumber()); // force reload + assertEquals(milestone.getNumber(), p.getMilestone().getNumber()); + + // remove the milestone + p.setMilestone(null); + p = repo.getPullRequest(p.getNumber()); // force reload + assertNull(p.getMilestone()); + } + protected GHRepository getRepository() throws IOException { return getRepository(gitHub); } diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/orgs_hub4j-test-org-2.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/orgs_hub4j-test-org-2.json new file mode 100644 index 000000000..6484d6f64 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/orgs_hub4j-test-org-2.json @@ -0,0 +1,47 @@ +{ + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "url": "https://api.github.com/orgs/hub4j-test-org", + "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos", + "events_url": "https://api.github.com/orgs/hub4j-test-org/events", + "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks", + "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues", + "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}", + "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "description": "Hub4j Test Org Description (this could be null or blank too)", + "name": "Hub4j Test Org Name (this could be null or blank too)", + "company": null, + "blog": "https://hub4j.url.io/could/be/null", + "location": "Hub4j Test Org Location (this could be null or blank too)", + "email": "hub4jtestorgemail@could.be.null.com", + "twitter_username": null, + "is_verified": false, + "has_organization_projects": true, + "has_repository_projects": true, + "public_repos": 12, + "public_gists": 0, + "followers": 0, + "following": 0, + "html_url": "https://github.com/hub4j-test-org", + "created_at": "2014-05-10T19:39:11Z", + "updated_at": "2020-06-04T05:56:10Z", + "type": "Organization", + "total_private_repos": 0, + "owned_private_repos": 0, + "private_gists": 0, + "disk_usage": 148, + "collaborators": 0, + "billing_email": "kk@kohsuke.org", + "default_repository_permission": "none", + "members_can_create_repositories": false, + "two_factor_requirement_enabled": false, + "plan": { + "name": "free", + "space": 976562499, + "private_repos": 10000, + "filled_seats": 19, + "seats": 3 + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-3.json new file mode 100644 index 000000000..7139e7245 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-3.json @@ -0,0 +1,332 @@ +{ + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:44:55Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 5, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 5, + "watchers": 0, + "default_branch": "master", + "permissions": { + "admin": true, + "push": true, + "pull": true + }, + "temp_clone_token": "", + "allow_squash_merge": true, + "allow_merge_commit": true, + "allow_rebase_merge": true, + "delete_branch_on_merge": false, + "organization": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "parent": { + "id": 617210, + "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", + "name": "github-api", + "full_name": "hub4j/github-api", + "private": false, + "owner": { + "login": "hub4j", + "id": 54909825, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", + "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j", + "html_url": "https://github.com/hub4j", + "followers_url": "https://api.github.com/users/hub4j/followers", + "following_url": "https://api.github.com/users/hub4j/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j/orgs", + "repos_url": "https://api.github.com/users/hub4j/repos", + "events_url": "https://api.github.com/users/hub4j/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j/github-api", + "description": "Java API for GitHub", + "fork": false, + "url": "https://api.github.com/repos/hub4j/github-api", + "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", + "created_at": "2010-04-19T04:13:03Z", + "updated_at": "2020-07-27T20:33:12Z", + "pushed_at": "2020-07-27T20:38:26Z", + "git_url": "git://github.com/hub4j/github-api.git", + "ssh_url": "git@github.com:hub4j/github-api.git", + "clone_url": "https://github.com/hub4j/github-api.git", + "svn_url": "https://github.com/hub4j/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24664, + "stargazers_count": 687, + "watchers_count": 687, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 493, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 70, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 493, + "open_issues": 70, + "watchers": 687, + "default_branch": "master" + }, + "source": { + "id": 617210, + "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", + "name": "github-api", + "full_name": "hub4j/github-api", + "private": false, + "owner": { + "login": "hub4j", + "id": 54909825, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", + "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j", + "html_url": "https://github.com/hub4j", + "followers_url": "https://api.github.com/users/hub4j/followers", + "following_url": "https://api.github.com/users/hub4j/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j/orgs", + "repos_url": "https://api.github.com/users/hub4j/repos", + "events_url": "https://api.github.com/users/hub4j/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j/github-api", + "description": "Java API for GitHub", + "fork": false, + "url": "https://api.github.com/repos/hub4j/github-api", + "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", + "created_at": "2010-04-19T04:13:03Z", + "updated_at": "2020-07-27T20:33:12Z", + "pushed_at": "2020-07-27T20:38:26Z", + "git_url": "git://github.com/hub4j/github-api.git", + "ssh_url": "git@github.com:hub4j/github-api.git", + "clone_url": "https://github.com/hub4j/github-api.git", + "svn_url": "https://github.com/hub4j/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24664, + "stargazers_count": 687, + "watchers_count": 687, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 493, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 70, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 493, + "open_issues": 70, + "watchers": 687, + "default_branch": "master" + }, + "network_count": 493, + "subscribers_count": 0 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json new file mode 100644 index 000000000..7139e7245 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json @@ -0,0 +1,332 @@ +{ + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:44:55Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 5, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 5, + "watchers": 0, + "default_branch": "master", + "permissions": { + "admin": true, + "push": true, + "pull": true + }, + "temp_clone_token": "", + "allow_squash_merge": true, + "allow_merge_commit": true, + "allow_rebase_merge": true, + "delete_branch_on_merge": false, + "organization": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "parent": { + "id": 617210, + "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", + "name": "github-api", + "full_name": "hub4j/github-api", + "private": false, + "owner": { + "login": "hub4j", + "id": 54909825, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", + "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j", + "html_url": "https://github.com/hub4j", + "followers_url": "https://api.github.com/users/hub4j/followers", + "following_url": "https://api.github.com/users/hub4j/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j/orgs", + "repos_url": "https://api.github.com/users/hub4j/repos", + "events_url": "https://api.github.com/users/hub4j/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j/github-api", + "description": "Java API for GitHub", + "fork": false, + "url": "https://api.github.com/repos/hub4j/github-api", + "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", + "created_at": "2010-04-19T04:13:03Z", + "updated_at": "2020-07-27T20:33:12Z", + "pushed_at": "2020-07-27T20:38:26Z", + "git_url": "git://github.com/hub4j/github-api.git", + "ssh_url": "git@github.com:hub4j/github-api.git", + "clone_url": "https://github.com/hub4j/github-api.git", + "svn_url": "https://github.com/hub4j/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24664, + "stargazers_count": 687, + "watchers_count": 687, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 493, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 70, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 493, + "open_issues": 70, + "watchers": 687, + "default_branch": "master" + }, + "source": { + "id": 617210, + "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", + "name": "github-api", + "full_name": "hub4j/github-api", + "private": false, + "owner": { + "login": "hub4j", + "id": 54909825, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", + "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j", + "html_url": "https://github.com/hub4j", + "followers_url": "https://api.github.com/users/hub4j/followers", + "following_url": "https://api.github.com/users/hub4j/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j/orgs", + "repos_url": "https://api.github.com/users/hub4j/repos", + "events_url": "https://api.github.com/users/hub4j/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j/github-api", + "description": "Java API for GitHub", + "fork": false, + "url": "https://api.github.com/repos/hub4j/github-api", + "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", + "created_at": "2010-04-19T04:13:03Z", + "updated_at": "2020-07-27T20:33:12Z", + "pushed_at": "2020-07-27T20:38:26Z", + "git_url": "git://github.com/hub4j/github-api.git", + "ssh_url": "git@github.com:hub4j/github-api.git", + "clone_url": "https://github.com/hub4j/github-api.git", + "svn_url": "https://github.com/hub4j/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24664, + "stargazers_count": 687, + "watchers_count": 687, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 493, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 70, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 493, + "open_issues": 70, + "watchers": 687, + "default_branch": "master" + }, + "network_count": 493, + "subscribers_count": 0 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-7.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-7.json new file mode 100644 index 000000000..8c25db2c7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-7.json @@ -0,0 +1,89 @@ +{ + "url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370", + "repository_url": "https://api.github.com/repos/hub4j-test-org/github-api", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/labels{/name}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/events", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "id": 666574306, + "node_id": "MDExOlB1bGxSZXF1ZXN0NDU3MzkzNjM4", + "number": 370, + "title": "testUnsetMilestoneFromPullRequest", + "user": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "labels": [], + "state": "open", + "locked": false, + "assignee": null, + "assignees": [], + "milestone": { + "url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1", + "html_url": "https://github.com/hub4j-test-org/github-api/milestone/1", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1/labels", + "id": 5704738, + "node_id": "MDk6TWlsZXN0b25lNTcwNDczOA==", + "number": 1, + "title": "Unset Test Milestone", + "description": "For testUnsetMilestone", + "creator": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "open_issues": 1, + "closed_issues": 0, + "state": "open", + "created_at": "2020-07-27T20:46:36Z", + "updated_at": "2020-07-27T20:46:38Z", + "due_on": null, + "closed_at": null + }, + "comments": 0, + "created_at": "2020-07-27T20:46:37Z", + "updated_at": "2020-07-27T20:46:38Z", + "closed_at": null, + "author_association": "MEMBER", + "active_lock_reason": null, + "pull_request": { + "url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "diff_url": "https://github.com/hub4j-test-org/github-api/pull/370.diff", + "patch_url": "https://github.com/hub4j-test-org/github-api/pull/370.patch" + }, + "body": "## test", + "closed_by": null, + "performed_via_github_app": null +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-9.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-9.json new file mode 100644 index 000000000..d97e81240 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_issues_370-9.json @@ -0,0 +1,53 @@ +{ + "url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370", + "repository_url": "https://api.github.com/repos/hub4j-test-org/github-api", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/labels{/name}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/events", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "id": 666574306, + "node_id": "MDExOlB1bGxSZXF1ZXN0NDU3MzkzNjM4", + "number": 370, + "title": "testUnsetMilestoneFromPullRequest", + "user": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "labels": [], + "state": "open", + "locked": false, + "assignee": null, + "assignees": [], + "milestone": null, + "comments": 0, + "created_at": "2020-07-27T20:46:37Z", + "updated_at": "2020-07-27T20:46:39Z", + "closed_at": null, + "author_association": "MEMBER", + "active_lock_reason": null, + "pull_request": { + "url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "diff_url": "https://github.com/hub4j-test-org/github-api/pull/370.diff", + "patch_url": "https://github.com/hub4j-test-org/github-api/pull/370.patch" + }, + "body": "## test", + "closed_by": null, + "performed_via_github_app": null +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_milestones-4.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_milestones-4.json new file mode 100644 index 000000000..b1f3ec8ae --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_milestones-4.json @@ -0,0 +1,37 @@ +{ + "url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1", + "html_url": "https://github.com/hub4j-test-org/github-api/milestone/1", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1/labels", + "id": 5704738, + "node_id": "MDk6TWlsZXN0b25lNTcwNDczOA==", + "number": 1, + "title": "Unset Test Milestone", + "description": "For testUnsetMilestone", + "creator": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "open_issues": 0, + "closed_issues": 0, + "state": "open", + "created_at": "2020-07-27T20:46:36Z", + "updated_at": "2020-07-27T20:46:36Z", + "due_on": null, + "closed_at": null +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json new file mode 100644 index 000000000..ba9b74109 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json @@ -0,0 +1,341 @@ +{ + "url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370", + "id": 457393638, + "node_id": "MDExOlB1bGxSZXF1ZXN0NDU3MzkzNjM4", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "diff_url": "https://github.com/hub4j-test-org/github-api/pull/370.diff", + "patch_url": "https://github.com/hub4j-test-org/github-api/pull/370.patch", + "issue_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370", + "number": 370, + "state": "open", + "locked": false, + "title": "testUnsetMilestoneFromPullRequest", + "user": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "body": "## test", + "created_at": "2020-07-27T20:46:37Z", + "updated_at": "2020-07-27T20:46:37Z", + "closed_at": null, + "merged_at": null, + "merge_commit_sha": null, + "assignee": null, + "assignees": [], + "requested_reviewers": [], + "requested_teams": [], + "labels": [], + "milestone": null, + "draft": false, + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/commits", + "review_comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/comments", + "review_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/1f40fdf4acf1adb246c109c21a22f617e4bd1ca8", + "head": { + "label": "hub4j-test-org:test/stable", + "ref": "test/stable", + "sha": "1f40fdf4acf1adb246c109c21a22f617e4bd1ca8", + "user": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:44:55Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 6, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 6, + "watchers": 0, + "default_branch": "master" + } + }, + "base": { + "label": "hub4j-test-org:master", + "ref": "master", + "sha": "8051615eff597f4e49f4f47625e6fc2b49f26bfc", + "user": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:44:55Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 6, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 6, + "watchers": 0, + "default_branch": "master" + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370" + }, + "html": { + "href": "https://github.com/hub4j-test-org/github-api/pull/370" + }, + "issue": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370" + }, + "comments": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/1f40fdf4acf1adb246c109c21a22f617e4bd1ca8" + } + }, + "author_association": "MEMBER", + "active_lock_reason": null, + "merged": false, + "mergeable": null, + "rebaseable": null, + "mergeable_state": "unknown", + "merged_by": null, + "comments": 0, + "review_comments": 0, + "maintainer_can_modify": false, + "commits": 2, + "additions": 2, + "deletions": 1, + "changed_files": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json new file mode 100644 index 000000000..cf36a914b --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json @@ -0,0 +1,341 @@ +{ + "url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370", + "id": 457393638, + "node_id": "MDExOlB1bGxSZXF1ZXN0NDU3MzkzNjM4", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "diff_url": "https://github.com/hub4j-test-org/github-api/pull/370.diff", + "patch_url": "https://github.com/hub4j-test-org/github-api/pull/370.patch", + "issue_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370", + "number": 370, + "state": "open", + "locked": false, + "title": "testUnsetMilestoneFromPullRequest", + "user": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "body": "## test", + "created_at": "2020-07-27T20:46:37Z", + "updated_at": "2020-07-27T20:46:39Z", + "closed_at": null, + "merged_at": null, + "merge_commit_sha": "795728d748492989a5a013f69f8dfb6c5d093688", + "assignee": null, + "assignees": [], + "requested_reviewers": [], + "requested_teams": [], + "labels": [], + "milestone": null, + "draft": false, + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/commits", + "review_comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/comments", + "review_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/1f40fdf4acf1adb246c109c21a22f617e4bd1ca8", + "head": { + "label": "hub4j-test-org:test/stable", + "ref": "test/stable", + "sha": "1f40fdf4acf1adb246c109c21a22f617e4bd1ca8", + "user": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:46:38Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 6, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 6, + "watchers": 0, + "default_branch": "master" + } + }, + "base": { + "label": "hub4j-test-org:master", + "ref": "master", + "sha": "8051615eff597f4e49f4f47625e6fc2b49f26bfc", + "user": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:46:38Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 6, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 6, + "watchers": 0, + "default_branch": "master" + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370" + }, + "html": { + "href": "https://github.com/hub4j-test-org/github-api/pull/370" + }, + "issue": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370" + }, + "comments": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/1f40fdf4acf1adb246c109c21a22f617e4bd1ca8" + } + }, + "author_association": "MEMBER", + "active_lock_reason": null, + "merged": false, + "mergeable": true, + "rebaseable": true, + "mergeable_state": "clean", + "merged_by": null, + "comments": 0, + "review_comments": 0, + "maintainer_can_modify": false, + "commits": 2, + "additions": 2, + "deletions": 1, + "changed_files": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json new file mode 100644 index 000000000..021be462c --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json @@ -0,0 +1,377 @@ +{ + "url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370", + "id": 457393638, + "node_id": "MDExOlB1bGxSZXF1ZXN0NDU3MzkzNjM4", + "html_url": "https://github.com/hub4j-test-org/github-api/pull/370", + "diff_url": "https://github.com/hub4j-test-org/github-api/pull/370.diff", + "patch_url": "https://github.com/hub4j-test-org/github-api/pull/370.patch", + "issue_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370", + "number": 370, + "state": "open", + "locked": false, + "title": "testUnsetMilestoneFromPullRequest", + "user": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "body": "## test", + "created_at": "2020-07-27T20:46:37Z", + "updated_at": "2020-07-27T20:46:38Z", + "closed_at": null, + "merged_at": null, + "merge_commit_sha": "795728d748492989a5a013f69f8dfb6c5d093688", + "assignee": null, + "assignees": [], + "requested_reviewers": [], + "requested_teams": [], + "labels": [], + "milestone": { + "url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1", + "html_url": "https://github.com/hub4j-test-org/github-api/milestone/1", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1/labels", + "id": 5704738, + "node_id": "MDk6TWlsZXN0b25lNTcwNDczOA==", + "number": 1, + "title": "Unset Test Milestone", + "description": "For testUnsetMilestone", + "creator": { + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false + }, + "open_issues": 1, + "closed_issues": 0, + "state": "open", + "created_at": "2020-07-27T20:46:36Z", + "updated_at": "2020-07-27T20:46:38Z", + "due_on": null, + "closed_at": null + }, + "draft": false, + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/commits", + "review_comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/comments", + "review_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/1f40fdf4acf1adb246c109c21a22f617e4bd1ca8", + "head": { + "label": "hub4j-test-org:test/stable", + "ref": "test/stable", + "sha": "1f40fdf4acf1adb246c109c21a22f617e4bd1ca8", + "user": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:46:38Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 6, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 6, + "watchers": 0, + "default_branch": "master" + } + }, + "base": { + "label": "hub4j-test-org:master", + "ref": "master", + "sha": "8051615eff597f4e49f4f47625e6fc2b49f26bfc", + "user": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "hub4j-test-org/github-api", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/github-api", + "description": "Resetting", + "fork": true, + "url": "https://api.github.com/repos/hub4j-test-org/github-api", + "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2020-06-10T23:27:59Z", + "pushed_at": "2020-07-27T20:46:38Z", + "git_url": "git://github.com/hub4j-test-org/github-api.git", + "ssh_url": "git@github.com:hub4j-test-org/github-api.git", + "clone_url": "https://github.com/hub4j-test-org/github-api.git", + "svn_url": "https://github.com/hub4j-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 19050, + "stargazers_count": 0, + "watchers_count": 0, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 6, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 6, + "watchers": 0, + "default_branch": "master" + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370" + }, + "html": { + "href": "https://github.com/hub4j-test-org/github-api/pull/370" + }, + "issue": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370" + }, + "comments": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/issues/370/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/1f40fdf4acf1adb246c109c21a22f617e4bd1ca8" + } + }, + "author_association": "MEMBER", + "active_lock_reason": null, + "merged": false, + "mergeable": true, + "rebaseable": true, + "mergeable_state": "unstable", + "merged_by": null, + "comments": 0, + "review_comments": 0, + "maintainer_can_modify": false, + "commits": 2, + "additions": 2, + "deletions": 1, + "changed_files": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/user-1.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/user-1.json new file mode 100644 index 000000000..440a7f7c4 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/user-1.json @@ -0,0 +1,46 @@ +{ + "login": "gastaldi", + "id": 54133, + "node_id": "MDQ6VXNlcjU0MTMz", + "avatar_url": "https://avatars1.githubusercontent.com/u/54133?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/gastaldi", + "html_url": "https://github.com/gastaldi", + "followers_url": "https://api.github.com/users/gastaldi/followers", + "following_url": "https://api.github.com/users/gastaldi/following{/other_user}", + "gists_url": "https://api.github.com/users/gastaldi/gists{/gist_id}", + "starred_url": "https://api.github.com/users/gastaldi/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/gastaldi/subscriptions", + "organizations_url": "https://api.github.com/users/gastaldi/orgs", + "repos_url": "https://api.github.com/users/gastaldi/repos", + "events_url": "https://api.github.com/users/gastaldi/events{/privacy}", + "received_events_url": "https://api.github.com/users/gastaldi/received_events", + "type": "User", + "site_admin": false, + "name": "George Gastaldi", + "company": "Red Hat, Inc.", + "blog": "http://gastaldi.wordpress.com", + "location": "Joinville, Santa Catarina, Brasil", + "email": "gegastaldi@gmail.com", + "hireable": null, + "bio": "\r\n Principal Software Engineer @ Red Hat and JBoss Forge Project Lead. Works on @quarkusio. Enjoys submitting PRs to interesting projects\r\n", + "twitter_username": "gegastaldi", + "public_repos": 240, + "public_gists": 88, + "followers": 159, + "following": 82, + "created_at": "2009-02-13T01:52:01Z", + "updated_at": "2020-07-25T18:35:06Z", + "private_gists": 3, + "total_private_repos": 1, + "owned_private_repos": 1, + "disk_usage": 1017411, + "collaborators": 1, + "two_factor_authentication": true, + "plan": { + "name": "free", + "space": 976562499, + "collaborators": 0, + "private_repos": 10000 + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/orgs_hub4j-test-org-2.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/orgs_hub4j-test-org-2.json new file mode 100644 index 000000000..c5a326446 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/orgs_hub4j-test-org-2.json @@ -0,0 +1,47 @@ +{ + "id": "afe33575-a0c9-4198-902d-809acfb0b120", + "name": "orgs_hub4j-test-org", + "request": { + "url": "/orgs/hub4j-test-org", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "orgs_hub4j-test-org-2.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:35 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4912", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"f27774969913a0bbb98565b381b8554c\"", + "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35F3A:FFAA95:5F1F3D29" + } + }, + "uuid": "afe33575-a0c9-4198-902d-809acfb0b120", + "persistent": true, + "insertionIndex": 2 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-3.json new file mode 100644 index 000000000..f43dea7e9 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-3.json @@ -0,0 +1,50 @@ +{ + "id": "2d00f122-be4d-45aa-ac91-895fd6d73034", + "name": "repos_hub4j-test-org_github-api", + "request": { + "url": "/repos/hub4j-test-org/github-api", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_github-api-3.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:35 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4911", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"5a80625b81785acf0855c7e7cb5bf574\"", + "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35F49:FFAB1B:5F1F3D2B" + } + }, + "uuid": "2d00f122-be4d-45aa-ac91-895fd6d73034", + "persistent": true, + "scenarioName": "scenario-1-repos-hub4j-test-org-github-api", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-2", + "insertionIndex": 3 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json new file mode 100644 index 000000000..59956323f --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json @@ -0,0 +1,49 @@ +{ + "id": "9f855f1f-a388-4d78-9551-e1d5136fc804", + "name": "repos_hub4j-test-org_github-api", + "request": { + "url": "/repos/hub4j-test-org/github-api", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_github-api-5.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:36 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4909", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"5a80625b81785acf0855c7e7cb5bf574\"", + "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35F7C:FFAB61:5F1F3D2C" + } + }, + "uuid": "9f855f1f-a388-4d78-9551-e1d5136fc804", + "persistent": true, + "scenarioName": "scenario-1-repos-hub4j-test-org-github-api", + "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-2", + "insertionIndex": 5 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-7.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-7.json new file mode 100644 index 000000000..1843d7ec2 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-7.json @@ -0,0 +1,53 @@ +{ + "id": "13604596-6767-4020-ada1-41c8845b84ec", + "name": "repos_hub4j-test-org_github-api_issues_370", + "request": { + "url": "/repos/hub4j-test-org/github-api/issues/370", + "method": "PATCH", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"milestone\":1}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_github-api_issues_370-7.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:38 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4907", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"544abb953c4396649474c93cdcd7cd9e\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35FDB:FFABE8:5F1F3D2E" + } + }, + "uuid": "13604596-6767-4020-ada1-41c8845b84ec", + "persistent": true, + "insertionIndex": 7 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-9.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-9.json new file mode 100644 index 000000000..822233078 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_issues_370-9.json @@ -0,0 +1,53 @@ +{ + "id": "268cc36e-ea6d-4ac0-b0de-32ad29b875be", + "name": "repos_hub4j-test-org_github-api_issues_370", + "request": { + "url": "/repos/hub4j-test-org/github-api/issues/370", + "method": "PATCH", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"milestone\":null}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_github-api_issues_370-9.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:39 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4905", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"082bf0ebf930b58e337ce3e16b10a17a\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B36033:FFAC62:5F1F3D2F" + } + }, + "uuid": "268cc36e-ea6d-4ac0-b0de-32ad29b875be", + "persistent": true, + "insertionIndex": 9 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_milestones-4.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_milestones-4.json new file mode 100644 index 000000000..bac32a35f --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_milestones-4.json @@ -0,0 +1,54 @@ +{ + "id": "375956e0-764e-4e6c-bfbe-aed30d86ee89", + "name": "repos_hub4j-test-org_github-api_milestones", + "request": { + "url": "/repos/hub4j-test-org/github-api/milestones", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"description\":\"For testUnsetMilestone\",\"title\":\"Unset Test Milestone\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_hub4j-test-org_github-api_milestones-4.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:36 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4910", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"e78bfb2829de0438b07cf0deac4248ee\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "Location": "https://api.github.com/repos/hub4j-test-org/github-api/milestones/1", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35F63:FFAB35:5F1F3D2B" + } + }, + "uuid": "375956e0-764e-4e6c-bfbe-aed30d86ee89", + "persistent": true, + "insertionIndex": 4 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json new file mode 100644 index 000000000..1bab0d753 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json @@ -0,0 +1,54 @@ +{ + "id": "db2a1014-e671-4483-9d30-2df3a54375a0", + "name": "repos_hub4j-test-org_github-api_pulls", + "request": { + "url": "/repos/hub4j-test-org/github-api/pulls", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "application/vnd.github.shadow-cat-preview+json" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"head\":\"test/stable\",\"draft\":false,\"maintainer_can_modify\":true,\"title\":\"testUnsetMilestoneFromPullRequest\",\"body\":\"## test\",\"base\":\"master\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_hub4j-test-org_github-api_pulls-6.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:37 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4908", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"2ec7235639804a6c052a39e6e626113c\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "Location": "https://api.github.com/repos/hub4j-test-org/github-api/pulls/370", + "X-GitHub-Media-Type": "github.v3; param=shadow-cat-preview; format=json", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35F8F:FFAB82:5F1F3D2C" + } + }, + "uuid": "db2a1014-e671-4483-9d30-2df3a54375a0", + "persistent": true, + "insertionIndex": 6 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-10.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-10.json new file mode 100644 index 000000000..15a47cc12 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-10.json @@ -0,0 +1,49 @@ +{ + "id": "478c6283-eb61-4042-9a7f-4d2ef92dbea9", + "name": "repos_hub4j-test-org_github-api_pulls_370", + "request": { + "url": "/repos/hub4j-test-org/github-api/pulls/370", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "application/vnd.github.shadow-cat-preview+json" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_github-api_pulls_370-10.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:40 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4904", + "X-RateLimit-Reset": "1595885201", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"dc598bdd247bce695a5e72bb0fb7ac7e\"", + "Last-Modified": "Mon, 27 Jul 2020 20:46:39 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "github.v3; param=shadow-cat-preview; format=json", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B36054:FFAC99:5F1F3D2F" + } + }, + "uuid": "478c6283-eb61-4042-9a7f-4d2ef92dbea9", + "persistent": true, + "scenarioName": "scenario-2-repos-hub4j-test-org-github-api-pulls-370", + "requiredScenarioState": "scenario-2-repos-hub4j-test-org-github-api-pulls-370-2", + "insertionIndex": 10 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-8.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-8.json new file mode 100644 index 000000000..d38daaf49 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls_370-8.json @@ -0,0 +1,50 @@ +{ + "id": "1ba351e6-d00e-4ed3-a556-bd05b72ca730", + "name": "repos_hub4j-test-org_github-api_pulls_370", + "request": { + "url": "/repos/hub4j-test-org/github-api/pulls/370", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "application/vnd.github.shadow-cat-preview+json" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_github-api_pulls_370-8.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:39 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4906", + "X-RateLimit-Reset": "1595885201", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"e9298b8c24777fd7070e52317f8c7376\"", + "Last-Modified": "Mon, 27 Jul 2020 20:46:38 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "github.v3; param=shadow-cat-preview; format=json", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B3600F:FFAC31:5F1F3D2E" + } + }, + "uuid": "1ba351e6-d00e-4ed3-a556-bd05b72ca730", + "persistent": true, + "scenarioName": "scenario-2-repos-hub4j-test-org-github-api-pulls-370", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-2-repos-hub4j-test-org-github-api-pulls-370-2", + "insertionIndex": 8 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/user-1.json new file mode 100644 index 000000000..b9a76bf88 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/user-1.json @@ -0,0 +1,47 @@ +{ + "id": "4587fa84-6600-4da2-9e22-583dfbfe78ef", + "name": "user", + "request": { + "url": "/user", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "user-1.json", + "headers": { + "Date": "Mon, 27 Jul 2020 20:46:33 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4917", + "X-RateLimit-Reset": "1595885200", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"5b4936e5deab228c37153468ddf2554b\"", + "Last-Modified": "Sat, 25 Jul 2020 18:35:06 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C730:4712:B35ED8:FFAA81:5F1F3D29" + } + }, + "uuid": "4587fa84-6600-4da2-9e22-583dfbfe78ef", + "persistent": true, + "insertionIndex": 1 +} \ No newline at end of file From 59e0046c1eebfef2f0d7abf800c7411475612d9c Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 24 Jul 2020 19:55:08 -0300 Subject: [PATCH 03/20] Validate argument in GitHub.getRepository This avoids the ArrayIndexOutOfBoundsException when the argument format is invalid --- src/main/java/org/kohsuke/github/GitHub.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java index da29e0c53..d79c2929c 100644 --- a/src/main/java/org/kohsuke/github/GitHub.java +++ b/src/main/java/org/kohsuke/github/GitHub.java @@ -532,7 +532,7 @@ public class GitHub { } /** - * Gets the repository object from 'user/reponame' string that GitHub calls as "repository name" + * Gets the repository object from 'owner/repo' string that GitHub calls as "repository name" * * @param name * the name @@ -543,6 +543,9 @@ public class GitHub { */ public GHRepository getRepository(String name) throws IOException { String[] tokens = name.split("/"); + if (tokens.length < 2) { + throw new IllegalArgumentException("Repository name must be in format owner/repo"); + } return createRequest().withUrlPath("/repos/" + tokens[0] + '/' + tokens[1]) .fetch(GHRepository.class) .wrap(this); From 43063fe8cef70151a505ac7ea85227975993af6a Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Mon, 27 Jul 2020 14:12:15 -0700 Subject: [PATCH 04/20] Minor tweaks --- .../org/kohsuke/github/GHMilestoneTest.java | 6 +- .../repos_hub4j-test-org_github-api-5.json | 332 ------------------ ...pos_hub4j-test-org_github-api_pulls-6.json | 2 +- ...ub4j-test-org_github-api_pulls_370-10.json | 2 +- ...hub4j-test-org_github-api_pulls_370-8.json | 2 +- .../repos_hub4j-test-org_github-api-5.json | 49 --- ...pos_hub4j-test-org_github-api_pulls-6.json | 2 +- 7 files changed, 8 insertions(+), 387 deletions(-) delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json diff --git a/src/test/java/org/kohsuke/github/GHMilestoneTest.java b/src/test/java/org/kohsuke/github/GHMilestoneTest.java index 19df30802..046936dfa 100644 --- a/src/test/java/org/kohsuke/github/GHMilestoneTest.java +++ b/src/test/java/org/kohsuke/github/GHMilestoneTest.java @@ -74,8 +74,10 @@ public class GHMilestoneTest extends AbstractGitHubWireMockTest { public void testUnsetMilestoneFromPullRequest() throws IOException { GHRepository repo = getRepository(); GHMilestone milestone = repo.createMilestone("Unset Test Milestone", "For testUnsetMilestone"); - GHPullRequest p = getRepository() - .createPullRequest("testUnsetMilestoneFromPullRequest", "test/stable", "master", "## test"); + GHPullRequest p = repo.createPullRequest("testUnsetMilestoneFromPullRequest", + "test/stable", + "master", + "## test pull request"); // set the milestone p.setMilestone(milestone); diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json deleted file mode 100644 index 7139e7245..000000000 --- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api-5.json +++ /dev/null @@ -1,332 +0,0 @@ -{ - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "hub4j-test-org/github-api", - "private": false, - "owner": { - "login": "hub4j-test-org", - "id": 7544739, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", - "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j-test-org", - "html_url": "https://github.com/hub4j-test-org", - "followers_url": "https://api.github.com/users/hub4j-test-org/followers", - "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", - "repos_url": "https://api.github.com/users/hub4j-test-org/repos", - "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j-test-org/github-api", - "description": "Resetting", - "fork": true, - "url": "https://api.github.com/repos/hub4j-test-org/github-api", - "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2020-06-10T23:27:59Z", - "pushed_at": "2020-07-27T20:44:55Z", - "git_url": "git://github.com/hub4j-test-org/github-api.git", - "ssh_url": "git@github.com:hub4j-test-org/github-api.git", - "clone_url": "https://github.com/hub4j-test-org/github-api.git", - "svn_url": "https://github.com/hub4j-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 19050, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 0, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 5, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 5, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "temp_clone_token": "", - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "delete_branch_on_merge": false, - "organization": { - "login": "hub4j-test-org", - "id": 7544739, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", - "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j-test-org", - "html_url": "https://github.com/hub4j-test-org", - "followers_url": "https://api.github.com/users/hub4j-test-org/followers", - "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", - "repos_url": "https://api.github.com/users/hub4j-test-org/repos", - "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-07-27T20:33:12Z", - "pushed_at": "2020-07-27T20:38:26Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 24664, - "stargazers_count": 687, - "watchers_count": 687, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 493, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 70, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 493, - "open_issues": 70, - "watchers": 687, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-07-27T20:33:12Z", - "pushed_at": "2020-07-27T20:38:26Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 24664, - "stargazers_count": 687, - "watchers_count": 687, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 493, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 70, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 493, - "open_issues": 70, - "watchers": 687, - "default_branch": "master" - }, - "network_count": 493, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json index ba9b74109..84b9d34ed 100644 --- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls-6.json @@ -30,7 +30,7 @@ "type": "User", "site_admin": false }, - "body": "## test", + "body": "## test pull request", "created_at": "2020-07-27T20:46:37Z", "updated_at": "2020-07-27T20:46:37Z", "closed_at": null, diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json index cf36a914b..483406500 100644 --- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-10.json @@ -30,7 +30,7 @@ "type": "User", "site_admin": false }, - "body": "## test", + "body": "## test pull request", "created_at": "2020-07-27T20:46:37Z", "updated_at": "2020-07-27T20:46:39Z", "closed_at": null, diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json index 021be462c..f185ab025 100644 --- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/__files/repos_hub4j-test-org_github-api_pulls_370-8.json @@ -30,7 +30,7 @@ "type": "User", "site_admin": false }, - "body": "## test", + "body": "## test pull request", "created_at": "2020-07-27T20:46:37Z", "updated_at": "2020-07-27T20:46:38Z", "closed_at": null, diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json deleted file mode 100644 index 59956323f..000000000 --- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api-5.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "id": "9f855f1f-a388-4d78-9551-e1d5136fc804", - "name": "repos_hub4j-test-org_github-api", - "request": { - "url": "/repos/hub4j-test-org/github-api", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_hub4j-test-org_github-api-5.json", - "headers": { - "Date": "Mon, 27 Jul 2020 20:46:36 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4909", - "X-RateLimit-Reset": "1595885200", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"5a80625b81785acf0855c7e7cb5bf574\"", - "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C730:4712:B35F7C:FFAB61:5F1F3D2C" - } - }, - "uuid": "9f855f1f-a388-4d78-9551-e1d5136fc804", - "persistent": true, - "scenarioName": "scenario-1-repos-hub4j-test-org-github-api", - "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-2", - "insertionIndex": 5 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json index 1bab0d753..58dc555a5 100644 --- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json +++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUnsetMilestoneFromPullRequest/mappings/repos_hub4j-test-org_github-api_pulls-6.json @@ -11,7 +11,7 @@ }, "bodyPatterns": [ { - "equalToJson": "{\"head\":\"test/stable\",\"draft\":false,\"maintainer_can_modify\":true,\"title\":\"testUnsetMilestoneFromPullRequest\",\"body\":\"## test\",\"base\":\"master\"}", + "equalToJson": "{\"head\":\"test/stable\",\"draft\":false,\"maintainer_can_modify\":true,\"title\":\"testUnsetMilestoneFromPullRequest\",\"body\":\"## test pull request\",\"base\":\"master\"}", "ignoreArrayOrder": true, "ignoreExtraElements": false } From fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Jul 2020 12:41:31 +0100 Subject: [PATCH 05/20] Merge branches method --- .../java/org/kohsuke/github/GHBranch.java | 25 +++++++++++++++ .../github/GHBranchProtectionTest.java | 31 +++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/main/java/org/kohsuke/github/GHBranch.java b/src/main/java/org/kohsuke/github/GHBranch.java index 72a7dd1c5..db5686c23 100644 --- a/src/main/java/org/kohsuke/github/GHBranch.java +++ b/src/main/java/org/kohsuke/github/GHBranch.java @@ -165,6 +165,31 @@ public class GHBranch { } } + /** + * Merge branches. + * + * @param headBranch + * the branch whose head is being merged + * + * @param commit_message + * the commit message + * + * @return GHCommit the merge commit created + * + * @throws IOException + * if merging fails + */ + public GHCommit merge(GHBranch headBranch, String commit_message) throws IOException { + return root.createRequest() + .withUrlPath(owner.getApiTailUrl("merges")) + .method("POST") + .with("commit_message", commit_message) + .with("base", this.name) + .with("head", headBranch.getName()) + .fetch(GHCommit.class) + .wrapUp(owner); + } + String getApiRoute() { return owner.getApiTailUrl("/branches/" + name); } diff --git a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java index d0182fc27..47dadf0ca 100755 --- a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java +++ b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java @@ -112,4 +112,35 @@ public class GHBranchProtectionTest extends AbstractGitHubWireMockTest { assertTrue(protectionTest instanceof GHBranchProtection); assertTrue(repo.getBranch(BRANCH).isProtected()); } + + @Test + public void testMergeBranch() throws Exception { + String name = "testMergeBranch"; + String branchName = "test/" + name; + + GHRepository repository = gitHub.getOrganization("hub4j-test-org").getRepository("github-api"); + GHRef masterRef = repository.getRef("heads/master"); + repository.createRef("refs/heads/" + branchName, masterRef.getObject().getSha()); + + GHContentUpdateResponse response = repository.createContent() + .content(name) + .message(name) + .path(name) + .branch(branchName) + .commit(); + + Thread.sleep(1000); + + repository.createContent() + .content(name + name) + .path(name) + .branch(branchName) + .message(name) + .sha(response.getContent().getSha()) + .commit(); + + GHBranch masterBranch = repository.getBranch("master"); + GHCommit mergeCommit = repository.getBranch(branchName).merge(masterBranch, "merging master into testBranch"); + assertNotNull(mergeCommit); + } } From 660763908ddbc38e093a6c409c44dd02203a2bff Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Jul 2020 14:24:35 +0100 Subject: [PATCH 06/20] test refactor --- .../github/GHBranchProtectionTest.java | 31 --------- .../java/org/kohsuke/github/GHBranchTest.java | 63 +++++++++++++++++++ 2 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 src/test/java/org/kohsuke/github/GHBranchTest.java diff --git a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java index 47dadf0ca..d0182fc27 100755 --- a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java +++ b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java @@ -112,35 +112,4 @@ public class GHBranchProtectionTest extends AbstractGitHubWireMockTest { assertTrue(protectionTest instanceof GHBranchProtection); assertTrue(repo.getBranch(BRANCH).isProtected()); } - - @Test - public void testMergeBranch() throws Exception { - String name = "testMergeBranch"; - String branchName = "test/" + name; - - GHRepository repository = gitHub.getOrganization("hub4j-test-org").getRepository("github-api"); - GHRef masterRef = repository.getRef("heads/master"); - repository.createRef("refs/heads/" + branchName, masterRef.getObject().getSha()); - - GHContentUpdateResponse response = repository.createContent() - .content(name) - .message(name) - .path(name) - .branch(branchName) - .commit(); - - Thread.sleep(1000); - - repository.createContent() - .content(name + name) - .path(name) - .branch(branchName) - .message(name) - .sha(response.getContent().getSha()) - .commit(); - - GHBranch masterBranch = repository.getBranch("master"); - GHCommit mergeCommit = repository.getBranch(branchName).merge(masterBranch, "merging master into testBranch"); - assertNotNull(mergeCommit); - } } diff --git a/src/test/java/org/kohsuke/github/GHBranchTest.java b/src/test/java/org/kohsuke/github/GHBranchTest.java new file mode 100644 index 000000000..89878306e --- /dev/null +++ b/src/test/java/org/kohsuke/github/GHBranchTest.java @@ -0,0 +1,63 @@ +package org.kohsuke.github; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; + +public class GHBranchTest extends AbstractGitHubWireMockTest { + private static final String BRANCH_1 = "testBranch1"; + private static final String BRANCH_2 = "testBranch2"; + + private GHRepository repository; + + @Before + public void before() throws Exception { + repository = gitHub.getUser("jkalash").getRepository("github-api"); + cleanupBranches(); + } + + @After + public void after() throws Exception { + // cleanupBranches(); + } + + @Test + public void testMergeBranch() throws Exception { + String masterHead = repository.getRef("heads/master").getObject().getSha(); + createRefAndPostContent(BRANCH_1, masterHead); + createRefAndPostContent(BRANCH_2, masterHead); + + Thread.sleep(1000); + + GHBranch otherBranch = repository.getBranch(BRANCH_2); + String commitMessage = "merging " + BRANCH_2; + GHCommit mergeCommit = repository.getBranch(BRANCH_2).merge(otherBranch, commitMessage); + assertEquals(mergeCommit.getCommitShortInfo().getMessage(), mergeCommit); + } + + private void createRefAndPostContent(String branchName, String sha) throws IOException { + String refName = "refs/heads/" + branchName; + if (repository.listRefs().toList().stream().map(GHRef::getRef).noneMatch(ref -> ref.equals(refName))) { + repository.createRef(refName, sha); + } + repository.createContent().content(branchName).message(branchName).path(branchName).branch(branchName).commit(); + } + + private void cleanupBranches() throws Exception { + if (!mockGitHub.isUseProxy()) { + return; + } + + String ref1 = "refs/heads/" + BRANCH_1; + String ref2 = "refs/heads/" + BRANCH_2; + for (GHRef ref : repository.listRefs().toList()) { + if (ref.getRef().equals(ref1) || ref.getRef().equals(ref2)) { + ref.delete(); + } + } + + Thread.sleep(1000); + } +} From b835884b2eb6cb13bc69c0b316c259803f2eb8a7 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Jul 2020 14:37:50 +0100 Subject: [PATCH 07/20] fix test --- .../java/org/kohsuke/github/GHBranchTest.java | 5 +- .../__files/repos_jkalash_github-api-3.json | 312 ++++++++++++++++++ ...sh_github-api_branches_testbranch1-22.json | 95 ++++++ ...sh_github-api_branches_testbranch2-21.json | 95 ++++++ ...sh_github-api_contents_testbranch1-14.json | 52 +++ ...sh_github-api_contents_testbranch2-20.json | 52 +++ .../repos_jkalash_github-api_git_refs-13.json | 10 + .../repos_jkalash_github-api_git_refs-15.json | 302 +++++++++++++++++ .../repos_jkalash_github-api_git_refs-19.json | 10 + .../repos_jkalash_github-api_git_refs-24.json | 302 +++++++++++++++++ .../repos_jkalash_github-api_git_refs-4.json | 302 +++++++++++++++++ .../repos_jkalash_github-api_git_refs-9.json | 302 +++++++++++++++++ ...sh_github-api_git_refs_heads_master-8.json | 10 + .../repos_jkalash_github-api_merges-23.json | 84 +++++ .../repositories_283171990_git_refs-10.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-11.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-12.json | 252 ++++++++++++++ .../repositories_283171990_git_refs-16.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-17.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-18.json | 262 +++++++++++++++ .../repositories_283171990_git_refs-25.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-26.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-27.json | 272 +++++++++++++++ .../repositories_283171990_git_refs-5.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-6.json | 302 +++++++++++++++++ .../repositories_283171990_git_refs-7.json | 252 ++++++++++++++ .../testMergeBranch/__files/user-1.json | 46 +++ .../__files/users_jkalash-2.json | 46 +++ .../mappings/repos_jkalash_github-api-3.json | 47 +++ ...sh_github-api_branches_testbranch1-22.json | 46 +++ ...sh_github-api_branches_testbranch2-21.json | 46 +++ ...sh_github-api_contents_testbranch1-14.json | 53 +++ ...sh_github-api_contents_testbranch2-20.json | 53 +++ .../repos_jkalash_github-api_git_refs-13.json | 54 +++ .../repos_jkalash_github-api_git_refs-15.json | 52 +++ .../repos_jkalash_github-api_git_refs-19.json | 54 +++ .../repos_jkalash_github-api_git_refs-24.json | 51 +++ .../repos_jkalash_github-api_git_refs-4.json | 52 +++ .../repos_jkalash_github-api_git_refs-9.json | 52 +++ ...sh_github-api_git_refs_heads_master-8.json | 48 +++ ...hub-api_git_refs_heads_testbranch1-28.json | 41 +++ ...hub-api_git_refs_heads_testbranch2-29.json | 41 +++ .../repos_jkalash_github-api_merges-23.json | 54 +++ .../repositories_283171990_git_refs-10.json | 52 +++ .../repositories_283171990_git_refs-11.json | 52 +++ .../repositories_283171990_git_refs-12.json | 52 +++ .../repositories_283171990_git_refs-16.json | 52 +++ .../repositories_283171990_git_refs-17.json | 52 +++ .../repositories_283171990_git_refs-18.json | 52 +++ .../repositories_283171990_git_refs-25.json | 51 +++ .../repositories_283171990_git_refs-26.json | 51 +++ .../repositories_283171990_git_refs-27.json | 51 +++ .../repositories_283171990_git_refs-5.json | 52 +++ .../repositories_283171990_git_refs-6.json | 52 +++ .../repositories_283171990_git_refs-7.json | 52 +++ .../testMergeBranch/mappings/user-1.json | 47 +++ .../mappings/users_jkalash-2.json | 47 +++ 57 files changed, 6935 insertions(+), 3 deletions(-) create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json diff --git a/src/test/java/org/kohsuke/github/GHBranchTest.java b/src/test/java/org/kohsuke/github/GHBranchTest.java index 89878306e..f84c77364 100644 --- a/src/test/java/org/kohsuke/github/GHBranchTest.java +++ b/src/test/java/org/kohsuke/github/GHBranchTest.java @@ -20,7 +20,7 @@ public class GHBranchTest extends AbstractGitHubWireMockTest { @After public void after() throws Exception { - // cleanupBranches(); + cleanupBranches(); } @Test @@ -33,8 +33,7 @@ public class GHBranchTest extends AbstractGitHubWireMockTest { GHBranch otherBranch = repository.getBranch(BRANCH_2); String commitMessage = "merging " + BRANCH_2; - GHCommit mergeCommit = repository.getBranch(BRANCH_2).merge(otherBranch, commitMessage); - assertEquals(mergeCommit.getCommitShortInfo().getMessage(), mergeCommit); + assertNotNull(repository.getBranch(BRANCH_1).merge(otherBranch, commitMessage)); } private void createRefAndPostContent(String branchName, String sha) throws IOException { diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json new file mode 100644 index 000000000..a329d30ea --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json @@ -0,0 +1,312 @@ +{ + "id": 283171990, + "node_id": "MDEwOlJlcG9zaXRvcnkyODMxNzE5OTA=", + "name": "github-api", + "full_name": "JKalash/github-api", + "private": false, + "owner": { + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/JKalash/github-api", + "description": "Java API for GitHub", + "fork": true, + "url": "https://api.github.com/repos/JKalash/github-api", + "forks_url": "https://api.github.com/repos/JKalash/github-api/forks", + "keys_url": "https://api.github.com/repos/JKalash/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/JKalash/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/JKalash/github-api/teams", + "hooks_url": "https://api.github.com/repos/JKalash/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/JKalash/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/JKalash/github-api/events", + "assignees_url": "https://api.github.com/repos/JKalash/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/JKalash/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/JKalash/github-api/tags", + "blobs_url": "https://api.github.com/repos/JKalash/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/JKalash/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/JKalash/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/JKalash/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/JKalash/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/JKalash/github-api/languages", + "stargazers_url": "https://api.github.com/repos/JKalash/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/JKalash/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/JKalash/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/JKalash/github-api/subscription", + "commits_url": "https://api.github.com/repos/JKalash/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/JKalash/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/JKalash/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/JKalash/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/JKalash/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/JKalash/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/JKalash/github-api/merges", + "archive_url": "https://api.github.com/repos/JKalash/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/JKalash/github-api/downloads", + "issues_url": "https://api.github.com/repos/JKalash/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/JKalash/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/JKalash/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/JKalash/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/JKalash/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/JKalash/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/JKalash/github-api/deployments", + "created_at": "2020-07-28T09:56:56Z", + "updated_at": "2020-07-28T09:56:58Z", + "pushed_at": "2020-07-28T13:36:35Z", + "git_url": "git://github.com/JKalash/github-api.git", + "ssh_url": "git@github.com:JKalash/github-api.git", + "clone_url": "https://github.com/JKalash/github-api.git", + "svn_url": "https://github.com/JKalash/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24695, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 0, + "watchers": 0, + "default_branch": "master", + "permissions": { + "admin": true, + "push": true, + "pull": true + }, + "temp_clone_token": "", + "allow_squash_merge": true, + "allow_merge_commit": true, + "allow_rebase_merge": true, + "delete_branch_on_merge": false, + "parent": { + "id": 617210, + "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", + "name": "github-api", + "full_name": "hub4j/github-api", + "private": false, + "owner": { + "login": "hub4j", + "id": 54909825, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", + "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j", + "html_url": "https://github.com/hub4j", + "followers_url": "https://api.github.com/users/hub4j/followers", + "following_url": "https://api.github.com/users/hub4j/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j/orgs", + "repos_url": "https://api.github.com/users/hub4j/repos", + "events_url": "https://api.github.com/users/hub4j/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j/github-api", + "description": "Java API for GitHub", + "fork": false, + "url": "https://api.github.com/repos/hub4j/github-api", + "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", + "created_at": "2010-04-19T04:13:03Z", + "updated_at": "2020-07-28T04:31:42Z", + "pushed_at": "2020-07-28T11:46:04Z", + "git_url": "git://github.com/hub4j/github-api.git", + "ssh_url": "git@github.com:hub4j/github-api.git", + "clone_url": "https://github.com/hub4j/github-api.git", + "svn_url": "https://github.com/hub4j/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24690, + "stargazers_count": 687, + "watchers_count": 687, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 494, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 69, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 494, + "open_issues": 69, + "watchers": 687, + "default_branch": "master" + }, + "source": { + "id": 617210, + "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", + "name": "github-api", + "full_name": "hub4j/github-api", + "private": false, + "owner": { + "login": "hub4j", + "id": 54909825, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", + "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j", + "html_url": "https://github.com/hub4j", + "followers_url": "https://api.github.com/users/hub4j/followers", + "following_url": "https://api.github.com/users/hub4j/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j/orgs", + "repos_url": "https://api.github.com/users/hub4j/repos", + "events_url": "https://api.github.com/users/hub4j/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j/github-api", + "description": "Java API for GitHub", + "fork": false, + "url": "https://api.github.com/repos/hub4j/github-api", + "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", + "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", + "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j/github-api/events", + "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", + "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", + "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", + "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", + "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", + "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", + "created_at": "2010-04-19T04:13:03Z", + "updated_at": "2020-07-28T04:31:42Z", + "pushed_at": "2020-07-28T11:46:04Z", + "git_url": "git://github.com/hub4j/github-api.git", + "ssh_url": "git@github.com:hub4j/github-api.git", + "clone_url": "https://github.com/hub4j/github-api.git", + "svn_url": "https://github.com/hub4j/github-api", + "homepage": "https://github-api.kohsuke.org/", + "size": 24690, + "stargazers_count": 687, + "watchers_count": 687, + "language": "Java", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 494, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 69, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 494, + "open_issues": 69, + "watchers": 687, + "default_branch": "master" + }, + "network_count": 494, + "subscribers_count": 0 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json new file mode 100644 index 000000000..9caeb7332 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json @@ -0,0 +1,95 @@ +{ + "name": "testBranch1", + "commit": { + "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", + "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOmQxZjE4OGZmMDgwZjA2OTJmNWJiNTUwMTQ0YzZiODU2ZTQyNjFlOWE=", + "commit": { + "author": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:09Z" + }, + "committer": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:09Z" + }, + "message": "testBranch1", + "tree": { + "sha": "f5b8617e3918f8d719b6394bdfcff1bbe3a681df", + "url": "https://api.github.com/repos/JKalash/github-api/git/trees/f5b8617e3918f8d719b6394bdfcff1bbe3a681df" + }, + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", + "comment_count": 0, + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + }, + "url": "https://api.github.com/repos/JKalash/github-api/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", + "html_url": "https://github.com/JKalash/github-api/commit/d1f188ff080f0692f5bb550144c6b856e4261e9a", + "comments_url": "https://api.github.com/repos/JKalash/github-api/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a/comments", + "author": { + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "url": "https://api.github.com/repos/JKalash/github-api/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + ] + }, + "_links": { + "self": "https://api.github.com/repos/JKalash/github-api/branches/testBranch1", + "html": "https://github.com/JKalash/github-api/tree/testBranch1" + }, + "protected": false, + "protection": { + "enabled": false, + "required_status_checks": { + "enforcement_level": "off", + "contexts": [] + } + }, + "protection_url": "https://api.github.com/repos/JKalash/github-api/branches/testBranch1/protection" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json new file mode 100644 index 000000000..b91118fb4 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json @@ -0,0 +1,95 @@ +{ + "name": "testBranch2", + "commit": { + "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", + "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOjI4N2JkOTE5ZjkxZjg0OWU2ZDZhNTE3ZDRmMjgzMGQ1NTUzM2I5ZTk=", + "commit": { + "author": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:12Z" + }, + "committer": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:12Z" + }, + "message": "testBranch2", + "tree": { + "sha": "d689732ab2c6da335c8f3365a5a213f96d18e082", + "url": "https://api.github.com/repos/JKalash/github-api/git/trees/d689732ab2c6da335c8f3365a5a213f96d18e082" + }, + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", + "comment_count": 0, + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + }, + "url": "https://api.github.com/repos/JKalash/github-api/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", + "html_url": "https://github.com/JKalash/github-api/commit/287bd919f91f849e6d6a517d4f2830d55533b9e9", + "comments_url": "https://api.github.com/repos/JKalash/github-api/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9/comments", + "author": { + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "url": "https://api.github.com/repos/JKalash/github-api/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + ] + }, + "_links": { + "self": "https://api.github.com/repos/JKalash/github-api/branches/testBranch2", + "html": "https://github.com/JKalash/github-api/tree/testBranch2" + }, + "protected": false, + "protection": { + "enabled": false, + "required_status_checks": { + "enforcement_level": "off", + "contexts": [] + } + }, + "protection_url": "https://api.github.com/repos/JKalash/github-api/branches/testBranch2/protection" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json new file mode 100644 index 000000000..f1bcdccc5 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json @@ -0,0 +1,52 @@ +{ + "content": { + "name": "testBranch1", + "path": "testBranch1", + "sha": "2207929ecd1b9edb692e9538707dda960e1b0c8c", + "size": 11, + "url": "https://api.github.com/repos/JKalash/github-api/contents/testBranch1?ref=testBranch1", + "html_url": "https://github.com/JKalash/github-api/blob/testBranch1/testBranch1", + "git_url": "https://api.github.com/repos/JKalash/github-api/git/blobs/2207929ecd1b9edb692e9538707dda960e1b0c8c", + "download_url": "https://raw.githubusercontent.com/JKalash/github-api/testBranch1/testBranch1", + "type": "file", + "_links": { + "self": "https://api.github.com/repos/JKalash/github-api/contents/testBranch1?ref=testBranch1", + "git": "https://api.github.com/repos/JKalash/github-api/git/blobs/2207929ecd1b9edb692e9538707dda960e1b0c8c", + "html": "https://github.com/JKalash/github-api/blob/testBranch1/testBranch1" + } + }, + "commit": { + "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", + "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOmQxZjE4OGZmMDgwZjA2OTJmNWJiNTUwMTQ0YzZiODU2ZTQyNjFlOWE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", + "html_url": "https://github.com/JKalash/github-api/commit/d1f188ff080f0692f5bb550144c6b856e4261e9a", + "author": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:09Z" + }, + "committer": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:09Z" + }, + "tree": { + "sha": "f5b8617e3918f8d719b6394bdfcff1bbe3a681df", + "url": "https://api.github.com/repos/JKalash/github-api/git/trees/f5b8617e3918f8d719b6394bdfcff1bbe3a681df" + }, + "message": "testBranch1", + "parents": [ + { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + ], + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json new file mode 100644 index 000000000..6c648e78e --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json @@ -0,0 +1,52 @@ +{ + "content": { + "name": "testBranch2", + "path": "testBranch2", + "sha": "2a521d98876f51a95f38aaba58c9e81672f7dd4d", + "size": 11, + "url": "https://api.github.com/repos/JKalash/github-api/contents/testBranch2?ref=testBranch2", + "html_url": "https://github.com/JKalash/github-api/blob/testBranch2/testBranch2", + "git_url": "https://api.github.com/repos/JKalash/github-api/git/blobs/2a521d98876f51a95f38aaba58c9e81672f7dd4d", + "download_url": "https://raw.githubusercontent.com/JKalash/github-api/testBranch2/testBranch2", + "type": "file", + "_links": { + "self": "https://api.github.com/repos/JKalash/github-api/contents/testBranch2?ref=testBranch2", + "git": "https://api.github.com/repos/JKalash/github-api/git/blobs/2a521d98876f51a95f38aaba58c9e81672f7dd4d", + "html": "https://github.com/JKalash/github-api/blob/testBranch2/testBranch2" + } + }, + "commit": { + "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", + "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOjI4N2JkOTE5ZjkxZjg0OWU2ZDZhNTE3ZDRmMjgzMGQ1NTUzM2I5ZTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", + "html_url": "https://github.com/JKalash/github-api/commit/287bd919f91f849e6d6a517d4f2830d55533b9e9", + "author": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:12Z" + }, + "committer": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:12Z" + }, + "tree": { + "sha": "d689732ab2c6da335c8f3365a5a213f96d18e082", + "url": "https://api.github.com/repos/JKalash/github-api/git/trees/d689732ab2c6da335c8f3365a5a213f96d18e082" + }, + "message": "testBranch2", + "parents": [ + { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + ], + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json new file mode 100644 index 000000000..db109834c --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/testBranch1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json new file mode 100644 index 000000000..c6d930a74 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/heads/bitwiseman-patch-1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", + "object": { + "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" + } + }, + { + "ref": "refs/heads/gh-pages", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", + "object": { + "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" + } + }, + { + "ref": "refs/heads/jkalash/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", + "object": { + "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" + } + }, + { + "ref": "refs/heads/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + }, + { + "ref": "refs/heads/testBranch1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", + "object": { + "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a" + } + }, + { + "ref": "refs/tags/github-api-1.0", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", + "object": { + "sha": "ac77a05981f57c79e422c8fe98d522119338d650", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" + } + }, + { + "ref": "refs/tags/github-api-1.1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", + "object": { + "sha": "f58213cfb7137d41f54542f83fbd551a06717494", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" + } + }, + { + "ref": "refs/tags/github-api-1.2", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", + "object": { + "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" + } + }, + { + "ref": "refs/tags/github-api-1.3", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", + "object": { + "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" + } + }, + { + "ref": "refs/tags/github-api-1.4", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", + "object": { + "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" + } + }, + { + "ref": "refs/tags/github-api-1.5", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", + "object": { + "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" + } + }, + { + "ref": "refs/tags/github-api-1.6", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", + "object": { + "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" + } + }, + { + "ref": "refs/tags/github-api-1.7", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", + "object": { + "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" + } + }, + { + "ref": "refs/tags/github-api-1.8", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", + "object": { + "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" + } + }, + { + "ref": "refs/tags/github-api-1.9", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", + "object": { + "sha": "f01ff95029cb422607a944ecee48842a8e97e259", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" + } + }, + { + "ref": "refs/tags/github-api-1.10", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", + "object": { + "sha": "69533371e248f18e16bf621f07dc09774ecf766a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" + } + }, + { + "ref": "refs/tags/github-api-1.11", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", + "object": { + "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" + } + }, + { + "ref": "refs/tags/github-api-1.12", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", + "object": { + "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" + } + }, + { + "ref": "refs/tags/github-api-1.13", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", + "object": { + "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" + } + }, + { + "ref": "refs/tags/github-api-1.14", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", + "object": { + "sha": "09373ff6191ee3f5c7814ae748963529167de96d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" + } + }, + { + "ref": "refs/tags/github-api-1.15", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", + "object": { + "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" + } + }, + { + "ref": "refs/tags/github-api-1.16", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", + "object": { + "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" + } + }, + { + "ref": "refs/tags/github-api-1.17", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", + "object": { + "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" + } + }, + { + "ref": "refs/tags/github-api-1.18", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", + "object": { + "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" + } + }, + { + "ref": "refs/tags/github-api-1.19", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", + "object": { + "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" + } + }, + { + "ref": "refs/tags/github-api-1.20", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", + "object": { + "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" + } + }, + { + "ref": "refs/tags/github-api-1.21", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", + "object": { + "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" + } + }, + { + "ref": "refs/tags/github-api-1.22", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", + "object": { + "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" + } + }, + { + "ref": "refs/tags/github-api-1.23", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", + "object": { + "sha": "274e47e111de9286954088e2db613f9d665b66d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" + } + }, + { + "ref": "refs/tags/github-api-1.24", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", + "object": { + "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json new file mode 100644 index 000000000..b13041415 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/testBranch2", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch2", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json new file mode 100644 index 000000000..03d4ccd24 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/heads/bitwiseman-patch-1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", + "object": { + "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" + } + }, + { + "ref": "refs/heads/gh-pages", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", + "object": { + "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" + } + }, + { + "ref": "refs/heads/jkalash/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", + "object": { + "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" + } + }, + { + "ref": "refs/heads/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + }, + { + "ref": "refs/heads/testBranch1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", + "object": { + "sha": "069f4fc82ffc4f068e64e9339c87315de696bd8d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d" + } + }, + { + "ref": "refs/heads/testBranch2", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch2", + "object": { + "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9" + } + }, + { + "ref": "refs/tags/github-api-1.0", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", + "object": { + "sha": "ac77a05981f57c79e422c8fe98d522119338d650", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" + } + }, + { + "ref": "refs/tags/github-api-1.1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", + "object": { + "sha": "f58213cfb7137d41f54542f83fbd551a06717494", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" + } + }, + { + "ref": "refs/tags/github-api-1.2", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", + "object": { + "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" + } + }, + { + "ref": "refs/tags/github-api-1.3", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", + "object": { + "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" + } + }, + { + "ref": "refs/tags/github-api-1.4", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", + "object": { + "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" + } + }, + { + "ref": "refs/tags/github-api-1.5", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", + "object": { + "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" + } + }, + { + "ref": "refs/tags/github-api-1.6", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", + "object": { + "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" + } + }, + { + "ref": "refs/tags/github-api-1.7", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", + "object": { + "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" + } + }, + { + "ref": "refs/tags/github-api-1.8", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", + "object": { + "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" + } + }, + { + "ref": "refs/tags/github-api-1.9", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", + "object": { + "sha": "f01ff95029cb422607a944ecee48842a8e97e259", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" + } + }, + { + "ref": "refs/tags/github-api-1.10", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", + "object": { + "sha": "69533371e248f18e16bf621f07dc09774ecf766a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" + } + }, + { + "ref": "refs/tags/github-api-1.11", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", + "object": { + "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" + } + }, + { + "ref": "refs/tags/github-api-1.12", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", + "object": { + "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" + } + }, + { + "ref": "refs/tags/github-api-1.13", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", + "object": { + "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" + } + }, + { + "ref": "refs/tags/github-api-1.14", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", + "object": { + "sha": "09373ff6191ee3f5c7814ae748963529167de96d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" + } + }, + { + "ref": "refs/tags/github-api-1.15", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", + "object": { + "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" + } + }, + { + "ref": "refs/tags/github-api-1.16", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", + "object": { + "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" + } + }, + { + "ref": "refs/tags/github-api-1.17", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", + "object": { + "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" + } + }, + { + "ref": "refs/tags/github-api-1.18", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", + "object": { + "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" + } + }, + { + "ref": "refs/tags/github-api-1.19", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", + "object": { + "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" + } + }, + { + "ref": "refs/tags/github-api-1.20", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", + "object": { + "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" + } + }, + { + "ref": "refs/tags/github-api-1.21", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", + "object": { + "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" + } + }, + { + "ref": "refs/tags/github-api-1.22", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", + "object": { + "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" + } + }, + { + "ref": "refs/tags/github-api-1.23", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", + "object": { + "sha": "274e47e111de9286954088e2db613f9d665b66d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json new file mode 100644 index 000000000..75f07e811 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/heads/bitwiseman-patch-1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", + "object": { + "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" + } + }, + { + "ref": "refs/heads/gh-pages", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", + "object": { + "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" + } + }, + { + "ref": "refs/heads/jkalash/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", + "object": { + "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" + } + }, + { + "ref": "refs/heads/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + }, + { + "ref": "refs/tags/github-api-1.0", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", + "object": { + "sha": "ac77a05981f57c79e422c8fe98d522119338d650", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" + } + }, + { + "ref": "refs/tags/github-api-1.1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", + "object": { + "sha": "f58213cfb7137d41f54542f83fbd551a06717494", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" + } + }, + { + "ref": "refs/tags/github-api-1.2", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", + "object": { + "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" + } + }, + { + "ref": "refs/tags/github-api-1.3", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", + "object": { + "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" + } + }, + { + "ref": "refs/tags/github-api-1.4", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", + "object": { + "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" + } + }, + { + "ref": "refs/tags/github-api-1.5", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", + "object": { + "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" + } + }, + { + "ref": "refs/tags/github-api-1.6", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", + "object": { + "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" + } + }, + { + "ref": "refs/tags/github-api-1.7", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", + "object": { + "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" + } + }, + { + "ref": "refs/tags/github-api-1.8", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", + "object": { + "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" + } + }, + { + "ref": "refs/tags/github-api-1.9", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", + "object": { + "sha": "f01ff95029cb422607a944ecee48842a8e97e259", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" + } + }, + { + "ref": "refs/tags/github-api-1.10", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", + "object": { + "sha": "69533371e248f18e16bf621f07dc09774ecf766a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" + } + }, + { + "ref": "refs/tags/github-api-1.11", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", + "object": { + "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" + } + }, + { + "ref": "refs/tags/github-api-1.12", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", + "object": { + "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" + } + }, + { + "ref": "refs/tags/github-api-1.13", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", + "object": { + "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" + } + }, + { + "ref": "refs/tags/github-api-1.14", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", + "object": { + "sha": "09373ff6191ee3f5c7814ae748963529167de96d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" + } + }, + { + "ref": "refs/tags/github-api-1.15", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", + "object": { + "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" + } + }, + { + "ref": "refs/tags/github-api-1.16", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", + "object": { + "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" + } + }, + { + "ref": "refs/tags/github-api-1.17", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", + "object": { + "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" + } + }, + { + "ref": "refs/tags/github-api-1.18", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", + "object": { + "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" + } + }, + { + "ref": "refs/tags/github-api-1.19", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", + "object": { + "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" + } + }, + { + "ref": "refs/tags/github-api-1.20", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", + "object": { + "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" + } + }, + { + "ref": "refs/tags/github-api-1.21", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", + "object": { + "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" + } + }, + { + "ref": "refs/tags/github-api-1.22", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", + "object": { + "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" + } + }, + { + "ref": "refs/tags/github-api-1.23", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", + "object": { + "sha": "274e47e111de9286954088e2db613f9d665b66d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" + } + }, + { + "ref": "refs/tags/github-api-1.24", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", + "object": { + "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" + } + }, + { + "ref": "refs/tags/github-api-1.25", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", + "object": { + "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json new file mode 100644 index 000000000..75f07e811 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/heads/bitwiseman-patch-1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", + "object": { + "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" + } + }, + { + "ref": "refs/heads/gh-pages", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", + "object": { + "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" + } + }, + { + "ref": "refs/heads/jkalash/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", + "object": { + "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" + } + }, + { + "ref": "refs/heads/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } + }, + { + "ref": "refs/tags/github-api-1.0", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", + "object": { + "sha": "ac77a05981f57c79e422c8fe98d522119338d650", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" + } + }, + { + "ref": "refs/tags/github-api-1.1", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", + "object": { + "sha": "f58213cfb7137d41f54542f83fbd551a06717494", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" + } + }, + { + "ref": "refs/tags/github-api-1.2", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", + "object": { + "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" + } + }, + { + "ref": "refs/tags/github-api-1.3", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", + "object": { + "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" + } + }, + { + "ref": "refs/tags/github-api-1.4", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", + "object": { + "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" + } + }, + { + "ref": "refs/tags/github-api-1.5", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", + "object": { + "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" + } + }, + { + "ref": "refs/tags/github-api-1.6", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", + "object": { + "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" + } + }, + { + "ref": "refs/tags/github-api-1.7", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", + "object": { + "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" + } + }, + { + "ref": "refs/tags/github-api-1.8", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", + "object": { + "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" + } + }, + { + "ref": "refs/tags/github-api-1.9", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", + "object": { + "sha": "f01ff95029cb422607a944ecee48842a8e97e259", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" + } + }, + { + "ref": "refs/tags/github-api-1.10", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", + "object": { + "sha": "69533371e248f18e16bf621f07dc09774ecf766a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" + } + }, + { + "ref": "refs/tags/github-api-1.11", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", + "object": { + "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" + } + }, + { + "ref": "refs/tags/github-api-1.12", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", + "object": { + "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" + } + }, + { + "ref": "refs/tags/github-api-1.13", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", + "object": { + "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" + } + }, + { + "ref": "refs/tags/github-api-1.14", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", + "object": { + "sha": "09373ff6191ee3f5c7814ae748963529167de96d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" + } + }, + { + "ref": "refs/tags/github-api-1.15", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", + "object": { + "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" + } + }, + { + "ref": "refs/tags/github-api-1.16", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", + "object": { + "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" + } + }, + { + "ref": "refs/tags/github-api-1.17", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", + "object": { + "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" + } + }, + { + "ref": "refs/tags/github-api-1.18", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", + "object": { + "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" + } + }, + { + "ref": "refs/tags/github-api-1.19", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", + "object": { + "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" + } + }, + { + "ref": "refs/tags/github-api-1.20", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", + "object": { + "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" + } + }, + { + "ref": "refs/tags/github-api-1.21", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", + "object": { + "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" + } + }, + { + "ref": "refs/tags/github-api-1.22", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", + "object": { + "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" + } + }, + { + "ref": "refs/tags/github-api-1.23", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", + "object": { + "sha": "274e47e111de9286954088e2db613f9d665b66d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" + } + }, + { + "ref": "refs/tags/github-api-1.24", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", + "object": { + "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" + } + }, + { + "ref": "refs/tags/github-api-1.25", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", + "object": { + "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json new file mode 100644 index 000000000..dd278a01e --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/master", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", + "object": { + "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", + "type": "commit", + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json new file mode 100644 index 000000000..06f7c2483 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json @@ -0,0 +1,84 @@ +{ + "sha": "069f4fc82ffc4f068e64e9339c87315de696bd8d", + "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOjA2OWY0ZmM4MmZmYzRmMDY4ZTY0ZTkzMzljODczMTVkZTY5NmJkOGQ=", + "commit": { + "author": { + "name": "Joe Kalash", + "email": "9067991+JKalash@users.noreply.github.com", + "date": "2020-07-28T13:37:14Z" + }, + "committer": { + "name": "GitHub", + "email": "noreply@github.com", + "date": "2020-07-28T13:37:14Z" + }, + "message": "merging testBranch2", + "tree": { + "sha": "20e4da7646cdea0243fccb5e19512c5f8365db9c", + "url": "https://api.github.com/repos/JKalash/github-api/git/trees/20e4da7646cdea0243fccb5e19512c5f8365db9c" + }, + "url": "https://api.github.com/repos/JKalash/github-api/git/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d", + "comment_count": 0, + "verification": { + "verified": true, + "reason": "valid", + "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfICoKCRBK7hj4Ov3rIwAAdHIIABoyIZFc8DIgf68ESgRo9b3T\nx9gG1mIaWboTXk6vrnaHt1YWKwwIusiynYnKzGUaBkgJ+75hsUPp19YpgAPmql9y\nXZkiGEzwUpmGNstZyoEh+mMUggGIIY22lBJFptkS+mBtPQutKD0iQnsZ4dCcoZkv\nZ0SDUIyQkQkfxdNj7zoEe5BG7Xgkbu1PRTqgHjILRYPCwL+2wDnVNry551/IR8rt\nd/rXuhXDtRJvQhKHYxlKeSIuLCvX0aoJGc7URwV2TCzGMILfnPeuxzXbzbZhDLYl\n/Z5qntj8F/tf7n7uxmbw894Tq/7/m9jGUgTlCQiwhugXOE5k/hF0B3ECs5S2ksQ=\n=lAt3\n-----END PGP SIGNATURE-----\n", + "payload": "tree 20e4da7646cdea0243fccb5e19512c5f8365db9c\nparent d1f188ff080f0692f5bb550144c6b856e4261e9a\nparent 287bd919f91f849e6d6a517d4f2830d55533b9e9\nauthor Joe Kalash <9067991+JKalash@users.noreply.github.com> 1595943434 +0100\ncommitter GitHub 1595943434 +0100\n\nmerging testBranch2\n" + } + }, + "url": "https://api.github.com/repos/JKalash/github-api/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d", + "html_url": "https://github.com/JKalash/github-api/commit/069f4fc82ffc4f068e64e9339c87315de696bd8d", + "comments_url": "https://api.github.com/repos/JKalash/github-api/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d/comments", + "author": { + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "web-flow", + "id": 19864447, + "node_id": "MDQ6VXNlcjE5ODY0NDQ3", + "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/web-flow", + "html_url": "https://github.com/web-flow", + "followers_url": "https://api.github.com/users/web-flow/followers", + "following_url": "https://api.github.com/users/web-flow/following{/other_user}", + "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", + "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", + "organizations_url": "https://api.github.com/users/web-flow/orgs", + "repos_url": "https://api.github.com/users/web-flow/repos", + "events_url": "https://api.github.com/users/web-flow/events{/privacy}", + "received_events_url": "https://api.github.com/users/web-flow/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", + "url": "https://api.github.com/repos/JKalash/github-api/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", + "html_url": "https://github.com/JKalash/github-api/commit/d1f188ff080f0692f5bb550144c6b856e4261e9a" + }, + { + "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", + "url": "https://api.github.com/repos/JKalash/github-api/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", + "html_url": "https://github.com/JKalash/github-api/commit/287bd919f91f849e6d6a517d4f2830d55533b9e9" + } + ] +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json new file mode 100644 index 000000000..7a10f9804 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.26", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", + "object": { + "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" + } + }, + { + "ref": "refs/tags/github-api-1.27", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", + "object": { + "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" + } + }, + { + "ref": "refs/tags/github-api-1.28", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", + "object": { + "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" + } + }, + { + "ref": "refs/tags/github-api-1.29", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", + "object": { + "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" + } + }, + { + "ref": "refs/tags/github-api-1.30", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", + "object": { + "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" + } + }, + { + "ref": "refs/tags/github-api-1.31", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", + "object": { + "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" + } + }, + { + "ref": "refs/tags/github-api-1.32", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", + "object": { + "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" + } + }, + { + "ref": "refs/tags/github-api-1.33", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", + "object": { + "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" + } + }, + { + "ref": "refs/tags/github-api-1.34", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", + "object": { + "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" + } + }, + { + "ref": "refs/tags/github-api-1.35", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", + "object": { + "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" + } + }, + { + "ref": "refs/tags/github-api-1.36", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", + "object": { + "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" + } + }, + { + "ref": "refs/tags/github-api-1.37", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", + "object": { + "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" + } + }, + { + "ref": "refs/tags/github-api-1.38", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", + "object": { + "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" + } + }, + { + "ref": "refs/tags/github-api-1.39", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", + "object": { + "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" + } + }, + { + "ref": "refs/tags/github-api-1.40", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", + "object": { + "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" + } + }, + { + "ref": "refs/tags/github-api-1.41", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", + "object": { + "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" + } + }, + { + "ref": "refs/tags/github-api-1.42", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", + "object": { + "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" + } + }, + { + "ref": "refs/tags/github-api-1.43", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", + "object": { + "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" + } + }, + { + "ref": "refs/tags/github-api-1.44", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", + "object": { + "sha": "ad078dccb3fa360f886df0497fab386529755c28", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" + } + }, + { + "ref": "refs/tags/github-api-1.45", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", + "object": { + "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" + } + }, + { + "ref": "refs/tags/github-api-1.46", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", + "object": { + "sha": "326e30416e7b59dc7da160a1200febcb06028a56", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" + } + }, + { + "ref": "refs/tags/github-api-1.47", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", + "object": { + "sha": "93a0f691d878e28631431ebda37741ec249bd56e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" + } + }, + { + "ref": "refs/tags/github-api-1.48", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", + "object": { + "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" + } + }, + { + "ref": "refs/tags/github-api-1.49", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", + "object": { + "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" + } + }, + { + "ref": "refs/tags/github-api-1.50", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", + "object": { + "sha": "8d68f72be9530037b010e5a134513660b91b934d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" + } + }, + { + "ref": "refs/tags/github-api-1.51", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", + "object": { + "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" + } + }, + { + "ref": "refs/tags/github-api-1.52", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", + "object": { + "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" + } + }, + { + "ref": "refs/tags/github-api-1.53", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", + "object": { + "sha": "5df544a638af2e534db5144edbdcd47e2792c388", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" + } + }, + { + "ref": "refs/tags/github-api-1.54", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", + "object": { + "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" + } + }, + { + "ref": "refs/tags/github-api-1.55", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", + "object": { + "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json new file mode 100644 index 000000000..0c9102268 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.56", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", + "object": { + "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" + } + }, + { + "ref": "refs/tags/github-api-1.57", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", + "object": { + "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" + } + }, + { + "ref": "refs/tags/github-api-1.58", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", + "object": { + "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" + } + }, + { + "ref": "refs/tags/github-api-1.59", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", + "object": { + "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" + } + }, + { + "ref": "refs/tags/github-api-1.60", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", + "object": { + "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" + } + }, + { + "ref": "refs/tags/github-api-1.61", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", + "object": { + "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" + } + }, + { + "ref": "refs/tags/github-api-1.62", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", + "object": { + "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" + } + }, + { + "ref": "refs/tags/github-api-1.63", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", + "object": { + "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" + } + }, + { + "ref": "refs/tags/github-api-1.64", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", + "object": { + "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" + } + }, + { + "ref": "refs/tags/github-api-1.66", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", + "object": { + "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" + } + }, + { + "ref": "refs/tags/github-api-1.67", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", + "object": { + "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" + } + }, + { + "ref": "refs/tags/github-api-1.68", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", + "object": { + "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" + } + }, + { + "ref": "refs/tags/github-api-1.69", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", + "object": { + "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" + } + }, + { + "ref": "refs/tags/github-api-1.70", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", + "object": { + "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" + } + }, + { + "ref": "refs/tags/github-api-1.71", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", + "object": { + "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" + } + }, + { + "ref": "refs/tags/github-api-1.72", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", + "object": { + "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" + } + }, + { + "ref": "refs/tags/github-api-1.73", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", + "object": { + "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" + } + }, + { + "ref": "refs/tags/github-api-1.74", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", + "object": { + "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" + } + }, + { + "ref": "refs/tags/github-api-1.75", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", + "object": { + "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" + } + }, + { + "ref": "refs/tags/github-api-1.76", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", + "object": { + "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" + } + }, + { + "ref": "refs/tags/github-api-1.77", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", + "object": { + "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" + } + }, + { + "ref": "refs/tags/github-api-1.78", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", + "object": { + "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" + } + }, + { + "ref": "refs/tags/github-api-1.79", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", + "object": { + "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" + } + }, + { + "ref": "refs/tags/github-api-1.80", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", + "object": { + "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" + } + }, + { + "ref": "refs/tags/github-api-1.81", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", + "object": { + "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" + } + }, + { + "ref": "refs/tags/github-api-1.82", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", + "object": { + "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" + } + }, + { + "ref": "refs/tags/github-api-1.83", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", + "object": { + "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" + } + }, + { + "ref": "refs/tags/github-api-1.84", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", + "object": { + "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" + } + }, + { + "ref": "refs/tags/github-api-1.85", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", + "object": { + "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" + } + }, + { + "ref": "refs/tags/github-api-1.86", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", + "object": { + "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json new file mode 100644 index 000000000..9642a4ba7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json @@ -0,0 +1,252 @@ +[ + { + "ref": "refs/tags/github-api-1.87", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", + "object": { + "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" + } + }, + { + "ref": "refs/tags/github-api-1.88", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", + "object": { + "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" + } + }, + { + "ref": "refs/tags/github-api-1.89", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", + "object": { + "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" + } + }, + { + "ref": "refs/tags/github-api-1.90", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", + "object": { + "sha": "63678b8f6548553012b44e4f74ab1520918e502a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" + } + }, + { + "ref": "refs/tags/github-api-1.91", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", + "object": { + "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" + } + }, + { + "ref": "refs/tags/github-api-1.92", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", + "object": { + "sha": "1b1e1259738117b76904eac72ee366b987e3153a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" + } + }, + { + "ref": "refs/tags/github-api-1.93", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", + "object": { + "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" + } + }, + { + "ref": "refs/tags/github-api-1.94", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", + "object": { + "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" + } + }, + { + "ref": "refs/tags/github-api-1.95", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", + "object": { + "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" + } + }, + { + "ref": "refs/tags/github-api-1.99", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", + "object": { + "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" + } + }, + { + "ref": "refs/tags/github-api-1.100", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", + "object": { + "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" + } + }, + { + "ref": "refs/tags/github-api-1.101", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", + "object": { + "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" + } + }, + { + "ref": "refs/tags/github-api-1.102", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", + "object": { + "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" + } + }, + { + "ref": "refs/tags/github-api-1.103", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", + "object": { + "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" + } + }, + { + "ref": "refs/tags/github-api-1.105", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", + "object": { + "sha": "14cd5255819306a1fb45735eb7d14d7739573944", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" + } + }, + { + "ref": "refs/tags/github-api-1.106", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", + "object": { + "sha": "52602056ac604678c26fedc81187afd1710e58c4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" + } + }, + { + "ref": "refs/tags/github-api-1.107", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", + "object": { + "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" + } + }, + { + "ref": "refs/tags/github-api-1.108", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", + "object": { + "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" + } + }, + { + "ref": "refs/tags/github-api-1.109", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", + "object": { + "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" + } + }, + { + "ref": "refs/tags/github-api-1.110", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", + "object": { + "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" + } + }, + { + "ref": "refs/tags/github-api-1.111", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", + "object": { + "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" + } + }, + { + "ref": "refs/tags/github-api-1.112", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", + "object": { + "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" + } + }, + { + "ref": "refs/tags/github-api-1.113", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", + "object": { + "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" + } + }, + { + "ref": "refs/tags/github-api-1.114", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", + "object": { + "sha": "09152a185182043ecdd869bf3d358507c68dc74f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" + } + }, + { + "ref": "refs/tags/github-api-1.115", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", + "object": { + "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json new file mode 100644 index 000000000..6401c569f --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.25", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", + "object": { + "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" + } + }, + { + "ref": "refs/tags/github-api-1.26", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", + "object": { + "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" + } + }, + { + "ref": "refs/tags/github-api-1.27", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", + "object": { + "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" + } + }, + { + "ref": "refs/tags/github-api-1.28", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", + "object": { + "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" + } + }, + { + "ref": "refs/tags/github-api-1.29", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", + "object": { + "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" + } + }, + { + "ref": "refs/tags/github-api-1.30", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", + "object": { + "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" + } + }, + { + "ref": "refs/tags/github-api-1.31", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", + "object": { + "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" + } + }, + { + "ref": "refs/tags/github-api-1.32", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", + "object": { + "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" + } + }, + { + "ref": "refs/tags/github-api-1.33", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", + "object": { + "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" + } + }, + { + "ref": "refs/tags/github-api-1.34", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", + "object": { + "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" + } + }, + { + "ref": "refs/tags/github-api-1.35", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", + "object": { + "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" + } + }, + { + "ref": "refs/tags/github-api-1.36", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", + "object": { + "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" + } + }, + { + "ref": "refs/tags/github-api-1.37", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", + "object": { + "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" + } + }, + { + "ref": "refs/tags/github-api-1.38", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", + "object": { + "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" + } + }, + { + "ref": "refs/tags/github-api-1.39", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", + "object": { + "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" + } + }, + { + "ref": "refs/tags/github-api-1.40", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", + "object": { + "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" + } + }, + { + "ref": "refs/tags/github-api-1.41", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", + "object": { + "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" + } + }, + { + "ref": "refs/tags/github-api-1.42", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", + "object": { + "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" + } + }, + { + "ref": "refs/tags/github-api-1.43", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", + "object": { + "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" + } + }, + { + "ref": "refs/tags/github-api-1.44", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", + "object": { + "sha": "ad078dccb3fa360f886df0497fab386529755c28", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" + } + }, + { + "ref": "refs/tags/github-api-1.45", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", + "object": { + "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" + } + }, + { + "ref": "refs/tags/github-api-1.46", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", + "object": { + "sha": "326e30416e7b59dc7da160a1200febcb06028a56", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" + } + }, + { + "ref": "refs/tags/github-api-1.47", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", + "object": { + "sha": "93a0f691d878e28631431ebda37741ec249bd56e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" + } + }, + { + "ref": "refs/tags/github-api-1.48", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", + "object": { + "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" + } + }, + { + "ref": "refs/tags/github-api-1.49", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", + "object": { + "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" + } + }, + { + "ref": "refs/tags/github-api-1.50", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", + "object": { + "sha": "8d68f72be9530037b010e5a134513660b91b934d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" + } + }, + { + "ref": "refs/tags/github-api-1.51", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", + "object": { + "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" + } + }, + { + "ref": "refs/tags/github-api-1.52", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", + "object": { + "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" + } + }, + { + "ref": "refs/tags/github-api-1.53", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", + "object": { + "sha": "5df544a638af2e534db5144edbdcd47e2792c388", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" + } + }, + { + "ref": "refs/tags/github-api-1.54", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", + "object": { + "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json new file mode 100644 index 000000000..cb8e72584 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.55", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", + "object": { + "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" + } + }, + { + "ref": "refs/tags/github-api-1.56", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", + "object": { + "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" + } + }, + { + "ref": "refs/tags/github-api-1.57", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", + "object": { + "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" + } + }, + { + "ref": "refs/tags/github-api-1.58", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", + "object": { + "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" + } + }, + { + "ref": "refs/tags/github-api-1.59", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", + "object": { + "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" + } + }, + { + "ref": "refs/tags/github-api-1.60", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", + "object": { + "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" + } + }, + { + "ref": "refs/tags/github-api-1.61", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", + "object": { + "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" + } + }, + { + "ref": "refs/tags/github-api-1.62", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", + "object": { + "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" + } + }, + { + "ref": "refs/tags/github-api-1.63", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", + "object": { + "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" + } + }, + { + "ref": "refs/tags/github-api-1.64", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", + "object": { + "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" + } + }, + { + "ref": "refs/tags/github-api-1.66", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", + "object": { + "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" + } + }, + { + "ref": "refs/tags/github-api-1.67", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", + "object": { + "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" + } + }, + { + "ref": "refs/tags/github-api-1.68", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", + "object": { + "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" + } + }, + { + "ref": "refs/tags/github-api-1.69", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", + "object": { + "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" + } + }, + { + "ref": "refs/tags/github-api-1.70", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", + "object": { + "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" + } + }, + { + "ref": "refs/tags/github-api-1.71", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", + "object": { + "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" + } + }, + { + "ref": "refs/tags/github-api-1.72", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", + "object": { + "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" + } + }, + { + "ref": "refs/tags/github-api-1.73", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", + "object": { + "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" + } + }, + { + "ref": "refs/tags/github-api-1.74", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", + "object": { + "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" + } + }, + { + "ref": "refs/tags/github-api-1.75", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", + "object": { + "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" + } + }, + { + "ref": "refs/tags/github-api-1.76", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", + "object": { + "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" + } + }, + { + "ref": "refs/tags/github-api-1.77", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", + "object": { + "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" + } + }, + { + "ref": "refs/tags/github-api-1.78", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", + "object": { + "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" + } + }, + { + "ref": "refs/tags/github-api-1.79", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", + "object": { + "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" + } + }, + { + "ref": "refs/tags/github-api-1.80", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", + "object": { + "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" + } + }, + { + "ref": "refs/tags/github-api-1.81", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", + "object": { + "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" + } + }, + { + "ref": "refs/tags/github-api-1.82", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", + "object": { + "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" + } + }, + { + "ref": "refs/tags/github-api-1.83", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", + "object": { + "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" + } + }, + { + "ref": "refs/tags/github-api-1.84", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", + "object": { + "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" + } + }, + { + "ref": "refs/tags/github-api-1.85", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", + "object": { + "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json new file mode 100644 index 000000000..edc2a96d8 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json @@ -0,0 +1,262 @@ +[ + { + "ref": "refs/tags/github-api-1.86", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", + "object": { + "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" + } + }, + { + "ref": "refs/tags/github-api-1.87", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", + "object": { + "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" + } + }, + { + "ref": "refs/tags/github-api-1.88", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", + "object": { + "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" + } + }, + { + "ref": "refs/tags/github-api-1.89", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", + "object": { + "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" + } + }, + { + "ref": "refs/tags/github-api-1.90", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", + "object": { + "sha": "63678b8f6548553012b44e4f74ab1520918e502a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" + } + }, + { + "ref": "refs/tags/github-api-1.91", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", + "object": { + "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" + } + }, + { + "ref": "refs/tags/github-api-1.92", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", + "object": { + "sha": "1b1e1259738117b76904eac72ee366b987e3153a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" + } + }, + { + "ref": "refs/tags/github-api-1.93", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", + "object": { + "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" + } + }, + { + "ref": "refs/tags/github-api-1.94", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", + "object": { + "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" + } + }, + { + "ref": "refs/tags/github-api-1.95", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", + "object": { + "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" + } + }, + { + "ref": "refs/tags/github-api-1.99", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", + "object": { + "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" + } + }, + { + "ref": "refs/tags/github-api-1.100", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", + "object": { + "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" + } + }, + { + "ref": "refs/tags/github-api-1.101", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", + "object": { + "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" + } + }, + { + "ref": "refs/tags/github-api-1.102", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", + "object": { + "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" + } + }, + { + "ref": "refs/tags/github-api-1.103", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", + "object": { + "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" + } + }, + { + "ref": "refs/tags/github-api-1.105", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", + "object": { + "sha": "14cd5255819306a1fb45735eb7d14d7739573944", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" + } + }, + { + "ref": "refs/tags/github-api-1.106", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", + "object": { + "sha": "52602056ac604678c26fedc81187afd1710e58c4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" + } + }, + { + "ref": "refs/tags/github-api-1.107", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", + "object": { + "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" + } + }, + { + "ref": "refs/tags/github-api-1.108", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", + "object": { + "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" + } + }, + { + "ref": "refs/tags/github-api-1.109", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", + "object": { + "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" + } + }, + { + "ref": "refs/tags/github-api-1.110", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", + "object": { + "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" + } + }, + { + "ref": "refs/tags/github-api-1.111", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", + "object": { + "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" + } + }, + { + "ref": "refs/tags/github-api-1.112", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", + "object": { + "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" + } + }, + { + "ref": "refs/tags/github-api-1.113", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", + "object": { + "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" + } + }, + { + "ref": "refs/tags/github-api-1.114", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", + "object": { + "sha": "09152a185182043ecdd869bf3d358507c68dc74f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" + } + }, + { + "ref": "refs/tags/github-api-1.115", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", + "object": { + "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json new file mode 100644 index 000000000..b02aa5ae1 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.24", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", + "object": { + "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" + } + }, + { + "ref": "refs/tags/github-api-1.25", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", + "object": { + "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" + } + }, + { + "ref": "refs/tags/github-api-1.26", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", + "object": { + "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" + } + }, + { + "ref": "refs/tags/github-api-1.27", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", + "object": { + "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" + } + }, + { + "ref": "refs/tags/github-api-1.28", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", + "object": { + "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" + } + }, + { + "ref": "refs/tags/github-api-1.29", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", + "object": { + "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" + } + }, + { + "ref": "refs/tags/github-api-1.30", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", + "object": { + "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" + } + }, + { + "ref": "refs/tags/github-api-1.31", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", + "object": { + "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" + } + }, + { + "ref": "refs/tags/github-api-1.32", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", + "object": { + "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" + } + }, + { + "ref": "refs/tags/github-api-1.33", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", + "object": { + "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" + } + }, + { + "ref": "refs/tags/github-api-1.34", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", + "object": { + "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" + } + }, + { + "ref": "refs/tags/github-api-1.35", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", + "object": { + "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" + } + }, + { + "ref": "refs/tags/github-api-1.36", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", + "object": { + "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" + } + }, + { + "ref": "refs/tags/github-api-1.37", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", + "object": { + "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" + } + }, + { + "ref": "refs/tags/github-api-1.38", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", + "object": { + "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" + } + }, + { + "ref": "refs/tags/github-api-1.39", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", + "object": { + "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" + } + }, + { + "ref": "refs/tags/github-api-1.40", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", + "object": { + "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" + } + }, + { + "ref": "refs/tags/github-api-1.41", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", + "object": { + "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" + } + }, + { + "ref": "refs/tags/github-api-1.42", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", + "object": { + "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" + } + }, + { + "ref": "refs/tags/github-api-1.43", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", + "object": { + "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" + } + }, + { + "ref": "refs/tags/github-api-1.44", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", + "object": { + "sha": "ad078dccb3fa360f886df0497fab386529755c28", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" + } + }, + { + "ref": "refs/tags/github-api-1.45", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", + "object": { + "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" + } + }, + { + "ref": "refs/tags/github-api-1.46", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", + "object": { + "sha": "326e30416e7b59dc7da160a1200febcb06028a56", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" + } + }, + { + "ref": "refs/tags/github-api-1.47", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", + "object": { + "sha": "93a0f691d878e28631431ebda37741ec249bd56e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" + } + }, + { + "ref": "refs/tags/github-api-1.48", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", + "object": { + "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" + } + }, + { + "ref": "refs/tags/github-api-1.49", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", + "object": { + "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" + } + }, + { + "ref": "refs/tags/github-api-1.50", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", + "object": { + "sha": "8d68f72be9530037b010e5a134513660b91b934d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" + } + }, + { + "ref": "refs/tags/github-api-1.51", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", + "object": { + "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" + } + }, + { + "ref": "refs/tags/github-api-1.52", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", + "object": { + "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" + } + }, + { + "ref": "refs/tags/github-api-1.53", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", + "object": { + "sha": "5df544a638af2e534db5144edbdcd47e2792c388", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json new file mode 100644 index 000000000..66d59662d --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.54", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", + "object": { + "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" + } + }, + { + "ref": "refs/tags/github-api-1.55", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", + "object": { + "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" + } + }, + { + "ref": "refs/tags/github-api-1.56", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", + "object": { + "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" + } + }, + { + "ref": "refs/tags/github-api-1.57", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", + "object": { + "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" + } + }, + { + "ref": "refs/tags/github-api-1.58", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", + "object": { + "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" + } + }, + { + "ref": "refs/tags/github-api-1.59", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", + "object": { + "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" + } + }, + { + "ref": "refs/tags/github-api-1.60", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", + "object": { + "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" + } + }, + { + "ref": "refs/tags/github-api-1.61", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", + "object": { + "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" + } + }, + { + "ref": "refs/tags/github-api-1.62", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", + "object": { + "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" + } + }, + { + "ref": "refs/tags/github-api-1.63", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", + "object": { + "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" + } + }, + { + "ref": "refs/tags/github-api-1.64", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", + "object": { + "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" + } + }, + { + "ref": "refs/tags/github-api-1.66", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", + "object": { + "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" + } + }, + { + "ref": "refs/tags/github-api-1.67", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", + "object": { + "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" + } + }, + { + "ref": "refs/tags/github-api-1.68", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", + "object": { + "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" + } + }, + { + "ref": "refs/tags/github-api-1.69", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", + "object": { + "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" + } + }, + { + "ref": "refs/tags/github-api-1.70", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", + "object": { + "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" + } + }, + { + "ref": "refs/tags/github-api-1.71", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", + "object": { + "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" + } + }, + { + "ref": "refs/tags/github-api-1.72", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", + "object": { + "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" + } + }, + { + "ref": "refs/tags/github-api-1.73", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", + "object": { + "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" + } + }, + { + "ref": "refs/tags/github-api-1.74", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", + "object": { + "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" + } + }, + { + "ref": "refs/tags/github-api-1.75", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", + "object": { + "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" + } + }, + { + "ref": "refs/tags/github-api-1.76", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", + "object": { + "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" + } + }, + { + "ref": "refs/tags/github-api-1.77", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", + "object": { + "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" + } + }, + { + "ref": "refs/tags/github-api-1.78", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", + "object": { + "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" + } + }, + { + "ref": "refs/tags/github-api-1.79", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", + "object": { + "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" + } + }, + { + "ref": "refs/tags/github-api-1.80", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", + "object": { + "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" + } + }, + { + "ref": "refs/tags/github-api-1.81", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", + "object": { + "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" + } + }, + { + "ref": "refs/tags/github-api-1.82", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", + "object": { + "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" + } + }, + { + "ref": "refs/tags/github-api-1.83", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", + "object": { + "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" + } + }, + { + "ref": "refs/tags/github-api-1.84", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", + "object": { + "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json new file mode 100644 index 000000000..6b26d3e8c --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json @@ -0,0 +1,272 @@ +[ + { + "ref": "refs/tags/github-api-1.85", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", + "object": { + "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" + } + }, + { + "ref": "refs/tags/github-api-1.86", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", + "object": { + "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" + } + }, + { + "ref": "refs/tags/github-api-1.87", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", + "object": { + "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" + } + }, + { + "ref": "refs/tags/github-api-1.88", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", + "object": { + "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" + } + }, + { + "ref": "refs/tags/github-api-1.89", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", + "object": { + "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" + } + }, + { + "ref": "refs/tags/github-api-1.90", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", + "object": { + "sha": "63678b8f6548553012b44e4f74ab1520918e502a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" + } + }, + { + "ref": "refs/tags/github-api-1.91", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", + "object": { + "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" + } + }, + { + "ref": "refs/tags/github-api-1.92", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", + "object": { + "sha": "1b1e1259738117b76904eac72ee366b987e3153a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" + } + }, + { + "ref": "refs/tags/github-api-1.93", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", + "object": { + "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" + } + }, + { + "ref": "refs/tags/github-api-1.94", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", + "object": { + "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" + } + }, + { + "ref": "refs/tags/github-api-1.95", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", + "object": { + "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" + } + }, + { + "ref": "refs/tags/github-api-1.99", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", + "object": { + "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" + } + }, + { + "ref": "refs/tags/github-api-1.100", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", + "object": { + "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" + } + }, + { + "ref": "refs/tags/github-api-1.101", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", + "object": { + "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" + } + }, + { + "ref": "refs/tags/github-api-1.102", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", + "object": { + "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" + } + }, + { + "ref": "refs/tags/github-api-1.103", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", + "object": { + "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" + } + }, + { + "ref": "refs/tags/github-api-1.105", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", + "object": { + "sha": "14cd5255819306a1fb45735eb7d14d7739573944", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" + } + }, + { + "ref": "refs/tags/github-api-1.106", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", + "object": { + "sha": "52602056ac604678c26fedc81187afd1710e58c4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" + } + }, + { + "ref": "refs/tags/github-api-1.107", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", + "object": { + "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" + } + }, + { + "ref": "refs/tags/github-api-1.108", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", + "object": { + "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" + } + }, + { + "ref": "refs/tags/github-api-1.109", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", + "object": { + "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" + } + }, + { + "ref": "refs/tags/github-api-1.110", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", + "object": { + "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" + } + }, + { + "ref": "refs/tags/github-api-1.111", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", + "object": { + "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" + } + }, + { + "ref": "refs/tags/github-api-1.112", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", + "object": { + "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" + } + }, + { + "ref": "refs/tags/github-api-1.113", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", + "object": { + "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" + } + }, + { + "ref": "refs/tags/github-api-1.114", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", + "object": { + "sha": "09152a185182043ecdd869bf3d358507c68dc74f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" + } + }, + { + "ref": "refs/tags/github-api-1.115", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", + "object": { + "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json new file mode 100644 index 000000000..7a10f9804 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.26", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", + "object": { + "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" + } + }, + { + "ref": "refs/tags/github-api-1.27", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", + "object": { + "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" + } + }, + { + "ref": "refs/tags/github-api-1.28", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", + "object": { + "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" + } + }, + { + "ref": "refs/tags/github-api-1.29", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", + "object": { + "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" + } + }, + { + "ref": "refs/tags/github-api-1.30", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", + "object": { + "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" + } + }, + { + "ref": "refs/tags/github-api-1.31", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", + "object": { + "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" + } + }, + { + "ref": "refs/tags/github-api-1.32", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", + "object": { + "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" + } + }, + { + "ref": "refs/tags/github-api-1.33", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", + "object": { + "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" + } + }, + { + "ref": "refs/tags/github-api-1.34", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", + "object": { + "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" + } + }, + { + "ref": "refs/tags/github-api-1.35", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", + "object": { + "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" + } + }, + { + "ref": "refs/tags/github-api-1.36", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", + "object": { + "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" + } + }, + { + "ref": "refs/tags/github-api-1.37", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", + "object": { + "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" + } + }, + { + "ref": "refs/tags/github-api-1.38", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", + "object": { + "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" + } + }, + { + "ref": "refs/tags/github-api-1.39", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", + "object": { + "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" + } + }, + { + "ref": "refs/tags/github-api-1.40", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", + "object": { + "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" + } + }, + { + "ref": "refs/tags/github-api-1.41", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", + "object": { + "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" + } + }, + { + "ref": "refs/tags/github-api-1.42", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", + "object": { + "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" + } + }, + { + "ref": "refs/tags/github-api-1.43", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", + "object": { + "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" + } + }, + { + "ref": "refs/tags/github-api-1.44", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", + "object": { + "sha": "ad078dccb3fa360f886df0497fab386529755c28", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" + } + }, + { + "ref": "refs/tags/github-api-1.45", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", + "object": { + "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" + } + }, + { + "ref": "refs/tags/github-api-1.46", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", + "object": { + "sha": "326e30416e7b59dc7da160a1200febcb06028a56", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" + } + }, + { + "ref": "refs/tags/github-api-1.47", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", + "object": { + "sha": "93a0f691d878e28631431ebda37741ec249bd56e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" + } + }, + { + "ref": "refs/tags/github-api-1.48", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", + "object": { + "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" + } + }, + { + "ref": "refs/tags/github-api-1.49", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", + "object": { + "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" + } + }, + { + "ref": "refs/tags/github-api-1.50", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", + "object": { + "sha": "8d68f72be9530037b010e5a134513660b91b934d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" + } + }, + { + "ref": "refs/tags/github-api-1.51", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", + "object": { + "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" + } + }, + { + "ref": "refs/tags/github-api-1.52", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", + "object": { + "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" + } + }, + { + "ref": "refs/tags/github-api-1.53", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", + "object": { + "sha": "5df544a638af2e534db5144edbdcd47e2792c388", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" + } + }, + { + "ref": "refs/tags/github-api-1.54", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", + "object": { + "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" + } + }, + { + "ref": "refs/tags/github-api-1.55", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", + "object": { + "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json new file mode 100644 index 000000000..0c9102268 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json @@ -0,0 +1,302 @@ +[ + { + "ref": "refs/tags/github-api-1.56", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", + "object": { + "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" + } + }, + { + "ref": "refs/tags/github-api-1.57", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", + "object": { + "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" + } + }, + { + "ref": "refs/tags/github-api-1.58", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", + "object": { + "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" + } + }, + { + "ref": "refs/tags/github-api-1.59", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", + "object": { + "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" + } + }, + { + "ref": "refs/tags/github-api-1.60", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", + "object": { + "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" + } + }, + { + "ref": "refs/tags/github-api-1.61", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", + "object": { + "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" + } + }, + { + "ref": "refs/tags/github-api-1.62", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", + "object": { + "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" + } + }, + { + "ref": "refs/tags/github-api-1.63", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", + "object": { + "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" + } + }, + { + "ref": "refs/tags/github-api-1.64", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", + "object": { + "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" + } + }, + { + "ref": "refs/tags/github-api-1.66", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", + "object": { + "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" + } + }, + { + "ref": "refs/tags/github-api-1.67", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", + "object": { + "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" + } + }, + { + "ref": "refs/tags/github-api-1.68", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", + "object": { + "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" + } + }, + { + "ref": "refs/tags/github-api-1.69", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", + "object": { + "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" + } + }, + { + "ref": "refs/tags/github-api-1.70", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", + "object": { + "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" + } + }, + { + "ref": "refs/tags/github-api-1.71", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", + "object": { + "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" + } + }, + { + "ref": "refs/tags/github-api-1.72", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", + "object": { + "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" + } + }, + { + "ref": "refs/tags/github-api-1.73", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", + "object": { + "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" + } + }, + { + "ref": "refs/tags/github-api-1.74", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", + "object": { + "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" + } + }, + { + "ref": "refs/tags/github-api-1.75", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", + "object": { + "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" + } + }, + { + "ref": "refs/tags/github-api-1.76", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", + "object": { + "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" + } + }, + { + "ref": "refs/tags/github-api-1.77", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", + "object": { + "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" + } + }, + { + "ref": "refs/tags/github-api-1.78", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", + "object": { + "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" + } + }, + { + "ref": "refs/tags/github-api-1.79", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", + "object": { + "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" + } + }, + { + "ref": "refs/tags/github-api-1.80", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", + "object": { + "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" + } + }, + { + "ref": "refs/tags/github-api-1.81", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", + "object": { + "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" + } + }, + { + "ref": "refs/tags/github-api-1.82", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", + "object": { + "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" + } + }, + { + "ref": "refs/tags/github-api-1.83", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", + "object": { + "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" + } + }, + { + "ref": "refs/tags/github-api-1.84", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", + "object": { + "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" + } + }, + { + "ref": "refs/tags/github-api-1.85", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", + "object": { + "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" + } + }, + { + "ref": "refs/tags/github-api-1.86", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", + "object": { + "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json new file mode 100644 index 000000000..9642a4ba7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json @@ -0,0 +1,252 @@ +[ + { + "ref": "refs/tags/github-api-1.87", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", + "object": { + "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" + } + }, + { + "ref": "refs/tags/github-api-1.88", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", + "object": { + "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" + } + }, + { + "ref": "refs/tags/github-api-1.89", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", + "object": { + "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" + } + }, + { + "ref": "refs/tags/github-api-1.90", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", + "object": { + "sha": "63678b8f6548553012b44e4f74ab1520918e502a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" + } + }, + { + "ref": "refs/tags/github-api-1.91", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", + "object": { + "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" + } + }, + { + "ref": "refs/tags/github-api-1.92", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", + "object": { + "sha": "1b1e1259738117b76904eac72ee366b987e3153a", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" + } + }, + { + "ref": "refs/tags/github-api-1.93", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", + "object": { + "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" + } + }, + { + "ref": "refs/tags/github-api-1.94", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", + "object": { + "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" + } + }, + { + "ref": "refs/tags/github-api-1.95", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", + "object": { + "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" + } + }, + { + "ref": "refs/tags/github-api-1.99", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", + "object": { + "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" + } + }, + { + "ref": "refs/tags/github-api-1.100", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", + "object": { + "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" + } + }, + { + "ref": "refs/tags/github-api-1.101", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", + "object": { + "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" + } + }, + { + "ref": "refs/tags/github-api-1.102", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", + "object": { + "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" + } + }, + { + "ref": "refs/tags/github-api-1.103", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", + "object": { + "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" + } + }, + { + "ref": "refs/tags/github-api-1.105", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", + "object": { + "sha": "14cd5255819306a1fb45735eb7d14d7739573944", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" + } + }, + { + "ref": "refs/tags/github-api-1.106", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", + "object": { + "sha": "52602056ac604678c26fedc81187afd1710e58c4", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" + } + }, + { + "ref": "refs/tags/github-api-1.107", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", + "object": { + "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" + } + }, + { + "ref": "refs/tags/github-api-1.108", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", + "object": { + "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" + } + }, + { + "ref": "refs/tags/github-api-1.109", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", + "object": { + "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" + } + }, + { + "ref": "refs/tags/github-api-1.110", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", + "object": { + "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" + } + }, + { + "ref": "refs/tags/github-api-1.111", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", + "object": { + "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" + } + }, + { + "ref": "refs/tags/github-api-1.112", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", + "object": { + "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" + } + }, + { + "ref": "refs/tags/github-api-1.113", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", + "object": { + "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" + } + }, + { + "ref": "refs/tags/github-api-1.114", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", + "object": { + "sha": "09152a185182043ecdd869bf3d358507c68dc74f", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" + } + }, + { + "ref": "refs/tags/github-api-1.115", + "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", + "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", + "object": { + "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", + "type": "tag", + "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json new file mode 100644 index 000000000..ac08c7bd8 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json @@ -0,0 +1,46 @@ +{ + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false, + "name": "Joe Kalash", + "company": "@Palantir", + "blog": "https://jkala.sh", + "location": "London, UK", + "email": null, + "hireable": null, + "bio": "Finite State Machine\r\n☕️ ＋ 🖥 → 🎉", + "twitter_username": null, + "public_repos": 33, + "public_gists": 6, + "followers": 14, + "following": 1, + "created_at": "2014-10-08T04:39:42Z", + "updated_at": "2020-07-28T10:50:06Z", + "private_gists": 26, + "total_private_repos": 24, + "owned_private_repos": 23, + "disk_usage": 710959, + "collaborators": 4, + "two_factor_authentication": true, + "plan": { + "name": "pro", + "space": 976562499, + "collaborators": 0, + "private_repos": 9999 + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json new file mode 100644 index 000000000..ac08c7bd8 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json @@ -0,0 +1,46 @@ +{ + "login": "JKalash", + "id": 9067991, + "node_id": "MDQ6VXNlcjkwNjc5OTE=", + "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/JKalash", + "html_url": "https://github.com/JKalash", + "followers_url": "https://api.github.com/users/JKalash/followers", + "following_url": "https://api.github.com/users/JKalash/following{/other_user}", + "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", + "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", + "organizations_url": "https://api.github.com/users/JKalash/orgs", + "repos_url": "https://api.github.com/users/JKalash/repos", + "events_url": "https://api.github.com/users/JKalash/events{/privacy}", + "received_events_url": "https://api.github.com/users/JKalash/received_events", + "type": "User", + "site_admin": false, + "name": "Joe Kalash", + "company": "@Palantir", + "blog": "https://jkala.sh", + "location": "London, UK", + "email": null, + "hireable": null, + "bio": "Finite State Machine\r\n☕️ ＋ 🖥 → 🎉", + "twitter_username": null, + "public_repos": 33, + "public_gists": 6, + "followers": 14, + "following": 1, + "created_at": "2014-10-08T04:39:42Z", + "updated_at": "2020-07-28T10:50:06Z", + "private_gists": 26, + "total_private_repos": 24, + "owned_private_repos": 23, + "disk_usage": 710959, + "collaborators": 4, + "two_factor_authentication": true, + "plan": { + "name": "pro", + "space": 976562499, + "collaborators": 0, + "private_repos": 9999 + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json new file mode 100644 index 000000000..b08b3a0a6 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json @@ -0,0 +1,47 @@ +{ + "id": "bbb0c538-a921-45e0-a827-b06a3e441481", + "name": "repos_jkalash_github-api", + "request": { + "url": "/repos/JKalash/github-api", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api-3.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:04 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4822", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"225d4ef8f9c75faa65ac4d3df7527871\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CE64E:F5BAD09:5F202A00" + } + }, + "uuid": "bbb0c538-a921-45e0-a827-b06a3e441481", + "persistent": true, + "insertionIndex": 3 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json new file mode 100644 index 000000000..cb91d4361 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json @@ -0,0 +1,46 @@ +{ + "id": "ae7ac5f2-9482-4ab6-881e-01e4f16a195b", + "name": "repos_jkalash_github-api_branches_testbranch1", + "request": { + "url": "/repos/JKalash/github-api/branches/testBranch1", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_branches_testbranch1-22.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:14 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4803", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"374c96641d3ab66cbda64097b31dec94\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D02D8:F5BCF8A:5F202A0A" + } + }, + "uuid": "ae7ac5f2-9482-4ab6-881e-01e4f16a195b", + "persistent": true, + "insertionIndex": 22 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json new file mode 100644 index 000000000..39852c288 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json @@ -0,0 +1,46 @@ +{ + "id": "cb050ca6-bf5b-4e86-9853-26ba676a15eb", + "name": "repos_jkalash_github-api_branches_testbranch2", + "request": { + "url": "/repos/JKalash/github-api/branches/testBranch2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_branches_testbranch2-21.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:14 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4804", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"9c5e838f70c973f6493d12e36751ca35\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D0263:F5BCB9E:5F202A09" + } + }, + "uuid": "cb050ca6-bf5b-4e86-9853-26ba676a15eb", + "persistent": true, + "insertionIndex": 21 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json new file mode 100644 index 000000000..0694051ab --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json @@ -0,0 +1,53 @@ +{ + "id": "ee2d1ed0-0a88-4bdc-9986-3ee2ec1ca9ae", + "name": "repos_jkalash_github-api_contents_testbranch1", + "request": { + "url": "/repos/JKalash/github-api/contents/testBranch1", + "method": "PUT", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"path\":\"testBranch1\",\"message\":\"testBranch1\",\"branch\":\"testBranch1\",\"content\":\"dGVzdEJyYW5jaDE=\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_jkalash_github-api_contents_testbranch1-14.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:10 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4811", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"6948edb3e89f8ce4e617ded176d58742\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF4DD:F5BBE69:5F202A05" + } + }, + "uuid": "ee2d1ed0-0a88-4bdc-9986-3ee2ec1ca9ae", + "persistent": true, + "insertionIndex": 14 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json new file mode 100644 index 000000000..f12eba5b8 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json @@ -0,0 +1,53 @@ +{ + "id": "858e4c8f-24b8-4c37-9043-13720a8f491f", + "name": "repos_jkalash_github-api_contents_testbranch2", + "request": { + "url": "/repos/JKalash/github-api/contents/testBranch2", + "method": "PUT", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"path\":\"testBranch2\",\"message\":\"testBranch2\",\"branch\":\"testBranch2\",\"content\":\"dGVzdEJyYW5jaDI=\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_jkalash_github-api_contents_testbranch2-20.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:13 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4805", + "X-RateLimit-Reset": "1595945514", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"08ae7f25fe0a70fd278e8ce093d05254\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CFCFD:F5BC81F:5F202A08" + } + }, + "uuid": "858e4c8f-24b8-4c37-9043-13720a8f491f", + "persistent": true, + "insertionIndex": 20 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json new file mode 100644 index 000000000..3918a94d0 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json @@ -0,0 +1,54 @@ +{ + "id": "aaa8c9d4-ff33-48f9-8a98-5ddcec825d8c", + "name": "repos_jkalash_github-api_git_refs", + "request": { + "url": "/repos/JKalash/github-api/git/refs", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"ref\":\"refs/heads/testBranch1\",\"sha\":\"67dc6d2d23ad42d4d411592d0057905ee084ae4d\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_jkalash_github-api_git_refs-13.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:09 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4812", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"8a06075747ed4af790d8b6ace0fe85a3\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "Location": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF2B7:F5BBBD5:5F202A04" + } + }, + "uuid": "aaa8c9d4-ff33-48f9-8a98-5ddcec825d8c", + "persistent": true, + "insertionIndex": 13 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json new file mode 100644 index 000000000..3ff14b523 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json @@ -0,0 +1,52 @@ +{ + "id": "473fcf8f-4c4b-4d14-b970-2c76e3fe9ec9", + "name": "repos_jkalash_github-api_git_refs", + "request": { + "url": "/repos/JKalash/github-api/git/refs", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_git_refs-15.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:10 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4810", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"24b39fd086ef661b89619b57125ecf4a\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF7D3:F5BC210:5F202A06", + "Link": "; rel=\"next\", ; rel=\"last\"" + } + }, + "uuid": "473fcf8f-4c4b-4d14-b970-2c76e3fe9ec9", + "persistent": true, + "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", + "requiredScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-3", + "newScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-4", + "insertionIndex": 15 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json new file mode 100644 index 000000000..2a379e023 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json @@ -0,0 +1,54 @@ +{ + "id": "d7c399ed-b545-4273-9bd8-f44ff6e60137", + "name": "repos_jkalash_github-api_git_refs", + "request": { + "url": "/repos/JKalash/github-api/git/refs", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"ref\":\"refs/heads/testBranch2\",\"sha\":\"67dc6d2d23ad42d4d411592d0057905ee084ae4d\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_jkalash_github-api_git_refs-19.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:12 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4806", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"6ede647acf123580f6db8f300e8241b5\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "Location": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch2", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CFA94:F5BC56A:5F202A07" + } + }, + "uuid": "d7c399ed-b545-4273-9bd8-f44ff6e60137", + "persistent": true, + "insertionIndex": 19 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json new file mode 100644 index 000000000..f5b2f692d --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json @@ -0,0 +1,51 @@ +{ + "id": "8e0119e1-c25b-406c-a49d-e5916d1ef8a2", + "name": "repos_jkalash_github-api_git_refs", + "request": { + "url": "/repos/JKalash/github-api/git/refs", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_git_refs-24.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:16 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4801", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"8f8bcee2de56b603461b85a24e1dfe1f\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D0741:F5BD4AB:5F202A0B", + "Link": "; rel=\"next\", ; rel=\"last\"" + } + }, + "uuid": "8e0119e1-c25b-406c-a49d-e5916d1ef8a2", + "persistent": true, + "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", + "requiredScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-4", + "insertionIndex": 24 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json new file mode 100644 index 000000000..46722a8f5 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json @@ -0,0 +1,52 @@ +{ + "id": "c98fb637-fa83-4944-b444-0c8fdaf6bb8a", + "name": "repos_jkalash_github-api_git_refs", + "request": { + "url": "/repos/JKalash/github-api/git/refs", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_git_refs-4.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:04 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4821", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"b9642dfc3a8b5a801b41d52ff3770d90\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CE75D:F5BAE05:5F202A00", + "Link": "; rel=\"next\", ; rel=\"last\"" + } + }, + "uuid": "c98fb637-fa83-4944-b444-0c8fdaf6bb8a", + "persistent": true, + "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-2", + "insertionIndex": 4 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json new file mode 100644 index 000000000..9a67233f1 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json @@ -0,0 +1,52 @@ +{ + "id": "c70314ca-c9da-4021-ad37-206659ac37b8", + "name": "repos_jkalash_github-api_git_refs", + "request": { + "url": "/repos/JKalash/github-api/git/refs", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_git_refs-9.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:07 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4816", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"b9642dfc3a8b5a801b41d52ff3770d90\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF030:F5BB8CF:5F202A03", + "Link": "; rel=\"next\", ; rel=\"last\"" + } + }, + "uuid": "c70314ca-c9da-4021-ad37-206659ac37b8", + "persistent": true, + "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", + "requiredScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-2", + "newScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-3", + "insertionIndex": 9 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json new file mode 100644 index 000000000..c2ca923b3 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json @@ -0,0 +1,48 @@ +{ + "id": "35c8ed6c-5da6-40d0-8f2a-df2e448ed661", + "name": "repos_jkalash_github-api_git_refs_heads_master", + "request": { + "url": "/repos/JKalash/github-api/git/refs/heads/master", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_jkalash_github-api_git_refs_heads_master-8.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:07 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4817", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"c8cdf4a2fe7e6f2985815cf4a922c10a\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CEFA1:F5BB4A1:5F202A02" + } + }, + "uuid": "35c8ed6c-5da6-40d0-8f2a-df2e448ed661", + "persistent": true, + "insertionIndex": 8 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json new file mode 100644 index 000000000..b349d4e4b --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json @@ -0,0 +1,41 @@ +{ + "id": "d41ef91f-948f-4680-87df-1838891632d4", + "name": "repos_jkalash_github-api_git_refs_heads_testbranch1", + "request": { + "url": "/repos/JKalash/github-api/git/refs/heads/testBranch1", + "method": "DELETE", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 204, + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:17 GMT", + "Server": "GitHub.com", + "Status": "204 No Content", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4797", + "X-RateLimit-Reset": "1595945515", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "Vary": [ + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "X-GitHub-Request-Id": "C6F8:74C1:C8D0980:F5BD7B5:5F202A0C" + } + }, + "uuid": "d41ef91f-948f-4680-87df-1838891632d4", + "persistent": true, + "insertionIndex": 28 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json new file mode 100644 index 000000000..ea72832ac --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json @@ -0,0 +1,41 @@ +{ + "id": "f57b8401-d6a8-4ddc-809f-bed08a691853", + "name": "repos_jkalash_github-api_git_refs_heads_testbranch2", + "request": { + "url": "/repos/JKalash/github-api/git/refs/heads/testBranch2", + "method": "DELETE", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 204, + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:18 GMT", + "Server": "GitHub.com", + "Status": "204 No Content", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4796", + "X-RateLimit-Reset": "1595945515", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "Vary": [ + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "X-GitHub-Request-Id": "C6F8:74C1:C8D0B71:F5BDA18:5F202A0D" + } + }, + "uuid": "f57b8401-d6a8-4ddc-809f-bed08a691853", + "persistent": true, + "insertionIndex": 29 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json new file mode 100644 index 000000000..5cc5e3ebc --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json @@ -0,0 +1,54 @@ +{ + "id": "f23aca40-3070-4e8c-bee4-236dff451881", + "name": "repos_jkalash_github-api_merges", + "request": { + "url": "/repos/JKalash/github-api/merges", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"head\":\"testBranch2\",\"commit_message\":\"merging testBranch2\",\"base\":\"testBranch1\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_jkalash_github-api_merges-23.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:15 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4802", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"529089f37187d516ea2bf57ac9ed47f1\"", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "Location": "https://api.github.com/repos/JKalash/github-api/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D035F:F5BD02D:5F202A0A" + } + }, + "uuid": "f23aca40-3070-4e8c-bee4-236dff451881", + "persistent": true, + "insertionIndex": 23 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json new file mode 100644 index 000000000..093e983c5 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json @@ -0,0 +1,52 @@ +{ + "id": "d0cac42b-059e-4b37-b088-62717d816105", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-10.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:08 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4815", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"3459f193198715d7ffba6decac0745b0\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF0D6:F5BB996:5F202A03", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "d0cac42b-059e-4b37-b088-62717d816105", + "persistent": true, + "scenarioName": "scenario-2-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-2-repositories-283171990-git-refs-2", + "newScenarioState": "scenario-2-repositories-283171990-git-refs-3", + "insertionIndex": 10 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json new file mode 100644 index 000000000..1902a32aa --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json @@ -0,0 +1,52 @@ +{ + "id": "dbbe4c22-b935-408b-959b-165c05ab88ec", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=3", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-11.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:08 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4814", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"df808d0715cbea37f848aefa8b53fb6c\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF176:F5BBA5F:5F202A04", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "dbbe4c22-b935-408b-959b-165c05ab88ec", + "persistent": true, + "scenarioName": "scenario-3-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-3-repositories-283171990-git-refs-2", + "newScenarioState": "scenario-3-repositories-283171990-git-refs-3", + "insertionIndex": 11 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json new file mode 100644 index 000000000..ff15eadd2 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json @@ -0,0 +1,52 @@ +{ + "id": "195ca12d-f98f-4c16-8899-1d1d0153083f", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=4", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-12.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:08 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4813", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"2709bea0b47a5a2d8984f2b49db3f897\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF202:F5BBB0C:5F202A04", + "Link": "; rel=\"prev\", ; rel=\"first\"" + } + }, + "uuid": "195ca12d-f98f-4c16-8899-1d1d0153083f", + "persistent": true, + "scenarioName": "scenario-4-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-4-repositories-283171990-git-refs-2", + "newScenarioState": "scenario-4-repositories-283171990-git-refs-3", + "insertionIndex": 12 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json new file mode 100644 index 000000000..42e6835d8 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json @@ -0,0 +1,52 @@ +{ + "id": "e2597a11-68b6-47c2-8624-870fa0aba722", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-16.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:10 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4809", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"61900fb45f156e1651fe0424b8842322\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF88C:F5BC2F1:5F202A06", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "e2597a11-68b6-47c2-8624-870fa0aba722", + "persistent": true, + "scenarioName": "scenario-2-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-2-repositories-283171990-git-refs-3", + "newScenarioState": "scenario-2-repositories-283171990-git-refs-4", + "insertionIndex": 16 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json new file mode 100644 index 000000000..1fae0c627 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json @@ -0,0 +1,52 @@ +{ + "id": "86a93423-ea28-4bd0-a51f-a1cc4aac0c73", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=3", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-17.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:10 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4808", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"1d197cdbdc601ac5d75880ab4c1e7409\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF93C:F5BC3C4:5F202A06", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "86a93423-ea28-4bd0-a51f-a1cc4aac0c73", + "persistent": true, + "scenarioName": "scenario-3-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-3-repositories-283171990-git-refs-3", + "newScenarioState": "scenario-3-repositories-283171990-git-refs-4", + "insertionIndex": 17 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json new file mode 100644 index 000000000..c4685e0b4 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json @@ -0,0 +1,52 @@ +{ + "id": "f3a8334a-a973-4e3f-8ca1-f6008e2868b3", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=4", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-18.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:11 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4807", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"572d201614e2d5dbb821854a7263e91d\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CF9EA:F5BC495:5F202A06", + "Link": "; rel=\"prev\", ; rel=\"first\"" + } + }, + "uuid": "f3a8334a-a973-4e3f-8ca1-f6008e2868b3", + "persistent": true, + "scenarioName": "scenario-4-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-4-repositories-283171990-git-refs-3", + "newScenarioState": "scenario-4-repositories-283171990-git-refs-4", + "insertionIndex": 18 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json new file mode 100644 index 000000000..7efee817e --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json @@ -0,0 +1,51 @@ +{ + "id": "7cf55136-fd9c-4cfe-8993-ab3f44aec1cb", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-25.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:16 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4800", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"6672dc848c6d280363d3112ba7a5cd60\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D07D3:F5BD5B2:5F202A0C", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "7cf55136-fd9c-4cfe-8993-ab3f44aec1cb", + "persistent": true, + "scenarioName": "scenario-2-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-2-repositories-283171990-git-refs-4", + "insertionIndex": 25 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json new file mode 100644 index 000000000..7825b04cf --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json @@ -0,0 +1,51 @@ +{ + "id": "b420ae5d-b4f7-4bcc-96bc-fdf37314e975", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=3", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-26.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:16 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4799", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"06a826a717ba9420e9fe2afdfa94e8cf\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D085E:F5BD65A:5F202A0C", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "b420ae5d-b4f7-4bcc-96bc-fdf37314e975", + "persistent": true, + "scenarioName": "scenario-3-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-3-repositories-283171990-git-refs-4", + "insertionIndex": 26 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json new file mode 100644 index 000000000..b0371adcf --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json @@ -0,0 +1,51 @@ +{ + "id": "fc45ae76-d334-40ea-8872-f5e9fd22ace6", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=4", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-27.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:16 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4798", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"6b7fbe0a6e40071b8631a8770ab800fd\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8D08F4:F5BD706:5F202A0C", + "Link": "; rel=\"prev\", ; rel=\"first\"" + } + }, + "uuid": "fc45ae76-d334-40ea-8872-f5e9fd22ace6", + "persistent": true, + "scenarioName": "scenario-4-repositories-283171990-git-refs", + "requiredScenarioState": "scenario-4-repositories-283171990-git-refs-4", + "insertionIndex": 27 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json new file mode 100644 index 000000000..410afb338 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json @@ -0,0 +1,52 @@ +{ + "id": "cffb4acc-aba4-4da5-a0e0-157a8826c3ee", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-5.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:05 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4820", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"3459f193198715d7ffba6decac0745b0\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CE82C:F5BAF2B:5F202A00", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "cffb4acc-aba4-4da5-a0e0-157a8826c3ee", + "persistent": true, + "scenarioName": "scenario-2-repositories-283171990-git-refs", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-2-repositories-283171990-git-refs-2", + "insertionIndex": 5 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json new file mode 100644 index 000000000..517a55919 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json @@ -0,0 +1,52 @@ +{ + "id": "84441cc7-de9a-431a-8e31-bb3c2febb8cb", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=3", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-6.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:06 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4819", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"df808d0715cbea37f848aefa8b53fb6c\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CEB63:F5BB298:5F202A01", + "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" + } + }, + "uuid": "84441cc7-de9a-431a-8e31-bb3c2febb8cb", + "persistent": true, + "scenarioName": "scenario-3-repositories-283171990-git-refs", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-3-repositories-283171990-git-refs-2", + "insertionIndex": 6 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json new file mode 100644 index 000000000..01c6a6194 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json @@ -0,0 +1,52 @@ +{ + "id": "c36d43d7-ab0c-415e-ba55-261d35320088", + "name": "repositories_283171990_git_refs", + "request": { + "url": "/repositories/283171990/git/refs?page=4", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repositories_283171990_git_refs-7.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:06 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4818", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"2709bea0b47a5a2d8984f2b49db3f897\"", + "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "X-Poll-Interval": "300", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "repo", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CEC24:F5BB3BF:5F202A02", + "Link": "; rel=\"prev\", ; rel=\"first\"" + } + }, + "uuid": "c36d43d7-ab0c-415e-ba55-261d35320088", + "persistent": true, + "scenarioName": "scenario-4-repositories-283171990-git-refs", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-4-repositories-283171990-git-refs-2", + "insertionIndex": 7 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json new file mode 100644 index 000000000..9db84fac9 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json @@ -0,0 +1,47 @@ +{ + "id": "a3777b6a-f373-40ec-8f4f-1e9f541810b8", + "name": "user", + "request": { + "url": "/user", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "user-1.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:03 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4825", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"e6155dfc67e897e2293faef7dab8f8a5\"", + "Last-Modified": "Tue, 28 Jul 2020 10:50:06 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CE2F5:F5BA92B:5F2029FF" + } + }, + "uuid": "a3777b6a-f373-40ec-8f4f-1e9f541810b8", + "persistent": true, + "insertionIndex": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json new file mode 100644 index 000000000..7ae7696f7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json @@ -0,0 +1,47 @@ +{ + "id": "a122908a-bcd1-4070-947c-a12b56cc2d8d", + "name": "users_jkalash", + "request": { + "url": "/users/jkalash", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "users_jkalash-2.json", + "headers": { + "Date": "Tue, 28 Jul 2020 13:37:04 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4823", + "X-RateLimit-Reset": "1595945515", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"e6155dfc67e897e2293faef7dab8f8a5\"", + "Last-Modified": "Tue, 28 Jul 2020 10:50:06 GMT", + "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "C6F8:74C1:C8CE5A0:F5BAA19:5F2029FF" + } + }, + "uuid": "a122908a-bcd1-4070-947c-a12b56cc2d8d", + "persistent": true, + "insertionIndex": 2 +} \ No newline at end of file From fd1a1a1c23f20690f53ce1a4018d72eb1bc9c55f Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Tue, 28 Jul 2020 11:22:07 -0700 Subject: [PATCH 08/20] Simplified tests --- .../java/org/kohsuke/github/GHBranch.java | 6 +- .../java/org/kohsuke/github/GHBranchTest.java | 43 +-- ...hub4j-test-org_temp-testmergebranch-2.json | 126 +++++++ ...estmergebranch_branches_testbranch1-9.json | 95 ++++++ ...estmergebranch_branches_testbranch2-8.json | 95 ++++++ ...estmergebranch_contents_testbranch1-5.json | 52 +++ ...estmergebranch_contents_testbranch2-7.json | 52 +++ ...t-org_temp-testmergebranch_git_refs-4.json | 10 + ...t-org_temp-testmergebranch_git_refs-6.json | 10 + ...stmergebranch_git_refs_heads_master-3.json | 10 + ...st-org_temp-testmergebranch_merges-10.json | 84 +++++ .../__files/repos_jkalash_github-api-3.json | 312 ------------------ ...sh_github-api_branches_testbranch1-22.json | 95 ------ ...sh_github-api_branches_testbranch2-21.json | 95 ------ ...sh_github-api_contents_testbranch1-14.json | 52 --- ...sh_github-api_contents_testbranch2-20.json | 52 --- .../repos_jkalash_github-api_git_refs-13.json | 10 - .../repos_jkalash_github-api_git_refs-15.json | 302 ----------------- .../repos_jkalash_github-api_git_refs-19.json | 10 - .../repos_jkalash_github-api_git_refs-24.json | 302 ----------------- .../repos_jkalash_github-api_git_refs-4.json | 302 ----------------- .../repos_jkalash_github-api_git_refs-9.json | 302 ----------------- ...sh_github-api_git_refs_heads_master-8.json | 10 - .../repos_jkalash_github-api_merges-23.json | 84 ----- .../repositories_283171990_git_refs-10.json | 302 ----------------- .../repositories_283171990_git_refs-11.json | 302 ----------------- .../repositories_283171990_git_refs-12.json | 252 -------------- .../repositories_283171990_git_refs-16.json | 302 ----------------- .../repositories_283171990_git_refs-17.json | 302 ----------------- .../repositories_283171990_git_refs-18.json | 262 --------------- .../repositories_283171990_git_refs-25.json | 302 ----------------- .../repositories_283171990_git_refs-26.json | 302 ----------------- .../repositories_283171990_git_refs-27.json | 272 --------------- .../repositories_283171990_git_refs-5.json | 302 ----------------- .../repositories_283171990_git_refs-6.json | 302 ----------------- .../repositories_283171990_git_refs-7.json | 252 -------------- .../testMergeBranch/__files/user-1.json | 70 ++-- .../__files/users_jkalash-2.json | 46 --- ...ub4j-test-org_temp-testmergebranch-2.json} | 26 +- ...stmergebranch_branches_testbranch1-9.json} | 25 +- ...stmergebranch_branches_testbranch2-8.json} | 24 +- ...stmergebranch_contents_testbranch1-5.json} | 24 +- ...stmergebranch_contents_testbranch2-7.json} | 24 +- ...-org_temp-testmergebranch_git_refs-4.json} | 28 +- ...-org_temp-testmergebranch_git_refs-6.json} | 28 +- ...tmergebranch_git_refs_heads_master-3.json} | 26 +- ...t-org_temp-testmergebranch_merges-10.json} | 26 +- ...sh_github-api_branches_testbranch1-22.json | 46 --- .../repos_jkalash_github-api_git_refs-15.json | 52 --- .../repos_jkalash_github-api_git_refs-24.json | 51 --- .../repos_jkalash_github-api_git_refs-4.json | 52 --- .../repos_jkalash_github-api_git_refs-9.json | 52 --- ...hub-api_git_refs_heads_testbranch1-28.json | 41 --- ...hub-api_git_refs_heads_testbranch2-29.json | 41 --- .../repositories_283171990_git_refs-10.json | 52 --- .../repositories_283171990_git_refs-11.json | 52 --- .../repositories_283171990_git_refs-12.json | 52 --- .../repositories_283171990_git_refs-16.json | 52 --- .../repositories_283171990_git_refs-17.json | 52 --- .../repositories_283171990_git_refs-18.json | 52 --- .../repositories_283171990_git_refs-25.json | 51 --- .../repositories_283171990_git_refs-26.json | 51 --- .../repositories_283171990_git_refs-27.json | 51 --- .../repositories_283171990_git_refs-5.json | 52 --- .../repositories_283171990_git_refs-6.json | 52 --- .../repositories_283171990_git_refs-7.json | 52 --- .../testMergeBranch/mappings/user-1.json | 18 +- 67 files changed, 704 insertions(+), 6582 deletions(-) create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api-3.json => repos_hub4j-test-org_temp-testmergebranch-2.json} (56%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{users_jkalash-2.json => repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json} (57%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_branches_testbranch2-21.json => repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json} (56%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_contents_testbranch1-14.json => repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json} (61%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_contents_testbranch2-20.json => repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json} (61%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_git_refs-13.json => repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json} (57%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_git_refs-19.json => repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json} (57%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_git_refs_heads_master-8.json => repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json} (55%) rename src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/{repos_jkalash_github-api_merges-23.json => repos_hub4j-test-org_temp-testmergebranch_merges-10.json} (59%) delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json diff --git a/src/main/java/org/kohsuke/github/GHBranch.java b/src/main/java/org/kohsuke/github/GHBranch.java index db5686c23..35c3da7f7 100644 --- a/src/main/java/org/kohsuke/github/GHBranch.java +++ b/src/main/java/org/kohsuke/github/GHBranch.java @@ -171,7 +171,7 @@ public class GHBranch { * @param headBranch * the branch whose head is being merged * - * @param commit_message + * @param commitMessage * the commit message * * @return GHCommit the merge commit created @@ -179,11 +179,11 @@ public class GHBranch { * @throws IOException * if merging fails */ - public GHCommit merge(GHBranch headBranch, String commit_message) throws IOException { + public GHCommit merge(GHBranch headBranch, String commitMessage) throws IOException { return root.createRequest() .withUrlPath(owner.getApiTailUrl("merges")) .method("POST") - .with("commit_message", commit_message) + .with("commit_message", commitMessage) .with("base", this.name) .with("head", headBranch.getName()) .fetch(GHCommit.class) diff --git a/src/test/java/org/kohsuke/github/GHBranchTest.java b/src/test/java/org/kohsuke/github/GHBranchTest.java index f84c77364..735581f73 100644 --- a/src/test/java/org/kohsuke/github/GHBranchTest.java +++ b/src/test/java/org/kohsuke/github/GHBranchTest.java @@ -1,62 +1,35 @@ package org.kohsuke.github; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import java.io.IOException; +import static org.hamcrest.Matchers.*; + public class GHBranchTest extends AbstractGitHubWireMockTest { private static final String BRANCH_1 = "testBranch1"; private static final String BRANCH_2 = "testBranch2"; private GHRepository repository; - @Before - public void before() throws Exception { - repository = gitHub.getUser("jkalash").getRepository("github-api"); - cleanupBranches(); - } - - @After - public void after() throws Exception { - cleanupBranches(); - } - @Test public void testMergeBranch() throws Exception { + repository = getTempRepository(); + String masterHead = repository.getRef("heads/master").getObject().getSha(); createRefAndPostContent(BRANCH_1, masterHead); createRefAndPostContent(BRANCH_2, masterHead); - Thread.sleep(1000); - GHBranch otherBranch = repository.getBranch(BRANCH_2); String commitMessage = "merging " + BRANCH_2; - assertNotNull(repository.getBranch(BRANCH_1).merge(otherBranch, commitMessage)); + GHCommit mergeCommit = repository.getBranch(BRANCH_1).merge(otherBranch, commitMessage); + assertThat(mergeCommit, notNullValue()); + assertThat(mergeCommit.getCommitShortInfo().getMessage(), equalTo(commitMessage)); } private void createRefAndPostContent(String branchName, String sha) throws IOException { String refName = "refs/heads/" + branchName; - if (repository.listRefs().toList().stream().map(GHRef::getRef).noneMatch(ref -> ref.equals(refName))) { - repository.createRef(refName, sha); - } + repository.createRef(refName, sha); repository.createContent().content(branchName).message(branchName).path(branchName).branch(branchName).commit(); } - - private void cleanupBranches() throws Exception { - if (!mockGitHub.isUseProxy()) { - return; - } - - String ref1 = "refs/heads/" + BRANCH_1; - String ref2 = "refs/heads/" + BRANCH_2; - for (GHRef ref : repository.listRefs().toList()) { - if (ref.getRef().equals(ref1) || ref.getRef().equals(ref2)) { - ref.delete(); - } - } - - Thread.sleep(1000); - } } diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json new file mode 100644 index 000000000..91add7171 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json @@ -0,0 +1,126 @@ +{ + "id": 283293221, + "node_id": "MDEwOlJlcG9zaXRvcnkyODMyOTMyMjE=", + "name": "temp-testMergeBranch", + "full_name": "hub4j-test-org/temp-testMergeBranch", + "private": false, + "owner": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch", + "description": "A test repository for testing the github-api project: temp-testMergeBranch", + "fork": false, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch", + "forks_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/forks", + "keys_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/teams", + "hooks_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/hooks", + "issue_events_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/issues/events{/number}", + "events_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/events", + "assignees_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/assignees{/user}", + "branches_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches{/branch}", + "tags_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/tags", + "blobs_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/statuses/{sha}", + "languages_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/languages", + "stargazers_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/stargazers", + "contributors_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/contributors", + "subscribers_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/subscribers", + "subscription_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/subscription", + "commits_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/contents/{+path}", + "compare_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/merges", + "archive_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/downloads", + "issues_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/issues{/number}", + "pulls_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/pulls{/number}", + "milestones_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/milestones{/number}", + "notifications_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/labels{/name}", + "releases_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/releases{/id}", + "deployments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/deployments", + "created_at": "2020-07-28T18:18:44Z", + "updated_at": "2020-07-28T18:18:49Z", + "pushed_at": "2020-07-28T18:18:46Z", + "git_url": "git://github.com/hub4j-test-org/temp-testMergeBranch.git", + "ssh_url": "git@github.com:hub4j-test-org/temp-testMergeBranch.git", + "clone_url": "https://github.com/hub4j-test-org/temp-testMergeBranch.git", + "svn_url": "https://github.com/hub4j-test-org/temp-testMergeBranch", + "homepage": "http://github-api.kohsuke.org/", + "size": 0, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 0, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 0, + "open_issues": 0, + "watchers": 0, + "default_branch": "master", + "permissions": { + "admin": true, + "push": true, + "pull": true + }, + "temp_clone_token": "", + "allow_squash_merge": true, + "allow_merge_commit": true, + "allow_rebase_merge": true, + "delete_branch_on_merge": false, + "organization": { + "login": "hub4j-test-org", + "id": 7544739, + "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", + "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/hub4j-test-org", + "html_url": "https://github.com/hub4j-test-org", + "followers_url": "https://api.github.com/users/hub4j-test-org/followers", + "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs", + "repos_url": "https://api.github.com/users/hub4j-test-org/repos", + "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "network_count": 0, + "subscribers_count": 8 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json new file mode 100644 index 000000000..277631c9d --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json @@ -0,0 +1,95 @@ +{ + "name": "testBranch1", + "commit": { + "sha": "1daaedca738fa6117848f3128a41058ae6c48277", + "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjFkYWFlZGNhNzM4ZmE2MTE3ODQ4ZjMxMjhhNDEwNThhZTZjNDgyNzc=", + "commit": { + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:51Z" + }, + "committer": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:51Z" + }, + "message": "testBranch1", + "tree": { + "sha": "540c4a3c093ad09a869163c60d44218774ff5474", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/540c4a3c093ad09a869163c60d44218774ff5474" + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/1daaedca738fa6117848f3128a41058ae6c48277", + "comment_count": 0, + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/1daaedca738fa6117848f3128a41058ae6c48277", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/1daaedca738fa6117848f3128a41058ae6c48277", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/1daaedca738fa6117848f3128a41058ae6c48277/comments", + "author": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + } + ] + }, + "_links": { + "self": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch1", + "html": "https://github.com/hub4j-test-org/temp-testMergeBranch/tree/testBranch1" + }, + "protected": false, + "protection": { + "enabled": false, + "required_status_checks": { + "enforcement_level": "off", + "contexts": [] + } + }, + "protection_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch1/protection" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json new file mode 100644 index 000000000..4e5802f95 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json @@ -0,0 +1,95 @@ +{ + "name": "testBranch2", + "commit": { + "sha": "2294f9e512939576357baf7556ff3cb87d75c4bd", + "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjIyOTRmOWU1MTI5Mzk1NzYzNTdiYWY3NTU2ZmYzY2I4N2Q3NWM0YmQ=", + "commit": { + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:53Z" + }, + "committer": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:53Z" + }, + "message": "testBranch2", + "tree": { + "sha": "a183aaff617bc52ba1bdcea74faf24687194faf1", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/a183aaff617bc52ba1bdcea74faf24687194faf1" + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", + "comment_count": 0, + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/2294f9e512939576357baf7556ff3cb87d75c4bd", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/2294f9e512939576357baf7556ff3cb87d75c4bd/comments", + "author": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + } + ] + }, + "_links": { + "self": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch2", + "html": "https://github.com/hub4j-test-org/temp-testMergeBranch/tree/testBranch2" + }, + "protected": false, + "protection": { + "enabled": false, + "required_status_checks": { + "enforcement_level": "off", + "contexts": [] + } + }, + "protection_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch2/protection" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json new file mode 100644 index 000000000..6f490f253 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json @@ -0,0 +1,52 @@ +{ + "content": { + "name": "testBranch1", + "path": "testBranch1", + "sha": "2207929ecd1b9edb692e9538707dda960e1b0c8c", + "size": 11, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch1?ref=testBranch1", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/blob/testBranch1/testBranch1", + "git_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/blobs/2207929ecd1b9edb692e9538707dda960e1b0c8c", + "download_url": "https://raw.githubusercontent.com/hub4j-test-org/temp-testMergeBranch/testBranch1/testBranch1", + "type": "file", + "_links": { + "self": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch1?ref=testBranch1", + "git": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/blobs/2207929ecd1b9edb692e9538707dda960e1b0c8c", + "html": "https://github.com/hub4j-test-org/temp-testMergeBranch/blob/testBranch1/testBranch1" + } + }, + "commit": { + "sha": "1daaedca738fa6117848f3128a41058ae6c48277", + "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjFkYWFlZGNhNzM4ZmE2MTE3ODQ4ZjMxMjhhNDEwNThhZTZjNDgyNzc=", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/1daaedca738fa6117848f3128a41058ae6c48277", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/1daaedca738fa6117848f3128a41058ae6c48277", + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:51Z" + }, + "committer": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:51Z" + }, + "tree": { + "sha": "540c4a3c093ad09a869163c60d44218774ff5474", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/540c4a3c093ad09a869163c60d44218774ff5474" + }, + "message": "testBranch1", + "parents": [ + { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + } + ], + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json new file mode 100644 index 000000000..5138a0987 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json @@ -0,0 +1,52 @@ +{ + "content": { + "name": "testBranch2", + "path": "testBranch2", + "sha": "2a521d98876f51a95f38aaba58c9e81672f7dd4d", + "size": 11, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch2?ref=testBranch2", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/blob/testBranch2/testBranch2", + "git_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/blobs/2a521d98876f51a95f38aaba58c9e81672f7dd4d", + "download_url": "https://raw.githubusercontent.com/hub4j-test-org/temp-testMergeBranch/testBranch2/testBranch2", + "type": "file", + "_links": { + "self": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch2?ref=testBranch2", + "git": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/blobs/2a521d98876f51a95f38aaba58c9e81672f7dd4d", + "html": "https://github.com/hub4j-test-org/temp-testMergeBranch/blob/testBranch2/testBranch2" + } + }, + "commit": { + "sha": "2294f9e512939576357baf7556ff3cb87d75c4bd", + "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjIyOTRmOWU1MTI5Mzk1NzYzNTdiYWY3NTU2ZmYzY2I4N2Q3NWM0YmQ=", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/2294f9e512939576357baf7556ff3cb87d75c4bd", + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:53Z" + }, + "committer": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:53Z" + }, + "tree": { + "sha": "a183aaff617bc52ba1bdcea74faf24687194faf1", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/a183aaff617bc52ba1bdcea74faf24687194faf1" + }, + "message": "testBranch2", + "parents": [ + { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + } + ], + "verification": { + "verified": false, + "reason": "unsigned", + "signature": null, + "payload": null + } + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json new file mode 100644 index 000000000..06593c739 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/testBranch1", + "node_id": "MDM6UmVmMjgzMjkzMjIxOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch1", + "object": { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "type": "commit", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json new file mode 100644 index 000000000..afdac0242 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/testBranch2", + "node_id": "MDM6UmVmMjgzMjkzMjIxOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch2", + "object": { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "type": "commit", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json new file mode 100644 index 000000000..66e0f8f8e --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/master", + "node_id": "MDM6UmVmMjgzMjkzMjIxOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/master", + "object": { + "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "type": "commit", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json new file mode 100644 index 000000000..5c16972cf --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json @@ -0,0 +1,84 @@ +{ + "sha": "4dd8b1013c99d4bb85766bf69427f39aae49a263", + "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjRkZDhiMTAxM2M5OWQ0YmI4NTc2NmJmNjk0MjdmMzlhYWU0OWEyNjM=", + "commit": { + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T18:18:54Z" + }, + "committer": { + "name": "GitHub", + "email": "noreply@github.com", + "date": "2020-07-28T18:18:54Z" + }, + "message": "merging testBranch2", + "tree": { + "sha": "a5ae8da88efbf6ff508c9575601f9a437a980626", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/a5ae8da88efbf6ff508c9575601f9a437a980626" + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263", + "comment_count": 0, + "verification": { + "verified": true, + "reason": "valid", + "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfIGwOCRBK7hj4Ov3rIwAAdHIIACnvZApf4BUxYjnJrc3bcJZD\nYlEfhLc2MwxlBDTkYK4JwzqSVj/iwl2CUjYE/JqX8xUvCfCWUlIZIbBUzua/YiId\nI+yd/b3wcT489zOJt7FNNFMSimq05o49DQcvwozxwSw8TvY/NlcQBd1b9OFX6MFy\nGP3KgHlIrj3iKDRhKqVuz3ONltq5xea+WwIt4gkMFqtc3YCxEjo/wnvPE3Xbu3x6\nVFasJkQuBelv1PAfmgbHIBc2t9A82/2e00hHkwuutqmIb27+1hHuegbb/bg6Obd9\nSslYfZwq6KllPk6LIfuUPSRxxFRfzkLjN7N9uV4eYneMmT5ys4KQJn1R6HeK7hY=\n=iEe2\n-----END PGP SIGNATURE-----\n", + "payload": "tree a5ae8da88efbf6ff508c9575601f9a437a980626\nparent 1daaedca738fa6117848f3128a41058ae6c48277\nparent 2294f9e512939576357baf7556ff3cb87d75c4bd\nauthor Liam Newman 1595960334 -0700\ncommitter GitHub 1595960334 -0700\n\nmerging testBranch2\n" + } + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/4dd8b1013c99d4bb85766bf69427f39aae49a263", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263/comments", + "author": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "web-flow", + "id": 19864447, + "node_id": "MDQ6VXNlcjE5ODY0NDQ3", + "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/web-flow", + "html_url": "https://github.com/web-flow", + "followers_url": "https://api.github.com/users/web-flow/followers", + "following_url": "https://api.github.com/users/web-flow/following{/other_user}", + "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", + "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", + "organizations_url": "https://api.github.com/users/web-flow/orgs", + "repos_url": "https://api.github.com/users/web-flow/repos", + "events_url": "https://api.github.com/users/web-flow/events{/privacy}", + "received_events_url": "https://api.github.com/users/web-flow/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "1daaedca738fa6117848f3128a41058ae6c48277", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/1daaedca738fa6117848f3128a41058ae6c48277", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/1daaedca738fa6117848f3128a41058ae6c48277" + }, + { + "sha": "2294f9e512939576357baf7556ff3cb87d75c4bd", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/2294f9e512939576357baf7556ff3cb87d75c4bd" + } + ] +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json deleted file mode 100644 index a329d30ea..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api-3.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "id": 283171990, - "node_id": "MDEwOlJlcG9zaXRvcnkyODMxNzE5OTA=", - "name": "github-api", - "full_name": "JKalash/github-api", - "private": false, - "owner": { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/JKalash/github-api", - "description": "Java API for GitHub", - "fork": true, - "url": "https://api.github.com/repos/JKalash/github-api", - "forks_url": "https://api.github.com/repos/JKalash/github-api/forks", - "keys_url": "https://api.github.com/repos/JKalash/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/JKalash/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/JKalash/github-api/teams", - "hooks_url": "https://api.github.com/repos/JKalash/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/JKalash/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/JKalash/github-api/events", - "assignees_url": "https://api.github.com/repos/JKalash/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/JKalash/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/JKalash/github-api/tags", - "blobs_url": "https://api.github.com/repos/JKalash/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/JKalash/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/JKalash/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/JKalash/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/JKalash/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/JKalash/github-api/languages", - "stargazers_url": "https://api.github.com/repos/JKalash/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/JKalash/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/JKalash/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/JKalash/github-api/subscription", - "commits_url": "https://api.github.com/repos/JKalash/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/JKalash/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/JKalash/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/JKalash/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/JKalash/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/JKalash/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/JKalash/github-api/merges", - "archive_url": "https://api.github.com/repos/JKalash/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/JKalash/github-api/downloads", - "issues_url": "https://api.github.com/repos/JKalash/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/JKalash/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/JKalash/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/JKalash/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/JKalash/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/JKalash/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/JKalash/github-api/deployments", - "created_at": "2020-07-28T09:56:56Z", - "updated_at": "2020-07-28T09:56:58Z", - "pushed_at": "2020-07-28T13:36:35Z", - "git_url": "git://github.com/JKalash/github-api.git", - "ssh_url": "git@github.com:JKalash/github-api.git", - "clone_url": "https://github.com/JKalash/github-api.git", - "svn_url": "https://github.com/JKalash/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 24695, - "stargazers_count": 0, - "watchers_count": 0, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 0, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 0, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "temp_clone_token": "", - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "delete_branch_on_merge": false, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-07-28T04:31:42Z", - "pushed_at": "2020-07-28T11:46:04Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 24690, - "stargazers_count": 687, - "watchers_count": 687, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 494, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 69, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 494, - "open_issues": 69, - "watchers": 687, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-07-28T04:31:42Z", - "pushed_at": "2020-07-28T11:46:04Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 24690, - "stargazers_count": 687, - "watchers_count": 687, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 494, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 69, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 494, - "open_issues": 69, - "watchers": 687, - "default_branch": "master" - }, - "network_count": 494, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json deleted file mode 100644 index 9caeb7332..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch1-22.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "name": "testBranch1", - "commit": { - "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", - "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOmQxZjE4OGZmMDgwZjA2OTJmNWJiNTUwMTQ0YzZiODU2ZTQyNjFlOWE=", - "commit": { - "author": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:09Z" - }, - "committer": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:09Z" - }, - "message": "testBranch1", - "tree": { - "sha": "f5b8617e3918f8d719b6394bdfcff1bbe3a681df", - "url": "https://api.github.com/repos/JKalash/github-api/git/trees/f5b8617e3918f8d719b6394bdfcff1bbe3a681df" - }, - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/JKalash/github-api/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", - "html_url": "https://github.com/JKalash/github-api/commit/d1f188ff080f0692f5bb550144c6b856e4261e9a", - "comments_url": "https://api.github.com/repos/JKalash/github-api/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a/comments", - "author": { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "url": "https://api.github.com/repos/JKalash/github-api/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - ] - }, - "_links": { - "self": "https://api.github.com/repos/JKalash/github-api/branches/testBranch1", - "html": "https://github.com/JKalash/github-api/tree/testBranch1" - }, - "protected": false, - "protection": { - "enabled": false, - "required_status_checks": { - "enforcement_level": "off", - "contexts": [] - } - }, - "protection_url": "https://api.github.com/repos/JKalash/github-api/branches/testBranch1/protection" -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json deleted file mode 100644 index b91118fb4..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_branches_testbranch2-21.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "name": "testBranch2", - "commit": { - "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", - "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOjI4N2JkOTE5ZjkxZjg0OWU2ZDZhNTE3ZDRmMjgzMGQ1NTUzM2I5ZTk=", - "commit": { - "author": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:12Z" - }, - "committer": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:12Z" - }, - "message": "testBranch2", - "tree": { - "sha": "d689732ab2c6da335c8f3365a5a213f96d18e082", - "url": "https://api.github.com/repos/JKalash/github-api/git/trees/d689732ab2c6da335c8f3365a5a213f96d18e082" - }, - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/JKalash/github-api/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", - "html_url": "https://github.com/JKalash/github-api/commit/287bd919f91f849e6d6a517d4f2830d55533b9e9", - "comments_url": "https://api.github.com/repos/JKalash/github-api/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9/comments", - "author": { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "url": "https://api.github.com/repos/JKalash/github-api/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - ] - }, - "_links": { - "self": "https://api.github.com/repos/JKalash/github-api/branches/testBranch2", - "html": "https://github.com/JKalash/github-api/tree/testBranch2" - }, - "protected": false, - "protection": { - "enabled": false, - "required_status_checks": { - "enforcement_level": "off", - "contexts": [] - } - }, - "protection_url": "https://api.github.com/repos/JKalash/github-api/branches/testBranch2/protection" -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json deleted file mode 100644 index f1bcdccc5..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch1-14.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "content": { - "name": "testBranch1", - "path": "testBranch1", - "sha": "2207929ecd1b9edb692e9538707dda960e1b0c8c", - "size": 11, - "url": "https://api.github.com/repos/JKalash/github-api/contents/testBranch1?ref=testBranch1", - "html_url": "https://github.com/JKalash/github-api/blob/testBranch1/testBranch1", - "git_url": "https://api.github.com/repos/JKalash/github-api/git/blobs/2207929ecd1b9edb692e9538707dda960e1b0c8c", - "download_url": "https://raw.githubusercontent.com/JKalash/github-api/testBranch1/testBranch1", - "type": "file", - "_links": { - "self": "https://api.github.com/repos/JKalash/github-api/contents/testBranch1?ref=testBranch1", - "git": "https://api.github.com/repos/JKalash/github-api/git/blobs/2207929ecd1b9edb692e9538707dda960e1b0c8c", - "html": "https://github.com/JKalash/github-api/blob/testBranch1/testBranch1" - } - }, - "commit": { - "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", - "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOmQxZjE4OGZmMDgwZjA2OTJmNWJiNTUwMTQ0YzZiODU2ZTQyNjFlOWE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", - "html_url": "https://github.com/JKalash/github-api/commit/d1f188ff080f0692f5bb550144c6b856e4261e9a", - "author": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:09Z" - }, - "committer": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:09Z" - }, - "tree": { - "sha": "f5b8617e3918f8d719b6394bdfcff1bbe3a681df", - "url": "https://api.github.com/repos/JKalash/github-api/git/trees/f5b8617e3918f8d719b6394bdfcff1bbe3a681df" - }, - "message": "testBranch1", - "parents": [ - { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - ], - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - } -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json deleted file mode 100644 index 6c648e78e..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_contents_testbranch2-20.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "content": { - "name": "testBranch2", - "path": "testBranch2", - "sha": "2a521d98876f51a95f38aaba58c9e81672f7dd4d", - "size": 11, - "url": "https://api.github.com/repos/JKalash/github-api/contents/testBranch2?ref=testBranch2", - "html_url": "https://github.com/JKalash/github-api/blob/testBranch2/testBranch2", - "git_url": "https://api.github.com/repos/JKalash/github-api/git/blobs/2a521d98876f51a95f38aaba58c9e81672f7dd4d", - "download_url": "https://raw.githubusercontent.com/JKalash/github-api/testBranch2/testBranch2", - "type": "file", - "_links": { - "self": "https://api.github.com/repos/JKalash/github-api/contents/testBranch2?ref=testBranch2", - "git": "https://api.github.com/repos/JKalash/github-api/git/blobs/2a521d98876f51a95f38aaba58c9e81672f7dd4d", - "html": "https://github.com/JKalash/github-api/blob/testBranch2/testBranch2" - } - }, - "commit": { - "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", - "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOjI4N2JkOTE5ZjkxZjg0OWU2ZDZhNTE3ZDRmMjgzMGQ1NTUzM2I5ZTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", - "html_url": "https://github.com/JKalash/github-api/commit/287bd919f91f849e6d6a517d4f2830d55533b9e9", - "author": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:12Z" - }, - "committer": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:12Z" - }, - "tree": { - "sha": "d689732ab2c6da335c8f3365a5a213f96d18e082", - "url": "https://api.github.com/repos/JKalash/github-api/git/trees/d689732ab2c6da335c8f3365a5a213f96d18e082" - }, - "message": "testBranch2", - "parents": [ - { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "html_url": "https://github.com/JKalash/github-api/commit/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - ], - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - } -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json deleted file mode 100644 index db109834c..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-13.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ref": "refs/heads/testBranch1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json deleted file mode 100644 index c6d930a74..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-15.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/heads/bitwiseman-patch-1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", - "object": { - "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" - } - }, - { - "ref": "refs/heads/gh-pages", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", - "object": { - "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" - } - }, - { - "ref": "refs/heads/jkalash/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", - "object": { - "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" - } - }, - { - "ref": "refs/heads/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - }, - { - "ref": "refs/heads/testBranch1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", - "object": { - "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a" - } - }, - { - "ref": "refs/tags/github-api-1.0", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", - "object": { - "sha": "ac77a05981f57c79e422c8fe98d522119338d650", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" - } - }, - { - "ref": "refs/tags/github-api-1.1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", - "object": { - "sha": "f58213cfb7137d41f54542f83fbd551a06717494", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" - } - }, - { - "ref": "refs/tags/github-api-1.2", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", - "object": { - "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" - } - }, - { - "ref": "refs/tags/github-api-1.3", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", - "object": { - "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" - } - }, - { - "ref": "refs/tags/github-api-1.4", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", - "object": { - "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" - } - }, - { - "ref": "refs/tags/github-api-1.5", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", - "object": { - "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" - } - }, - { - "ref": "refs/tags/github-api-1.6", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", - "object": { - "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" - } - }, - { - "ref": "refs/tags/github-api-1.7", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", - "object": { - "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" - } - }, - { - "ref": "refs/tags/github-api-1.8", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", - "object": { - "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" - } - }, - { - "ref": "refs/tags/github-api-1.9", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", - "object": { - "sha": "f01ff95029cb422607a944ecee48842a8e97e259", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" - } - }, - { - "ref": "refs/tags/github-api-1.10", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", - "object": { - "sha": "69533371e248f18e16bf621f07dc09774ecf766a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" - } - }, - { - "ref": "refs/tags/github-api-1.11", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", - "object": { - "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" - } - }, - { - "ref": "refs/tags/github-api-1.12", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", - "object": { - "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" - } - }, - { - "ref": "refs/tags/github-api-1.13", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", - "object": { - "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" - } - }, - { - "ref": "refs/tags/github-api-1.14", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", - "object": { - "sha": "09373ff6191ee3f5c7814ae748963529167de96d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" - } - }, - { - "ref": "refs/tags/github-api-1.15", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", - "object": { - "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" - } - }, - { - "ref": "refs/tags/github-api-1.16", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", - "object": { - "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" - } - }, - { - "ref": "refs/tags/github-api-1.17", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", - "object": { - "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" - } - }, - { - "ref": "refs/tags/github-api-1.18", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", - "object": { - "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" - } - }, - { - "ref": "refs/tags/github-api-1.19", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", - "object": { - "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" - } - }, - { - "ref": "refs/tags/github-api-1.20", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", - "object": { - "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" - } - }, - { - "ref": "refs/tags/github-api-1.21", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", - "object": { - "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" - } - }, - { - "ref": "refs/tags/github-api-1.22", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", - "object": { - "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" - } - }, - { - "ref": "refs/tags/github-api-1.23", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", - "object": { - "sha": "274e47e111de9286954088e2db613f9d665b66d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" - } - }, - { - "ref": "refs/tags/github-api-1.24", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", - "object": { - "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json deleted file mode 100644 index b13041415..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-19.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ref": "refs/heads/testBranch2", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch2", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json deleted file mode 100644 index 03d4ccd24..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-24.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/heads/bitwiseman-patch-1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", - "object": { - "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" - } - }, - { - "ref": "refs/heads/gh-pages", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", - "object": { - "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" - } - }, - { - "ref": "refs/heads/jkalash/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", - "object": { - "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" - } - }, - { - "ref": "refs/heads/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - }, - { - "ref": "refs/heads/testBranch1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", - "object": { - "sha": "069f4fc82ffc4f068e64e9339c87315de696bd8d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d" - } - }, - { - "ref": "refs/heads/testBranch2", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch2", - "object": { - "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9" - } - }, - { - "ref": "refs/tags/github-api-1.0", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", - "object": { - "sha": "ac77a05981f57c79e422c8fe98d522119338d650", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" - } - }, - { - "ref": "refs/tags/github-api-1.1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", - "object": { - "sha": "f58213cfb7137d41f54542f83fbd551a06717494", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" - } - }, - { - "ref": "refs/tags/github-api-1.2", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", - "object": { - "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" - } - }, - { - "ref": "refs/tags/github-api-1.3", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", - "object": { - "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" - } - }, - { - "ref": "refs/tags/github-api-1.4", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", - "object": { - "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" - } - }, - { - "ref": "refs/tags/github-api-1.5", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", - "object": { - "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" - } - }, - { - "ref": "refs/tags/github-api-1.6", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", - "object": { - "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" - } - }, - { - "ref": "refs/tags/github-api-1.7", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", - "object": { - "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" - } - }, - { - "ref": "refs/tags/github-api-1.8", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", - "object": { - "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" - } - }, - { - "ref": "refs/tags/github-api-1.9", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", - "object": { - "sha": "f01ff95029cb422607a944ecee48842a8e97e259", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" - } - }, - { - "ref": "refs/tags/github-api-1.10", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", - "object": { - "sha": "69533371e248f18e16bf621f07dc09774ecf766a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" - } - }, - { - "ref": "refs/tags/github-api-1.11", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", - "object": { - "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" - } - }, - { - "ref": "refs/tags/github-api-1.12", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", - "object": { - "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" - } - }, - { - "ref": "refs/tags/github-api-1.13", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", - "object": { - "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" - } - }, - { - "ref": "refs/tags/github-api-1.14", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", - "object": { - "sha": "09373ff6191ee3f5c7814ae748963529167de96d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" - } - }, - { - "ref": "refs/tags/github-api-1.15", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", - "object": { - "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" - } - }, - { - "ref": "refs/tags/github-api-1.16", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", - "object": { - "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" - } - }, - { - "ref": "refs/tags/github-api-1.17", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", - "object": { - "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" - } - }, - { - "ref": "refs/tags/github-api-1.18", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", - "object": { - "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" - } - }, - { - "ref": "refs/tags/github-api-1.19", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", - "object": { - "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" - } - }, - { - "ref": "refs/tags/github-api-1.20", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", - "object": { - "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" - } - }, - { - "ref": "refs/tags/github-api-1.21", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", - "object": { - "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" - } - }, - { - "ref": "refs/tags/github-api-1.22", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", - "object": { - "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" - } - }, - { - "ref": "refs/tags/github-api-1.23", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", - "object": { - "sha": "274e47e111de9286954088e2db613f9d665b66d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json deleted file mode 100644 index 75f07e811..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-4.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/heads/bitwiseman-patch-1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", - "object": { - "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" - } - }, - { - "ref": "refs/heads/gh-pages", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", - "object": { - "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" - } - }, - { - "ref": "refs/heads/jkalash/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", - "object": { - "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" - } - }, - { - "ref": "refs/heads/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - }, - { - "ref": "refs/tags/github-api-1.0", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", - "object": { - "sha": "ac77a05981f57c79e422c8fe98d522119338d650", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" - } - }, - { - "ref": "refs/tags/github-api-1.1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", - "object": { - "sha": "f58213cfb7137d41f54542f83fbd551a06717494", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" - } - }, - { - "ref": "refs/tags/github-api-1.2", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", - "object": { - "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" - } - }, - { - "ref": "refs/tags/github-api-1.3", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", - "object": { - "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" - } - }, - { - "ref": "refs/tags/github-api-1.4", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", - "object": { - "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" - } - }, - { - "ref": "refs/tags/github-api-1.5", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", - "object": { - "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" - } - }, - { - "ref": "refs/tags/github-api-1.6", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", - "object": { - "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" - } - }, - { - "ref": "refs/tags/github-api-1.7", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", - "object": { - "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" - } - }, - { - "ref": "refs/tags/github-api-1.8", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", - "object": { - "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" - } - }, - { - "ref": "refs/tags/github-api-1.9", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", - "object": { - "sha": "f01ff95029cb422607a944ecee48842a8e97e259", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" - } - }, - { - "ref": "refs/tags/github-api-1.10", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", - "object": { - "sha": "69533371e248f18e16bf621f07dc09774ecf766a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" - } - }, - { - "ref": "refs/tags/github-api-1.11", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", - "object": { - "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" - } - }, - { - "ref": "refs/tags/github-api-1.12", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", - "object": { - "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" - } - }, - { - "ref": "refs/tags/github-api-1.13", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", - "object": { - "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" - } - }, - { - "ref": "refs/tags/github-api-1.14", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", - "object": { - "sha": "09373ff6191ee3f5c7814ae748963529167de96d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" - } - }, - { - "ref": "refs/tags/github-api-1.15", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", - "object": { - "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" - } - }, - { - "ref": "refs/tags/github-api-1.16", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", - "object": { - "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" - } - }, - { - "ref": "refs/tags/github-api-1.17", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", - "object": { - "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" - } - }, - { - "ref": "refs/tags/github-api-1.18", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", - "object": { - "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" - } - }, - { - "ref": "refs/tags/github-api-1.19", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", - "object": { - "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" - } - }, - { - "ref": "refs/tags/github-api-1.20", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", - "object": { - "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" - } - }, - { - "ref": "refs/tags/github-api-1.21", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", - "object": { - "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" - } - }, - { - "ref": "refs/tags/github-api-1.22", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", - "object": { - "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" - } - }, - { - "ref": "refs/tags/github-api-1.23", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", - "object": { - "sha": "274e47e111de9286954088e2db613f9d665b66d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" - } - }, - { - "ref": "refs/tags/github-api-1.24", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", - "object": { - "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" - } - }, - { - "ref": "refs/tags/github-api-1.25", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", - "object": { - "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json deleted file mode 100644 index 75f07e811..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs-9.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/heads/bitwiseman-patch-1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvYml0d2lzZW1hbi1wYXRjaC0x", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/bitwiseman-patch-1", - "object": { - "sha": "0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/0a6613e60d01ed7cab3b8de94bdc204ca0f37ee0" - } - }, - { - "ref": "refs/heads/gh-pages", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvZ2gtcGFnZXM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/gh-pages", - "object": { - "sha": "89f7b6b9559b7488dc0c4deb8798e3b766740981", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/89f7b6b9559b7488dc0c4deb8798e3b766740981" - } - }, - { - "ref": "refs/heads/jkalash/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvamthbGFzaC9tYXN0ZXI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/jkalash/master", - "object": { - "sha": "fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/fe8bdb755a8ed6778a2e34dc6f6d431b569dfc3b" - } - }, - { - "ref": "refs/heads/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } - }, - { - "ref": "refs/tags/github-api-1.0", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.0", - "object": { - "sha": "ac77a05981f57c79e422c8fe98d522119338d650", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac77a05981f57c79e422c8fe98d522119338d650" - } - }, - { - "ref": "refs/tags/github-api-1.1", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.1", - "object": { - "sha": "f58213cfb7137d41f54542f83fbd551a06717494", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f58213cfb7137d41f54542f83fbd551a06717494" - } - }, - { - "ref": "refs/tags/github-api-1.2", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.2", - "object": { - "sha": "6f6d5d83a15124e3d1e6782e36b901515510d59b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f6d5d83a15124e3d1e6782e36b901515510d59b" - } - }, - { - "ref": "refs/tags/github-api-1.3", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.3", - "object": { - "sha": "4b87010b99c04d88ac6216b49c8c29cb1e424721", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4b87010b99c04d88ac6216b49c8c29cb1e424721" - } - }, - { - "ref": "refs/tags/github-api-1.4", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.4", - "object": { - "sha": "e6a8e7fdb739b8cbc9fc858154e3e67d7533a793", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e6a8e7fdb739b8cbc9fc858154e3e67d7533a793" - } - }, - { - "ref": "refs/tags/github-api-1.5", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.5", - "object": { - "sha": "c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/c0dff74536f20c6a536fd09875ccf2b5e7b6fbb9" - } - }, - { - "ref": "refs/tags/github-api-1.6", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNg==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.6", - "object": { - "sha": "275b55f674d11b38ebec8a95398c51616c9e0256", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/275b55f674d11b38ebec8a95398c51616c9e0256" - } - }, - { - "ref": "refs/tags/github-api-1.7", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNw==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.7", - "object": { - "sha": "5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bc67a2b15ccc2a71c50fce3a1efd0ed2b20b6ff" - } - }, - { - "ref": "refs/tags/github-api-1.8", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOA==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.8", - "object": { - "sha": "8fb92212ffd502ca15c7770f41a16f13d2a011fd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8fb92212ffd502ca15c7770f41a16f13d2a011fd" - } - }, - { - "ref": "refs/tags/github-api-1.9", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOQ==", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.9", - "object": { - "sha": "f01ff95029cb422607a944ecee48842a8e97e259", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f01ff95029cb422607a944ecee48842a8e97e259" - } - }, - { - "ref": "refs/tags/github-api-1.10", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.10", - "object": { - "sha": "69533371e248f18e16bf621f07dc09774ecf766a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/69533371e248f18e16bf621f07dc09774ecf766a" - } - }, - { - "ref": "refs/tags/github-api-1.11", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.11", - "object": { - "sha": "8159aa16f9df224b994840efabc2f6aa51e7bef2", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8159aa16f9df224b994840efabc2f6aa51e7bef2" - } - }, - { - "ref": "refs/tags/github-api-1.12", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.12", - "object": { - "sha": "ffc2823b003fcdf01fb097a542613279f7a93ce4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ffc2823b003fcdf01fb097a542613279f7a93ce4" - } - }, - { - "ref": "refs/tags/github-api-1.13", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.13", - "object": { - "sha": "0018c5c4815e37345b6c3acf03d93b17802c4258", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0018c5c4815e37345b6c3acf03d93b17802c4258" - } - }, - { - "ref": "refs/tags/github-api-1.14", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.14", - "object": { - "sha": "09373ff6191ee3f5c7814ae748963529167de96d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09373ff6191ee3f5c7814ae748963529167de96d" - } - }, - { - "ref": "refs/tags/github-api-1.15", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.15", - "object": { - "sha": "24ffb700e7665a250948f7ab84fd9a293b66a6b3", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/24ffb700e7665a250948f7ab84fd9a293b66a6b3" - } - }, - { - "ref": "refs/tags/github-api-1.16", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.16", - "object": { - "sha": "f20f29b4a5d56e73382191a67a74d779be44087b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f20f29b4a5d56e73382191a67a74d779be44087b" - } - }, - { - "ref": "refs/tags/github-api-1.17", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.17", - "object": { - "sha": "fe28aa4325f8786dc75eeb7c2d48c2c31c99475d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fe28aa4325f8786dc75eeb7c2d48c2c31c99475d" - } - }, - { - "ref": "refs/tags/github-api-1.18", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.18", - "object": { - "sha": "1002fb586b0cd677bfaba5969a5fe327df052454", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1002fb586b0cd677bfaba5969a5fe327df052454" - } - }, - { - "ref": "refs/tags/github-api-1.19", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.19", - "object": { - "sha": "cb1b64cbc90a28c3aada479a29d3fbc793cecca4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/cb1b64cbc90a28c3aada479a29d3fbc793cecca4" - } - }, - { - "ref": "refs/tags/github-api-1.20", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.20", - "object": { - "sha": "5c7a0ca52ee1b08892d6f972af254dec49af3fbd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5c7a0ca52ee1b08892d6f972af254dec49af3fbd" - } - }, - { - "ref": "refs/tags/github-api-1.21", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.21", - "object": { - "sha": "d570b1c678d6fdeffaf97937d308d17eda26f47d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d570b1c678d6fdeffaf97937d308d17eda26f47d" - } - }, - { - "ref": "refs/tags/github-api-1.22", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.22", - "object": { - "sha": "fede12e571d9edac82621e0fe9c6176c99f6423b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fede12e571d9edac82621e0fe9c6176c99f6423b" - } - }, - { - "ref": "refs/tags/github-api-1.23", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.23", - "object": { - "sha": "274e47e111de9286954088e2db613f9d665b66d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/274e47e111de9286954088e2db613f9d665b66d6" - } - }, - { - "ref": "refs/tags/github-api-1.24", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", - "object": { - "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" - } - }, - { - "ref": "refs/tags/github-api-1.25", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", - "object": { - "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json deleted file mode 100644 index dd278a01e..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_git_refs_heads_master-8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ref": "refs/heads/master", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvaGVhZHMvbWFzdGVy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/master", - "object": { - "sha": "67dc6d2d23ad42d4d411592d0057905ee084ae4d", - "type": "commit", - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/67dc6d2d23ad42d4d411592d0057905ee084ae4d" - } -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json deleted file mode 100644 index 06f7c2483..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_jkalash_github-api_merges-23.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "sha": "069f4fc82ffc4f068e64e9339c87315de696bd8d", - "node_id": "MDY6Q29tbWl0MjgzMTcxOTkwOjA2OWY0ZmM4MmZmYzRmMDY4ZTY0ZTkzMzljODczMTVkZTY5NmJkOGQ=", - "commit": { - "author": { - "name": "Joe Kalash", - "email": "9067991+JKalash@users.noreply.github.com", - "date": "2020-07-28T13:37:14Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-28T13:37:14Z" - }, - "message": "merging testBranch2", - "tree": { - "sha": "20e4da7646cdea0243fccb5e19512c5f8365db9c", - "url": "https://api.github.com/repos/JKalash/github-api/git/trees/20e4da7646cdea0243fccb5e19512c5f8365db9c" - }, - "url": "https://api.github.com/repos/JKalash/github-api/git/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfICoKCRBK7hj4Ov3rIwAAdHIIABoyIZFc8DIgf68ESgRo9b3T\nx9gG1mIaWboTXk6vrnaHt1YWKwwIusiynYnKzGUaBkgJ+75hsUPp19YpgAPmql9y\nXZkiGEzwUpmGNstZyoEh+mMUggGIIY22lBJFptkS+mBtPQutKD0iQnsZ4dCcoZkv\nZ0SDUIyQkQkfxdNj7zoEe5BG7Xgkbu1PRTqgHjILRYPCwL+2wDnVNry551/IR8rt\nd/rXuhXDtRJvQhKHYxlKeSIuLCvX0aoJGc7URwV2TCzGMILfnPeuxzXbzbZhDLYl\n/Z5qntj8F/tf7n7uxmbw894Tq/7/m9jGUgTlCQiwhugXOE5k/hF0B3ECs5S2ksQ=\n=lAt3\n-----END PGP SIGNATURE-----\n", - "payload": "tree 20e4da7646cdea0243fccb5e19512c5f8365db9c\nparent d1f188ff080f0692f5bb550144c6b856e4261e9a\nparent 287bd919f91f849e6d6a517d4f2830d55533b9e9\nauthor Joe Kalash <9067991+JKalash@users.noreply.github.com> 1595943434 +0100\ncommitter GitHub 1595943434 +0100\n\nmerging testBranch2\n" - } - }, - "url": "https://api.github.com/repos/JKalash/github-api/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d", - "html_url": "https://github.com/JKalash/github-api/commit/069f4fc82ffc4f068e64e9339c87315de696bd8d", - "comments_url": "https://api.github.com/repos/JKalash/github-api/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d/comments", - "author": { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "d1f188ff080f0692f5bb550144c6b856e4261e9a", - "url": "https://api.github.com/repos/JKalash/github-api/commits/d1f188ff080f0692f5bb550144c6b856e4261e9a", - "html_url": "https://github.com/JKalash/github-api/commit/d1f188ff080f0692f5bb550144c6b856e4261e9a" - }, - { - "sha": "287bd919f91f849e6d6a517d4f2830d55533b9e9", - "url": "https://api.github.com/repos/JKalash/github-api/commits/287bd919f91f849e6d6a517d4f2830d55533b9e9", - "html_url": "https://github.com/JKalash/github-api/commit/287bd919f91f849e6d6a517d4f2830d55533b9e9" - } - ] -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json deleted file mode 100644 index 7a10f9804..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-10.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.26", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", - "object": { - "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" - } - }, - { - "ref": "refs/tags/github-api-1.27", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", - "object": { - "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" - } - }, - { - "ref": "refs/tags/github-api-1.28", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", - "object": { - "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" - } - }, - { - "ref": "refs/tags/github-api-1.29", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", - "object": { - "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" - } - }, - { - "ref": "refs/tags/github-api-1.30", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", - "object": { - "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" - } - }, - { - "ref": "refs/tags/github-api-1.31", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", - "object": { - "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" - } - }, - { - "ref": "refs/tags/github-api-1.32", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", - "object": { - "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" - } - }, - { - "ref": "refs/tags/github-api-1.33", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", - "object": { - "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" - } - }, - { - "ref": "refs/tags/github-api-1.34", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", - "object": { - "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" - } - }, - { - "ref": "refs/tags/github-api-1.35", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", - "object": { - "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" - } - }, - { - "ref": "refs/tags/github-api-1.36", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", - "object": { - "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" - } - }, - { - "ref": "refs/tags/github-api-1.37", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", - "object": { - "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" - } - }, - { - "ref": "refs/tags/github-api-1.38", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", - "object": { - "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" - } - }, - { - "ref": "refs/tags/github-api-1.39", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", - "object": { - "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" - } - }, - { - "ref": "refs/tags/github-api-1.40", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", - "object": { - "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" - } - }, - { - "ref": "refs/tags/github-api-1.41", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", - "object": { - "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" - } - }, - { - "ref": "refs/tags/github-api-1.42", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", - "object": { - "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" - } - }, - { - "ref": "refs/tags/github-api-1.43", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", - "object": { - "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" - } - }, - { - "ref": "refs/tags/github-api-1.44", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", - "object": { - "sha": "ad078dccb3fa360f886df0497fab386529755c28", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" - } - }, - { - "ref": "refs/tags/github-api-1.45", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", - "object": { - "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" - } - }, - { - "ref": "refs/tags/github-api-1.46", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", - "object": { - "sha": "326e30416e7b59dc7da160a1200febcb06028a56", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" - } - }, - { - "ref": "refs/tags/github-api-1.47", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", - "object": { - "sha": "93a0f691d878e28631431ebda37741ec249bd56e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" - } - }, - { - "ref": "refs/tags/github-api-1.48", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", - "object": { - "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" - } - }, - { - "ref": "refs/tags/github-api-1.49", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", - "object": { - "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" - } - }, - { - "ref": "refs/tags/github-api-1.50", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", - "object": { - "sha": "8d68f72be9530037b010e5a134513660b91b934d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" - } - }, - { - "ref": "refs/tags/github-api-1.51", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", - "object": { - "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" - } - }, - { - "ref": "refs/tags/github-api-1.52", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", - "object": { - "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" - } - }, - { - "ref": "refs/tags/github-api-1.53", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", - "object": { - "sha": "5df544a638af2e534db5144edbdcd47e2792c388", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" - } - }, - { - "ref": "refs/tags/github-api-1.54", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", - "object": { - "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" - } - }, - { - "ref": "refs/tags/github-api-1.55", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", - "object": { - "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json deleted file mode 100644 index 0c9102268..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-11.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.56", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", - "object": { - "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" - } - }, - { - "ref": "refs/tags/github-api-1.57", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", - "object": { - "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" - } - }, - { - "ref": "refs/tags/github-api-1.58", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", - "object": { - "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" - } - }, - { - "ref": "refs/tags/github-api-1.59", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", - "object": { - "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" - } - }, - { - "ref": "refs/tags/github-api-1.60", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", - "object": { - "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" - } - }, - { - "ref": "refs/tags/github-api-1.61", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", - "object": { - "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" - } - }, - { - "ref": "refs/tags/github-api-1.62", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", - "object": { - "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" - } - }, - { - "ref": "refs/tags/github-api-1.63", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", - "object": { - "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" - } - }, - { - "ref": "refs/tags/github-api-1.64", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", - "object": { - "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" - } - }, - { - "ref": "refs/tags/github-api-1.66", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", - "object": { - "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" - } - }, - { - "ref": "refs/tags/github-api-1.67", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", - "object": { - "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" - } - }, - { - "ref": "refs/tags/github-api-1.68", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", - "object": { - "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" - } - }, - { - "ref": "refs/tags/github-api-1.69", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", - "object": { - "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" - } - }, - { - "ref": "refs/tags/github-api-1.70", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", - "object": { - "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" - } - }, - { - "ref": "refs/tags/github-api-1.71", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", - "object": { - "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" - } - }, - { - "ref": "refs/tags/github-api-1.72", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", - "object": { - "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" - } - }, - { - "ref": "refs/tags/github-api-1.73", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", - "object": { - "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" - } - }, - { - "ref": "refs/tags/github-api-1.74", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", - "object": { - "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" - } - }, - { - "ref": "refs/tags/github-api-1.75", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", - "object": { - "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" - } - }, - { - "ref": "refs/tags/github-api-1.76", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", - "object": { - "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" - } - }, - { - "ref": "refs/tags/github-api-1.77", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", - "object": { - "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" - } - }, - { - "ref": "refs/tags/github-api-1.78", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", - "object": { - "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" - } - }, - { - "ref": "refs/tags/github-api-1.79", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", - "object": { - "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" - } - }, - { - "ref": "refs/tags/github-api-1.80", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", - "object": { - "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" - } - }, - { - "ref": "refs/tags/github-api-1.81", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", - "object": { - "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" - } - }, - { - "ref": "refs/tags/github-api-1.82", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", - "object": { - "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" - } - }, - { - "ref": "refs/tags/github-api-1.83", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", - "object": { - "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" - } - }, - { - "ref": "refs/tags/github-api-1.84", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", - "object": { - "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" - } - }, - { - "ref": "refs/tags/github-api-1.85", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", - "object": { - "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" - } - }, - { - "ref": "refs/tags/github-api-1.86", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", - "object": { - "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json deleted file mode 100644 index 9642a4ba7..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-12.json +++ /dev/null @@ -1,252 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.87", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", - "object": { - "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" - } - }, - { - "ref": "refs/tags/github-api-1.88", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", - "object": { - "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" - } - }, - { - "ref": "refs/tags/github-api-1.89", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", - "object": { - "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" - } - }, - { - "ref": "refs/tags/github-api-1.90", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", - "object": { - "sha": "63678b8f6548553012b44e4f74ab1520918e502a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" - } - }, - { - "ref": "refs/tags/github-api-1.91", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", - "object": { - "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" - } - }, - { - "ref": "refs/tags/github-api-1.92", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", - "object": { - "sha": "1b1e1259738117b76904eac72ee366b987e3153a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" - } - }, - { - "ref": "refs/tags/github-api-1.93", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", - "object": { - "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" - } - }, - { - "ref": "refs/tags/github-api-1.94", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", - "object": { - "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" - } - }, - { - "ref": "refs/tags/github-api-1.95", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", - "object": { - "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" - } - }, - { - "ref": "refs/tags/github-api-1.99", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", - "object": { - "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" - } - }, - { - "ref": "refs/tags/github-api-1.100", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", - "object": { - "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" - } - }, - { - "ref": "refs/tags/github-api-1.101", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", - "object": { - "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" - } - }, - { - "ref": "refs/tags/github-api-1.102", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", - "object": { - "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" - } - }, - { - "ref": "refs/tags/github-api-1.103", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", - "object": { - "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" - } - }, - { - "ref": "refs/tags/github-api-1.105", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", - "object": { - "sha": "14cd5255819306a1fb45735eb7d14d7739573944", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" - } - }, - { - "ref": "refs/tags/github-api-1.106", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", - "object": { - "sha": "52602056ac604678c26fedc81187afd1710e58c4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" - } - }, - { - "ref": "refs/tags/github-api-1.107", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", - "object": { - "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" - } - }, - { - "ref": "refs/tags/github-api-1.108", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", - "object": { - "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" - } - }, - { - "ref": "refs/tags/github-api-1.109", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", - "object": { - "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" - } - }, - { - "ref": "refs/tags/github-api-1.110", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", - "object": { - "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" - } - }, - { - "ref": "refs/tags/github-api-1.111", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", - "object": { - "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" - } - }, - { - "ref": "refs/tags/github-api-1.112", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", - "object": { - "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" - } - }, - { - "ref": "refs/tags/github-api-1.113", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", - "object": { - "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" - } - }, - { - "ref": "refs/tags/github-api-1.114", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", - "object": { - "sha": "09152a185182043ecdd869bf3d358507c68dc74f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" - } - }, - { - "ref": "refs/tags/github-api-1.115", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", - "object": { - "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json deleted file mode 100644 index 6401c569f..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-16.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.25", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", - "object": { - "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" - } - }, - { - "ref": "refs/tags/github-api-1.26", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", - "object": { - "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" - } - }, - { - "ref": "refs/tags/github-api-1.27", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", - "object": { - "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" - } - }, - { - "ref": "refs/tags/github-api-1.28", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", - "object": { - "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" - } - }, - { - "ref": "refs/tags/github-api-1.29", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", - "object": { - "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" - } - }, - { - "ref": "refs/tags/github-api-1.30", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", - "object": { - "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" - } - }, - { - "ref": "refs/tags/github-api-1.31", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", - "object": { - "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" - } - }, - { - "ref": "refs/tags/github-api-1.32", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", - "object": { - "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" - } - }, - { - "ref": "refs/tags/github-api-1.33", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", - "object": { - "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" - } - }, - { - "ref": "refs/tags/github-api-1.34", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", - "object": { - "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" - } - }, - { - "ref": "refs/tags/github-api-1.35", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", - "object": { - "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" - } - }, - { - "ref": "refs/tags/github-api-1.36", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", - "object": { - "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" - } - }, - { - "ref": "refs/tags/github-api-1.37", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", - "object": { - "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" - } - }, - { - "ref": "refs/tags/github-api-1.38", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", - "object": { - "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" - } - }, - { - "ref": "refs/tags/github-api-1.39", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", - "object": { - "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" - } - }, - { - "ref": "refs/tags/github-api-1.40", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", - "object": { - "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" - } - }, - { - "ref": "refs/tags/github-api-1.41", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", - "object": { - "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" - } - }, - { - "ref": "refs/tags/github-api-1.42", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", - "object": { - "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" - } - }, - { - "ref": "refs/tags/github-api-1.43", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", - "object": { - "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" - } - }, - { - "ref": "refs/tags/github-api-1.44", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", - "object": { - "sha": "ad078dccb3fa360f886df0497fab386529755c28", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" - } - }, - { - "ref": "refs/tags/github-api-1.45", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", - "object": { - "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" - } - }, - { - "ref": "refs/tags/github-api-1.46", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", - "object": { - "sha": "326e30416e7b59dc7da160a1200febcb06028a56", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" - } - }, - { - "ref": "refs/tags/github-api-1.47", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", - "object": { - "sha": "93a0f691d878e28631431ebda37741ec249bd56e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" - } - }, - { - "ref": "refs/tags/github-api-1.48", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", - "object": { - "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" - } - }, - { - "ref": "refs/tags/github-api-1.49", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", - "object": { - "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" - } - }, - { - "ref": "refs/tags/github-api-1.50", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", - "object": { - "sha": "8d68f72be9530037b010e5a134513660b91b934d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" - } - }, - { - "ref": "refs/tags/github-api-1.51", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", - "object": { - "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" - } - }, - { - "ref": "refs/tags/github-api-1.52", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", - "object": { - "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" - } - }, - { - "ref": "refs/tags/github-api-1.53", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", - "object": { - "sha": "5df544a638af2e534db5144edbdcd47e2792c388", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" - } - }, - { - "ref": "refs/tags/github-api-1.54", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", - "object": { - "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json deleted file mode 100644 index cb8e72584..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-17.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.55", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", - "object": { - "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" - } - }, - { - "ref": "refs/tags/github-api-1.56", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", - "object": { - "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" - } - }, - { - "ref": "refs/tags/github-api-1.57", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", - "object": { - "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" - } - }, - { - "ref": "refs/tags/github-api-1.58", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", - "object": { - "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" - } - }, - { - "ref": "refs/tags/github-api-1.59", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", - "object": { - "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" - } - }, - { - "ref": "refs/tags/github-api-1.60", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", - "object": { - "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" - } - }, - { - "ref": "refs/tags/github-api-1.61", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", - "object": { - "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" - } - }, - { - "ref": "refs/tags/github-api-1.62", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", - "object": { - "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" - } - }, - { - "ref": "refs/tags/github-api-1.63", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", - "object": { - "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" - } - }, - { - "ref": "refs/tags/github-api-1.64", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", - "object": { - "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" - } - }, - { - "ref": "refs/tags/github-api-1.66", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", - "object": { - "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" - } - }, - { - "ref": "refs/tags/github-api-1.67", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", - "object": { - "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" - } - }, - { - "ref": "refs/tags/github-api-1.68", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", - "object": { - "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" - } - }, - { - "ref": "refs/tags/github-api-1.69", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", - "object": { - "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" - } - }, - { - "ref": "refs/tags/github-api-1.70", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", - "object": { - "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" - } - }, - { - "ref": "refs/tags/github-api-1.71", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", - "object": { - "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" - } - }, - { - "ref": "refs/tags/github-api-1.72", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", - "object": { - "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" - } - }, - { - "ref": "refs/tags/github-api-1.73", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", - "object": { - "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" - } - }, - { - "ref": "refs/tags/github-api-1.74", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", - "object": { - "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" - } - }, - { - "ref": "refs/tags/github-api-1.75", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", - "object": { - "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" - } - }, - { - "ref": "refs/tags/github-api-1.76", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", - "object": { - "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" - } - }, - { - "ref": "refs/tags/github-api-1.77", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", - "object": { - "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" - } - }, - { - "ref": "refs/tags/github-api-1.78", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", - "object": { - "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" - } - }, - { - "ref": "refs/tags/github-api-1.79", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", - "object": { - "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" - } - }, - { - "ref": "refs/tags/github-api-1.80", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", - "object": { - "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" - } - }, - { - "ref": "refs/tags/github-api-1.81", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", - "object": { - "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" - } - }, - { - "ref": "refs/tags/github-api-1.82", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", - "object": { - "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" - } - }, - { - "ref": "refs/tags/github-api-1.83", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", - "object": { - "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" - } - }, - { - "ref": "refs/tags/github-api-1.84", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", - "object": { - "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" - } - }, - { - "ref": "refs/tags/github-api-1.85", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", - "object": { - "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json deleted file mode 100644 index edc2a96d8..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-18.json +++ /dev/null @@ -1,262 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.86", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", - "object": { - "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" - } - }, - { - "ref": "refs/tags/github-api-1.87", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", - "object": { - "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" - } - }, - { - "ref": "refs/tags/github-api-1.88", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", - "object": { - "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" - } - }, - { - "ref": "refs/tags/github-api-1.89", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", - "object": { - "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" - } - }, - { - "ref": "refs/tags/github-api-1.90", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", - "object": { - "sha": "63678b8f6548553012b44e4f74ab1520918e502a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" - } - }, - { - "ref": "refs/tags/github-api-1.91", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", - "object": { - "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" - } - }, - { - "ref": "refs/tags/github-api-1.92", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", - "object": { - "sha": "1b1e1259738117b76904eac72ee366b987e3153a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" - } - }, - { - "ref": "refs/tags/github-api-1.93", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", - "object": { - "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" - } - }, - { - "ref": "refs/tags/github-api-1.94", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", - "object": { - "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" - } - }, - { - "ref": "refs/tags/github-api-1.95", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", - "object": { - "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" - } - }, - { - "ref": "refs/tags/github-api-1.99", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", - "object": { - "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" - } - }, - { - "ref": "refs/tags/github-api-1.100", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", - "object": { - "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" - } - }, - { - "ref": "refs/tags/github-api-1.101", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", - "object": { - "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" - } - }, - { - "ref": "refs/tags/github-api-1.102", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", - "object": { - "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" - } - }, - { - "ref": "refs/tags/github-api-1.103", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", - "object": { - "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" - } - }, - { - "ref": "refs/tags/github-api-1.105", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", - "object": { - "sha": "14cd5255819306a1fb45735eb7d14d7739573944", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" - } - }, - { - "ref": "refs/tags/github-api-1.106", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", - "object": { - "sha": "52602056ac604678c26fedc81187afd1710e58c4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" - } - }, - { - "ref": "refs/tags/github-api-1.107", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", - "object": { - "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" - } - }, - { - "ref": "refs/tags/github-api-1.108", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", - "object": { - "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" - } - }, - { - "ref": "refs/tags/github-api-1.109", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", - "object": { - "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" - } - }, - { - "ref": "refs/tags/github-api-1.110", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", - "object": { - "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" - } - }, - { - "ref": "refs/tags/github-api-1.111", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", - "object": { - "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" - } - }, - { - "ref": "refs/tags/github-api-1.112", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", - "object": { - "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" - } - }, - { - "ref": "refs/tags/github-api-1.113", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", - "object": { - "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" - } - }, - { - "ref": "refs/tags/github-api-1.114", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", - "object": { - "sha": "09152a185182043ecdd869bf3d358507c68dc74f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" - } - }, - { - "ref": "refs/tags/github-api-1.115", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", - "object": { - "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json deleted file mode 100644 index b02aa5ae1..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-25.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.24", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.24", - "object": { - "sha": "ee4395560dd35c4efb5139cc434f7a2efb02e7e7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ee4395560dd35c4efb5139cc434f7a2efb02e7e7" - } - }, - { - "ref": "refs/tags/github-api-1.25", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.25", - "object": { - "sha": "4ad54f0bf8345341f2165390ec877997b2a90240", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4ad54f0bf8345341f2165390ec877997b2a90240" - } - }, - { - "ref": "refs/tags/github-api-1.26", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", - "object": { - "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" - } - }, - { - "ref": "refs/tags/github-api-1.27", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", - "object": { - "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" - } - }, - { - "ref": "refs/tags/github-api-1.28", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", - "object": { - "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" - } - }, - { - "ref": "refs/tags/github-api-1.29", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", - "object": { - "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" - } - }, - { - "ref": "refs/tags/github-api-1.30", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", - "object": { - "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" - } - }, - { - "ref": "refs/tags/github-api-1.31", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", - "object": { - "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" - } - }, - { - "ref": "refs/tags/github-api-1.32", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", - "object": { - "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" - } - }, - { - "ref": "refs/tags/github-api-1.33", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", - "object": { - "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" - } - }, - { - "ref": "refs/tags/github-api-1.34", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", - "object": { - "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" - } - }, - { - "ref": "refs/tags/github-api-1.35", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", - "object": { - "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" - } - }, - { - "ref": "refs/tags/github-api-1.36", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", - "object": { - "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" - } - }, - { - "ref": "refs/tags/github-api-1.37", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", - "object": { - "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" - } - }, - { - "ref": "refs/tags/github-api-1.38", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", - "object": { - "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" - } - }, - { - "ref": "refs/tags/github-api-1.39", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", - "object": { - "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" - } - }, - { - "ref": "refs/tags/github-api-1.40", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", - "object": { - "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" - } - }, - { - "ref": "refs/tags/github-api-1.41", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", - "object": { - "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" - } - }, - { - "ref": "refs/tags/github-api-1.42", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", - "object": { - "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" - } - }, - { - "ref": "refs/tags/github-api-1.43", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", - "object": { - "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" - } - }, - { - "ref": "refs/tags/github-api-1.44", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", - "object": { - "sha": "ad078dccb3fa360f886df0497fab386529755c28", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" - } - }, - { - "ref": "refs/tags/github-api-1.45", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", - "object": { - "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" - } - }, - { - "ref": "refs/tags/github-api-1.46", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", - "object": { - "sha": "326e30416e7b59dc7da160a1200febcb06028a56", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" - } - }, - { - "ref": "refs/tags/github-api-1.47", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", - "object": { - "sha": "93a0f691d878e28631431ebda37741ec249bd56e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" - } - }, - { - "ref": "refs/tags/github-api-1.48", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", - "object": { - "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" - } - }, - { - "ref": "refs/tags/github-api-1.49", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", - "object": { - "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" - } - }, - { - "ref": "refs/tags/github-api-1.50", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", - "object": { - "sha": "8d68f72be9530037b010e5a134513660b91b934d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" - } - }, - { - "ref": "refs/tags/github-api-1.51", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", - "object": { - "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" - } - }, - { - "ref": "refs/tags/github-api-1.52", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", - "object": { - "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" - } - }, - { - "ref": "refs/tags/github-api-1.53", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", - "object": { - "sha": "5df544a638af2e534db5144edbdcd47e2792c388", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json deleted file mode 100644 index 66d59662d..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-26.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.54", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", - "object": { - "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" - } - }, - { - "ref": "refs/tags/github-api-1.55", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", - "object": { - "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" - } - }, - { - "ref": "refs/tags/github-api-1.56", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", - "object": { - "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" - } - }, - { - "ref": "refs/tags/github-api-1.57", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", - "object": { - "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" - } - }, - { - "ref": "refs/tags/github-api-1.58", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", - "object": { - "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" - } - }, - { - "ref": "refs/tags/github-api-1.59", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", - "object": { - "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" - } - }, - { - "ref": "refs/tags/github-api-1.60", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", - "object": { - "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" - } - }, - { - "ref": "refs/tags/github-api-1.61", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", - "object": { - "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" - } - }, - { - "ref": "refs/tags/github-api-1.62", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", - "object": { - "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" - } - }, - { - "ref": "refs/tags/github-api-1.63", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", - "object": { - "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" - } - }, - { - "ref": "refs/tags/github-api-1.64", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", - "object": { - "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" - } - }, - { - "ref": "refs/tags/github-api-1.66", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", - "object": { - "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" - } - }, - { - "ref": "refs/tags/github-api-1.67", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", - "object": { - "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" - } - }, - { - "ref": "refs/tags/github-api-1.68", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", - "object": { - "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" - } - }, - { - "ref": "refs/tags/github-api-1.69", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", - "object": { - "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" - } - }, - { - "ref": "refs/tags/github-api-1.70", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", - "object": { - "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" - } - }, - { - "ref": "refs/tags/github-api-1.71", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", - "object": { - "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" - } - }, - { - "ref": "refs/tags/github-api-1.72", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", - "object": { - "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" - } - }, - { - "ref": "refs/tags/github-api-1.73", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", - "object": { - "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" - } - }, - { - "ref": "refs/tags/github-api-1.74", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", - "object": { - "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" - } - }, - { - "ref": "refs/tags/github-api-1.75", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", - "object": { - "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" - } - }, - { - "ref": "refs/tags/github-api-1.76", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", - "object": { - "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" - } - }, - { - "ref": "refs/tags/github-api-1.77", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", - "object": { - "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" - } - }, - { - "ref": "refs/tags/github-api-1.78", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", - "object": { - "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" - } - }, - { - "ref": "refs/tags/github-api-1.79", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", - "object": { - "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" - } - }, - { - "ref": "refs/tags/github-api-1.80", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", - "object": { - "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" - } - }, - { - "ref": "refs/tags/github-api-1.81", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", - "object": { - "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" - } - }, - { - "ref": "refs/tags/github-api-1.82", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", - "object": { - "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" - } - }, - { - "ref": "refs/tags/github-api-1.83", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", - "object": { - "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" - } - }, - { - "ref": "refs/tags/github-api-1.84", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", - "object": { - "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json deleted file mode 100644 index 6b26d3e8c..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-27.json +++ /dev/null @@ -1,272 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.85", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", - "object": { - "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" - } - }, - { - "ref": "refs/tags/github-api-1.86", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", - "object": { - "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" - } - }, - { - "ref": "refs/tags/github-api-1.87", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", - "object": { - "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" - } - }, - { - "ref": "refs/tags/github-api-1.88", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", - "object": { - "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" - } - }, - { - "ref": "refs/tags/github-api-1.89", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", - "object": { - "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" - } - }, - { - "ref": "refs/tags/github-api-1.90", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", - "object": { - "sha": "63678b8f6548553012b44e4f74ab1520918e502a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" - } - }, - { - "ref": "refs/tags/github-api-1.91", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", - "object": { - "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" - } - }, - { - "ref": "refs/tags/github-api-1.92", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", - "object": { - "sha": "1b1e1259738117b76904eac72ee366b987e3153a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" - } - }, - { - "ref": "refs/tags/github-api-1.93", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", - "object": { - "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" - } - }, - { - "ref": "refs/tags/github-api-1.94", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", - "object": { - "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" - } - }, - { - "ref": "refs/tags/github-api-1.95", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", - "object": { - "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" - } - }, - { - "ref": "refs/tags/github-api-1.99", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", - "object": { - "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" - } - }, - { - "ref": "refs/tags/github-api-1.100", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", - "object": { - "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" - } - }, - { - "ref": "refs/tags/github-api-1.101", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", - "object": { - "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" - } - }, - { - "ref": "refs/tags/github-api-1.102", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", - "object": { - "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" - } - }, - { - "ref": "refs/tags/github-api-1.103", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", - "object": { - "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" - } - }, - { - "ref": "refs/tags/github-api-1.105", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", - "object": { - "sha": "14cd5255819306a1fb45735eb7d14d7739573944", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" - } - }, - { - "ref": "refs/tags/github-api-1.106", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", - "object": { - "sha": "52602056ac604678c26fedc81187afd1710e58c4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" - } - }, - { - "ref": "refs/tags/github-api-1.107", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", - "object": { - "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" - } - }, - { - "ref": "refs/tags/github-api-1.108", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", - "object": { - "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" - } - }, - { - "ref": "refs/tags/github-api-1.109", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", - "object": { - "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" - } - }, - { - "ref": "refs/tags/github-api-1.110", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", - "object": { - "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" - } - }, - { - "ref": "refs/tags/github-api-1.111", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", - "object": { - "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" - } - }, - { - "ref": "refs/tags/github-api-1.112", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", - "object": { - "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" - } - }, - { - "ref": "refs/tags/github-api-1.113", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", - "object": { - "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" - } - }, - { - "ref": "refs/tags/github-api-1.114", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", - "object": { - "sha": "09152a185182043ecdd869bf3d358507c68dc74f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" - } - }, - { - "ref": "refs/tags/github-api-1.115", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", - "object": { - "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json deleted file mode 100644 index 7a10f9804..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-5.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.26", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.26", - "object": { - "sha": "93b349d10035fcc9fbb9d02a8d59bb811d94a80d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93b349d10035fcc9fbb9d02a8d59bb811d94a80d" - } - }, - { - "ref": "refs/tags/github-api-1.27", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.27", - "object": { - "sha": "17024bcc6f7d1b7946a9c6b833f99ea36d0b821f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/17024bcc6f7d1b7946a9c6b833f99ea36d0b821f" - } - }, - { - "ref": "refs/tags/github-api-1.28", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.28", - "object": { - "sha": "b43bd0756b34faf3c65e8f763859359003b5bf0d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b43bd0756b34faf3c65e8f763859359003b5bf0d" - } - }, - { - "ref": "refs/tags/github-api-1.29", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.29", - "object": { - "sha": "c276c4226cf208c1e9f4fe414a282f0b662291cf", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c276c4226cf208c1e9f4fe414a282f0b662291cf" - } - }, - { - "ref": "refs/tags/github-api-1.30", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.30", - "object": { - "sha": "5bb369f0b9dc281c7e5ae39eb4d21ec410e08971", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5bb369f0b9dc281c7e5ae39eb4d21ec410e08971" - } - }, - { - "ref": "refs/tags/github-api-1.31", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.31", - "object": { - "sha": "a5f5491697af1b2149d65bfb46be9ac4d7c7c43f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a5f5491697af1b2149d65bfb46be9ac4d7c7c43f" - } - }, - { - "ref": "refs/tags/github-api-1.32", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.32", - "object": { - "sha": "8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8b493dcaef2f5f7f300d2e0a7ff69b4309aaa767" - } - }, - { - "ref": "refs/tags/github-api-1.33", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.33", - "object": { - "sha": "725403434d9f000053b5ec13ee755c627de4c3c5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/725403434d9f000053b5ec13ee755c627de4c3c5" - } - }, - { - "ref": "refs/tags/github-api-1.34", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.34", - "object": { - "sha": "36d913a9a10f74ac60d28954252a94fc2f2f1422", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/36d913a9a10f74ac60d28954252a94fc2f2f1422" - } - }, - { - "ref": "refs/tags/github-api-1.35", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.35", - "object": { - "sha": "44b951c947b8d4d0f57cb07a4b57cf466ca1898e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/44b951c947b8d4d0f57cb07a4b57cf466ca1898e" - } - }, - { - "ref": "refs/tags/github-api-1.36", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.36", - "object": { - "sha": "bc48a7e1151b80ded51d8bfae6ced015d4a75c15", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/bc48a7e1151b80ded51d8bfae6ced015d4a75c15" - } - }, - { - "ref": "refs/tags/github-api-1.37", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.37", - "object": { - "sha": "c08acfda82f037283e84b46ec9807dcbb14ff90c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c08acfda82f037283e84b46ec9807dcbb14ff90c" - } - }, - { - "ref": "refs/tags/github-api-1.38", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.38", - "object": { - "sha": "2651dd670a516c9dc2149b32c7a52bb63675b156", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2651dd670a516c9dc2149b32c7a52bb63675b156" - } - }, - { - "ref": "refs/tags/github-api-1.39", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.39", - "object": { - "sha": "1cafa287b06c563a467a6813a6ded750f0236ccb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1cafa287b06c563a467a6813a6ded750f0236ccb" - } - }, - { - "ref": "refs/tags/github-api-1.40", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.40", - "object": { - "sha": "0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0a7a4c12a9ed8f54267f2ffdaebf698bfa325d91" - } - }, - { - "ref": "refs/tags/github-api-1.41", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.41", - "object": { - "sha": "612ef44cdfff56ee9a22f5babae2bd5f053b3c62", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/612ef44cdfff56ee9a22f5babae2bd5f053b3c62" - } - }, - { - "ref": "refs/tags/github-api-1.42", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.42", - "object": { - "sha": "c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c6aa5e95e1f28e0bae7e1c36fdc22bc4bdf5e30c" - } - }, - { - "ref": "refs/tags/github-api-1.43", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.43", - "object": { - "sha": "3e03d0a1961e2dbc8459f839524337bd0c320a54", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e03d0a1961e2dbc8459f839524337bd0c320a54" - } - }, - { - "ref": "refs/tags/github-api-1.44", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.44", - "object": { - "sha": "ad078dccb3fa360f886df0497fab386529755c28", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ad078dccb3fa360f886df0497fab386529755c28" - } - }, - { - "ref": "refs/tags/github-api-1.45", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.45", - "object": { - "sha": "6f8e87163b9505f01cb83fb69f3d93551c945c41", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/6f8e87163b9505f01cb83fb69f3d93551c945c41" - } - }, - { - "ref": "refs/tags/github-api-1.46", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.46", - "object": { - "sha": "326e30416e7b59dc7da160a1200febcb06028a56", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/326e30416e7b59dc7da160a1200febcb06028a56" - } - }, - { - "ref": "refs/tags/github-api-1.47", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.47", - "object": { - "sha": "93a0f691d878e28631431ebda37741ec249bd56e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/93a0f691d878e28631431ebda37741ec249bd56e" - } - }, - { - "ref": "refs/tags/github-api-1.48", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.48", - "object": { - "sha": "55b6ed66e34c33698ff48f32560810e08c30021e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/55b6ed66e34c33698ff48f32560810e08c30021e" - } - }, - { - "ref": "refs/tags/github-api-1.49", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNDk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.49", - "object": { - "sha": "b5bca8e20787708629fd6fc392f48b286cda55fa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b5bca8e20787708629fd6fc392f48b286cda55fa" - } - }, - { - "ref": "refs/tags/github-api-1.50", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.50", - "object": { - "sha": "8d68f72be9530037b010e5a134513660b91b934d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d68f72be9530037b010e5a134513660b91b934d" - } - }, - { - "ref": "refs/tags/github-api-1.51", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.51", - "object": { - "sha": "e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/e0db2eb46634ab8bfc06c990ecd8ffc1bf1e30dc" - } - }, - { - "ref": "refs/tags/github-api-1.52", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.52", - "object": { - "sha": "32fc5f6f24d3ee26b715a94ca1401871de6168ac", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/32fc5f6f24d3ee26b715a94ca1401871de6168ac" - } - }, - { - "ref": "refs/tags/github-api-1.53", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.53", - "object": { - "sha": "5df544a638af2e534db5144edbdcd47e2792c388", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5df544a638af2e534db5144edbdcd47e2792c388" - } - }, - { - "ref": "refs/tags/github-api-1.54", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.54", - "object": { - "sha": "21d3b731535b22db2d0cae2435bf6e0def7b9929", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/21d3b731535b22db2d0cae2435bf6e0def7b9929" - } - }, - { - "ref": "refs/tags/github-api-1.55", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.55", - "object": { - "sha": "154c81726b7c7f87b15941b03a1c4211efd8dbda", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/154c81726b7c7f87b15941b03a1c4211efd8dbda" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json deleted file mode 100644 index 0c9102268..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-6.json +++ /dev/null @@ -1,302 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.56", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.56", - "object": { - "sha": "7a16df2f43c7bac0ffe7ff4842f617620e90a71e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7a16df2f43c7bac0ffe7ff4842f617620e90a71e" - } - }, - { - "ref": "refs/tags/github-api-1.57", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.57", - "object": { - "sha": "686a9a9befa65331e724f29dc4f90edaef30c725", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/686a9a9befa65331e724f29dc4f90edaef30c725" - } - }, - { - "ref": "refs/tags/github-api-1.58", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.58", - "object": { - "sha": "7f4d199e9f730903feeebe7d785a84550fddce59", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7f4d199e9f730903feeebe7d785a84550fddce59" - } - }, - { - "ref": "refs/tags/github-api-1.59", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.59", - "object": { - "sha": "2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/2233f48d94b5a5fdb5c26edfbe4a879b64e8ef8b" - } - }, - { - "ref": "refs/tags/github-api-1.60", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.60", - "object": { - "sha": "ac29ad10db6bcf78eaafa3b5c5b54987696701d5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ac29ad10db6bcf78eaafa3b5c5b54987696701d5" - } - }, - { - "ref": "refs/tags/github-api-1.61", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.61", - "object": { - "sha": "3103fc4f7d333a1c16c54f6d8e5529d3a9848891", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3103fc4f7d333a1c16c54f6d8e5529d3a9848891" - } - }, - { - "ref": "refs/tags/github-api-1.62", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.62", - "object": { - "sha": "4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/4042ee4a81d5e4d91c0639c7f278b4c1eaa1f50c" - } - }, - { - "ref": "refs/tags/github-api-1.63", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.63", - "object": { - "sha": "286cdc84c970cdfd1eada3498a35a48361c9326a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/286cdc84c970cdfd1eada3498a35a48361c9326a" - } - }, - { - "ref": "refs/tags/github-api-1.64", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.64", - "object": { - "sha": "3ef5f153bed2451f70a96c1398afb2caff90e987", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3ef5f153bed2451f70a96c1398afb2caff90e987" - } - }, - { - "ref": "refs/tags/github-api-1.66", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.66", - "object": { - "sha": "05806a6fcd34a47853b42ef35323ca7bbdcd2ac5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/05806a6fcd34a47853b42ef35323ca7bbdcd2ac5" - } - }, - { - "ref": "refs/tags/github-api-1.67", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.67", - "object": { - "sha": "f0ac5e6110c97c0a14fb21a2ed08f48726536b2f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f0ac5e6110c97c0a14fb21a2ed08f48726536b2f" - } - }, - { - "ref": "refs/tags/github-api-1.68", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.68", - "object": { - "sha": "56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/56e8ddc9ccfbfb3f660790ba3ee79aa4d881edaa" - } - }, - { - "ref": "refs/tags/github-api-1.69", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNjk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.69", - "object": { - "sha": "5e92c809a84496aa67e8ef1a87071b69973f516b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5e92c809a84496aa67e8ef1a87071b69973f516b" - } - }, - { - "ref": "refs/tags/github-api-1.70", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.70", - "object": { - "sha": "ff9ba0567bd412b47778f1f114f16d07de04cddd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ff9ba0567bd412b47778f1f114f16d07de04cddd" - } - }, - { - "ref": "refs/tags/github-api-1.71", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.71", - "object": { - "sha": "fef31f609ab3dee214b4d2b9f60c11c93a1048fc", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/fef31f609ab3dee214b4d2b9f60c11c93a1048fc" - } - }, - { - "ref": "refs/tags/github-api-1.72", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.72", - "object": { - "sha": "8faf9f8494dba8787d21267a7f2eebae562d908b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8faf9f8494dba8787d21267a7f2eebae562d908b" - } - }, - { - "ref": "refs/tags/github-api-1.73", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.73", - "object": { - "sha": "3e110fa450a48befd702d4f2950d4b23caebbbe4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/3e110fa450a48befd702d4f2950d4b23caebbbe4" - } - }, - { - "ref": "refs/tags/github-api-1.74", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.74", - "object": { - "sha": "09c73bb25601d1931446244dc122fb67c5bc8e4c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09c73bb25601d1931446244dc122fb67c5bc8e4c" - } - }, - { - "ref": "refs/tags/github-api-1.75", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.75", - "object": { - "sha": "0e300413317f2abafee62ee82791f57ca2959b2b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0e300413317f2abafee62ee82791f57ca2959b2b" - } - }, - { - "ref": "refs/tags/github-api-1.76", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.76", - "object": { - "sha": "f341550c2faf9c0c34024f16b851f517221caa3e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f341550c2faf9c0c34024f16b851f517221caa3e" - } - }, - { - "ref": "refs/tags/github-api-1.77", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.77", - "object": { - "sha": "30c0a1a654def21bbc83bf7c3083e21b156cb252", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/30c0a1a654def21bbc83bf7c3083e21b156cb252" - } - }, - { - "ref": "refs/tags/github-api-1.78", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.78", - "object": { - "sha": "a68d9fed405ca0a1efca21419bfd5cb20d6acac4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/a68d9fed405ca0a1efca21419bfd5cb20d6acac4" - } - }, - { - "ref": "refs/tags/github-api-1.79", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuNzk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.79", - "object": { - "sha": "8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8f4d2d3e5636227cb1d87fc7a80a72bb7f6cf425" - } - }, - { - "ref": "refs/tags/github-api-1.80", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.80", - "object": { - "sha": "02e7a1f3651439bf48360dabfc7db5f29edfab53", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/02e7a1f3651439bf48360dabfc7db5f29edfab53" - } - }, - { - "ref": "refs/tags/github-api-1.81", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.81", - "object": { - "sha": "d6470311de25cd66ddd55fbce80530954c9fa53d", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/d6470311de25cd66ddd55fbce80530954c9fa53d" - } - }, - { - "ref": "refs/tags/github-api-1.82", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.82", - "object": { - "sha": "f8d2157b4b04fbcafad051656382552b80bf3be4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f8d2157b4b04fbcafad051656382552b80bf3be4" - } - }, - { - "ref": "refs/tags/github-api-1.83", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.83", - "object": { - "sha": "132fdfab1bd6fff6dec93487ad3c35f46f16cde7", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/132fdfab1bd6fff6dec93487ad3c35f46f16cde7" - } - }, - { - "ref": "refs/tags/github-api-1.84", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.84", - "object": { - "sha": "b1edca5064f0a022a323d0d8bca46b79125bde66", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b1edca5064f0a022a323d0d8bca46b79125bde66" - } - }, - { - "ref": "refs/tags/github-api-1.85", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.85", - "object": { - "sha": "5b0b09f7d3743e49faa706435b17c1e3a65275ff", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/5b0b09f7d3743e49faa706435b17c1e3a65275ff" - } - }, - { - "ref": "refs/tags/github-api-1.86", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODY=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.86", - "object": { - "sha": "7161d312aa353222967a7a1020fa3c8fd4f9a496", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7161d312aa353222967a7a1020fa3c8fd4f9a496" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json deleted file mode 100644 index 9642a4ba7..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repositories_283171990_git_refs-7.json +++ /dev/null @@ -1,252 +0,0 @@ -[ - { - "ref": "refs/tags/github-api-1.87", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODc=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.87", - "object": { - "sha": "9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9f6e2a2a17577fdbfe2dbb2d13ac87ae4f5db827" - } - }, - { - "ref": "refs/tags/github-api-1.88", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODg=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.88", - "object": { - "sha": "7e8c80a51db5c5f7412b99a10b8746f1bffec9f5", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7e8c80a51db5c5f7412b99a10b8746f1bffec9f5" - } - }, - { - "ref": "refs/tags/github-api-1.89", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuODk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.89", - "object": { - "sha": "0bac02e24e38a915e4d9629cc7059ebb9b484a6c", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0bac02e24e38a915e4d9629cc7059ebb9b484a6c" - } - }, - { - "ref": "refs/tags/github-api-1.90", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTA=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.90", - "object": { - "sha": "63678b8f6548553012b44e4f74ab1520918e502a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/63678b8f6548553012b44e4f74ab1520918e502a" - } - }, - { - "ref": "refs/tags/github-api-1.91", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTE=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.91", - "object": { - "sha": "b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b41ec1a26ddc3d4206da0083f4f7c85493b9c0cd" - } - }, - { - "ref": "refs/tags/github-api-1.92", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTI=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.92", - "object": { - "sha": "1b1e1259738117b76904eac72ee366b987e3153a", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/1b1e1259738117b76904eac72ee366b987e3153a" - } - }, - { - "ref": "refs/tags/github-api-1.93", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTM=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.93", - "object": { - "sha": "9702d62c85174fb6a03e1db68b794d0e72dc4b77", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9702d62c85174fb6a03e1db68b794d0e72dc4b77" - } - }, - { - "ref": "refs/tags/github-api-1.94", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTQ=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.94", - "object": { - "sha": "b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/b9a13350390c77f2e2ee8e6c27552e5e4d14cb1b" - } - }, - { - "ref": "refs/tags/github-api-1.95", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTU=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.95", - "object": { - "sha": "7d163f997a8f4a8aeda87974a595b2c51bb84565", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7d163f997a8f4a8aeda87974a595b2c51bb84565" - } - }, - { - "ref": "refs/tags/github-api-1.99", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuOTk=", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.99", - "object": { - "sha": "ec5c6031e674e8583f677b18b0f30680ca8ee945", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/ec5c6031e674e8583f677b18b0f30680ca8ee945" - } - }, - { - "ref": "refs/tags/github-api-1.100", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.100", - "object": { - "sha": "7b8584ec7bf71568be5ab9249ee6062a69ce205e", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/7b8584ec7bf71568be5ab9249ee6062a69ce205e" - } - }, - { - "ref": "refs/tags/github-api-1.101", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.101", - "object": { - "sha": "c64dd98de91cb66b45d146feb951b7cf560b712b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/c64dd98de91cb66b45d146feb951b7cf560b712b" - } - }, - { - "ref": "refs/tags/github-api-1.102", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.102", - "object": { - "sha": "9360c548efd4353b9a6b44fab59c3fc7bea94c61", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9360c548efd4353b9a6b44fab59c3fc7bea94c61" - } - }, - { - "ref": "refs/tags/github-api-1.103", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTAz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.103", - "object": { - "sha": "0245d69287dbee08d8f7b59b680d9df73712bdba", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/0245d69287dbee08d8f7b59b680d9df73712bdba" - } - }, - { - "ref": "refs/tags/github-api-1.105", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.105", - "object": { - "sha": "14cd5255819306a1fb45735eb7d14d7739573944", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/14cd5255819306a1fb45735eb7d14d7739573944" - } - }, - { - "ref": "refs/tags/github-api-1.106", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA2", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.106", - "object": { - "sha": "52602056ac604678c26fedc81187afd1710e58c4", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/52602056ac604678c26fedc81187afd1710e58c4" - } - }, - { - "ref": "refs/tags/github-api-1.107", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA3", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.107", - "object": { - "sha": "68fc376fc5b7b832366fda989ea912e1a9bf7503", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/68fc376fc5b7b832366fda989ea912e1a9bf7503" - } - }, - { - "ref": "refs/tags/github-api-1.108", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA4", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.108", - "object": { - "sha": "62d720e26f4a5daa646d8c5fcd3771b825f749d1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/62d720e26f4a5daa646d8c5fcd3771b825f749d1" - } - }, - { - "ref": "refs/tags/github-api-1.109", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTA5", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.109", - "object": { - "sha": "08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/08e4eb3a0ae5ccfbe27b0661e5ef5ba0b13750e1" - } - }, - { - "ref": "refs/tags/github-api-1.110", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEw", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.110", - "object": { - "sha": "9cfc518cf832f7f932cc7e3fee95eb77450b18d6", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/9cfc518cf832f7f932cc7e3fee95eb77450b18d6" - } - }, - { - "ref": "refs/tags/github-api-1.111", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEx", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.111", - "object": { - "sha": "be8cb0a6b28e20563abf0e10c5869af5876907cb", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/be8cb0a6b28e20563abf0e10c5869af5876907cb" - } - }, - { - "ref": "refs/tags/github-api-1.112", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEy", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.112", - "object": { - "sha": "dc130ed7933caeb82aee314315e3d94977a566e8", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/dc130ed7933caeb82aee314315e3d94977a566e8" - } - }, - { - "ref": "refs/tags/github-api-1.113", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTEz", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.113", - "object": { - "sha": "f62957a11a171c15106bc1896f8b280c55c9500b", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/f62957a11a171c15106bc1896f8b280c55c9500b" - } - }, - { - "ref": "refs/tags/github-api-1.114", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE0", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.114", - "object": { - "sha": "09152a185182043ecdd869bf3d358507c68dc74f", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/09152a185182043ecdd869bf3d358507c68dc74f" - } - }, - { - "ref": "refs/tags/github-api-1.115", - "node_id": "MDM6UmVmMjgzMTcxOTkwOnJlZnMvdGFncy9naXRodWItYXBpLTEuMTE1", - "url": "https://api.github.com/repos/JKalash/github-api/git/refs/tags/github-api-1.115", - "object": { - "sha": "8d0f89f0c54e147877e129dad9a91c11aaf3c0c1", - "type": "tag", - "url": "https://api.github.com/repos/JKalash/github-api/git/tags/8d0f89f0c54e147877e129dad9a91c11aaf3c0c1" - } - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json index ac08c7bd8..00cf4f0f4 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/user-1.json @@ -1,46 +1,46 @@ { - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", "type": "User", "site_admin": false, - "name": "Joe Kalash", - "company": "@Palantir", - "blog": "https://jkala.sh", - "location": "London, UK", - "email": null, + "name": "Liam Newman", + "company": "Cloudbees, Inc.", + "blog": "", + "location": "Seattle, WA, USA", + "email": "bitwiseman@gmail.com", "hireable": null, - "bio": "Finite State Machine\r\n☕️ ＋ 🖥 → 🎉", - "twitter_username": null, - "public_repos": 33, - "public_gists": 6, - "followers": 14, - "following": 1, - "created_at": "2014-10-08T04:39:42Z", - "updated_at": "2020-07-28T10:50:06Z", - "private_gists": 26, - "total_private_repos": 24, - "owned_private_repos": 23, - "disk_usage": 710959, - "collaborators": 4, + "bio": null, + "twitter_username": "bitwiseman", + "public_repos": 197, + "public_gists": 7, + "followers": 164, + "following": 9, + "created_at": "2012-07-11T20:38:33Z", + "updated_at": "2020-07-27T20:21:05Z", + "private_gists": 19, + "total_private_repos": 13, + "owned_private_repos": 0, + "disk_usage": 33700, + "collaborators": 0, "two_factor_authentication": true, "plan": { - "name": "pro", + "name": "free", "space": 976562499, "collaborators": 0, - "private_repos": 9999 + "private_repos": 10000 } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json deleted file mode 100644 index ac08c7bd8..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/users_jkalash-2.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "login": "JKalash", - "id": 9067991, - "node_id": "MDQ6VXNlcjkwNjc5OTE=", - "avatar_url": "https://avatars2.githubusercontent.com/u/9067991?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/JKalash", - "html_url": "https://github.com/JKalash", - "followers_url": "https://api.github.com/users/JKalash/followers", - "following_url": "https://api.github.com/users/JKalash/following{/other_user}", - "gists_url": "https://api.github.com/users/JKalash/gists{/gist_id}", - "starred_url": "https://api.github.com/users/JKalash/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/JKalash/subscriptions", - "organizations_url": "https://api.github.com/users/JKalash/orgs", - "repos_url": "https://api.github.com/users/JKalash/repos", - "events_url": "https://api.github.com/users/JKalash/events{/privacy}", - "received_events_url": "https://api.github.com/users/JKalash/received_events", - "type": "User", - "site_admin": false, - "name": "Joe Kalash", - "company": "@Palantir", - "blog": "https://jkala.sh", - "location": "London, UK", - "email": null, - "hireable": null, - "bio": "Finite State Machine\r\n☕️ ＋ 🖥 → 🎉", - "twitter_username": null, - "public_repos": 33, - "public_gists": 6, - "followers": 14, - "following": 1, - "created_at": "2014-10-08T04:39:42Z", - "updated_at": "2020-07-28T10:50:06Z", - "private_gists": 26, - "total_private_repos": 24, - "owned_private_repos": 23, - "disk_usage": 710959, - "collaborators": 4, - "two_factor_authentication": true, - "plan": { - "name": "pro", - "space": 976562499, - "collaborators": 0, - "private_repos": 9999 - } -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json similarity index 56% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json index b08b3a0a6..4656d1fad 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api-3.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json @@ -1,8 +1,8 @@ { - "id": "bbb0c538-a921-45e0-a827-b06a3e441481", - "name": "repos_jkalash_github-api", + "id": "1382068f-7dc2-4750-8f69-b134d933a86a", + "name": "repos_hub4j-test-org_temp-testmergebranch", "request": { - "url": "/repos/JKalash/github-api", + "url": "/repos/hub4j-test-org/temp-testMergeBranch", "method": "GET", "headers": { "Accept": { @@ -12,24 +12,24 @@ }, "response": { "status": 200, - "bodyFileName": "repos_jkalash_github-api-3.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch-2.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:04 GMT", + "Date": "Tue, 28 Jul 2020 18:18:50 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4822", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4978", + "X-RateLimit-Reset": "1595963742", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"225d4ef8f9c75faa65ac4d3df7527871\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "W/\"8baa1cc09eff727a91205596c765b366\"", + "Last-Modified": "Tue, 28 Jul 2020 18:18:49 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -38,10 +38,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CE64E:F5BAD09:5F202A00" + "X-GitHub-Request-Id": "E982:6301:AA10A:D1D96:5F206C03" } }, - "uuid": "bbb0c538-a921-45e0-a827-b06a3e441481", + "uuid": "1382068f-7dc2-4750-8f69-b134d933a86a", "persistent": true, - "insertionIndex": 3 + "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json similarity index 57% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json index 7ae7696f7..3e2f0d7ab 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/users_jkalash-2.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json @@ -1,8 +1,8 @@ { - "id": "a122908a-bcd1-4070-947c-a12b56cc2d8d", - "name": "users_jkalash", + "id": "b86dce11-724f-4230-8937-4c70593adc83", + "name": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1", "request": { - "url": "/users/jkalash", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch1", "method": "GET", "headers": { "Accept": { @@ -12,24 +12,23 @@ }, "response": { "status": 200, - "bodyFileName": "users_jkalash-2.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:04 GMT", + "Date": "Tue, 28 Jul 2020 18:18:54 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4823", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4971", + "X-RateLimit-Reset": "1595963742", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"e6155dfc67e897e2293faef7dab8f8a5\"", - "Last-Modified": "Tue, 28 Jul 2020 10:50:06 GMT", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "W/\"7c53ab1d566b514959e33921ed458278\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -38,10 +37,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CE5A0:F5BAA19:5F2029FF" + "X-GitHub-Request-Id": "E982:6301:AA236:D211C:5F206C0E" } }, - "uuid": "a122908a-bcd1-4070-947c-a12b56cc2d8d", + "uuid": "b86dce11-724f-4230-8937-4c70593adc83", "persistent": true, - "insertionIndex": 2 + "insertionIndex": 9 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json similarity index 56% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json index 39852c288..14210f4d9 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch2-21.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json @@ -1,8 +1,8 @@ { - "id": "cb050ca6-bf5b-4e86-9853-26ba676a15eb", - "name": "repos_jkalash_github-api_branches_testbranch2", + "id": "77f61de8-e2a7-4a98-9504-96cd1eca9814", + "name": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2", "request": { - "url": "/repos/JKalash/github-api/branches/testBranch2", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch2", "method": "GET", "headers": { "Accept": { @@ -12,23 +12,23 @@ }, "response": { "status": 200, - "bodyFileName": "repos_jkalash_github-api_branches_testbranch2-21.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:14 GMT", + "Date": "Tue, 28 Jul 2020 18:18:54 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4804", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4972", + "X-RateLimit-Reset": "1595963742", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"9c5e838f70c973f6493d12e36751ca35\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "W/\"643d430eeaecb29bcfc6ca6c2c8e4cac\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -37,10 +37,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D0263:F5BCB9E:5F202A09" + "X-GitHub-Request-Id": "E982:6301:AA22A:D20FB:5F206C0D" } }, - "uuid": "cb050ca6-bf5b-4e86-9853-26ba676a15eb", + "uuid": "77f61de8-e2a7-4a98-9504-96cd1eca9814", "persistent": true, - "insertionIndex": 21 + "insertionIndex": 8 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json similarity index 61% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json index 0694051ab..c36bffb2f 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch1-14.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json @@ -1,8 +1,8 @@ { - "id": "ee2d1ed0-0a88-4bdc-9986-3ee2ec1ca9ae", - "name": "repos_jkalash_github-api_contents_testbranch1", + "id": "c88aabbb-cd4a-412b-8cc8-f760a712f2c0", + "name": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1", "request": { - "url": "/repos/JKalash/github-api/contents/testBranch1", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch1", "method": "PUT", "headers": { "Accept": { @@ -19,23 +19,23 @@ }, "response": { "status": 201, - "bodyFileName": "repos_jkalash_github-api_contents_testbranch1-14.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:10 GMT", + "Date": "Tue, 28 Jul 2020 18:18:52 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4811", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4975", + "X-RateLimit-Reset": "1595963742", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"6948edb3e89f8ce4e617ded176d58742\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "\"6ac8992b1f760b21e3f96d9757358151\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -44,10 +44,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF4DD:F5BBE69:5F202A05" + "X-GitHub-Request-Id": "E982:6301:AA157:D2000:5F206C0B" } }, - "uuid": "ee2d1ed0-0a88-4bdc-9986-3ee2ec1ca9ae", + "uuid": "c88aabbb-cd4a-412b-8cc8-f760a712f2c0", "persistent": true, - "insertionIndex": 14 + "insertionIndex": 5 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json similarity index 61% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json index f12eba5b8..5686895f1 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_contents_testbranch2-20.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json @@ -1,8 +1,8 @@ { - "id": "858e4c8f-24b8-4c37-9043-13720a8f491f", - "name": "repos_jkalash_github-api_contents_testbranch2", + "id": "d9cb5e0c-066a-4e74-9df9-b361f250edbc", + "name": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2", "request": { - "url": "/repos/JKalash/github-api/contents/testBranch2", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch2", "method": "PUT", "headers": { "Accept": { @@ -19,23 +19,23 @@ }, "response": { "status": 201, - "bodyFileName": "repos_jkalash_github-api_contents_testbranch2-20.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:13 GMT", + "Date": "Tue, 28 Jul 2020 18:18:53 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4805", - "X-RateLimit-Reset": "1595945514", + "X-RateLimit-Remaining": "4973", + "X-RateLimit-Reset": "1595963741", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"08ae7f25fe0a70fd278e8ce093d05254\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "\"bd560f0693dce50493fb4c42b6ac6d0c\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -44,10 +44,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CFCFD:F5BC81F:5F202A08" + "X-GitHub-Request-Id": "E982:6301:AA1E4:D20BA:5F206C0C" } }, - "uuid": "858e4c8f-24b8-4c37-9043-13720a8f491f", + "uuid": "d9cb5e0c-066a-4e74-9df9-b361f250edbc", "persistent": true, - "insertionIndex": 20 + "insertionIndex": 7 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json similarity index 57% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json index 3918a94d0..13ebcb0de 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-13.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json @@ -1,8 +1,8 @@ { - "id": "aaa8c9d4-ff33-48f9-8a98-5ddcec825d8c", - "name": "repos_jkalash_github-api_git_refs", + "id": "0510a368-9cc3-4d0e-9cb2-7ec36bdf2ea2", + "name": "repos_hub4j-test-org_temp-testmergebranch_git_refs", "request": { - "url": "/repos/JKalash/github-api/git/refs", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/git/refs", "method": "POST", "headers": { "Accept": { @@ -11,7 +11,7 @@ }, "bodyPatterns": [ { - "equalToJson": "{\"ref\":\"refs/heads/testBranch1\",\"sha\":\"67dc6d2d23ad42d4d411592d0057905ee084ae4d\"}", + "equalToJson": "{\"ref\":\"refs/heads/testBranch1\",\"sha\":\"486418cfccc351dc18b68d0d8c699eefa504aec6\"}", "ignoreArrayOrder": true, "ignoreExtraElements": false } @@ -19,25 +19,25 @@ }, "response": { "status": 201, - "bodyFileName": "repos_jkalash_github-api_git_refs-13.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:09 GMT", + "Date": "Tue, 28 Jul 2020 18:18:51 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4812", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4976", + "X-RateLimit-Reset": "1595963742", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"8a06075747ed4af790d8b6ace0fe85a3\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "\"c8d07c44c27014a80f409b1dbf99cfd3\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", - "Location": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch1", + "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch1", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Frame-Options": "deny", @@ -45,10 +45,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF2B7:F5BBBD5:5F202A04" + "X-GitHub-Request-Id": "E982:6301:AA125:D1FCF:5F206C0A" } }, - "uuid": "aaa8c9d4-ff33-48f9-8a98-5ddcec825d8c", + "uuid": "0510a368-9cc3-4d0e-9cb2-7ec36bdf2ea2", "persistent": true, - "insertionIndex": 13 + "insertionIndex": 4 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json similarity index 57% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json index 2a379e023..0e44eff0d 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-19.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json @@ -1,8 +1,8 @@ { - "id": "d7c399ed-b545-4273-9bd8-f44ff6e60137", - "name": "repos_jkalash_github-api_git_refs", + "id": "ecce543d-da7c-49ac-b13d-09a2c925524b", + "name": "repos_hub4j-test-org_temp-testmergebranch_git_refs", "request": { - "url": "/repos/JKalash/github-api/git/refs", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/git/refs", "method": "POST", "headers": { "Accept": { @@ -11,7 +11,7 @@ }, "bodyPatterns": [ { - "equalToJson": "{\"ref\":\"refs/heads/testBranch2\",\"sha\":\"67dc6d2d23ad42d4d411592d0057905ee084ae4d\"}", + "equalToJson": "{\"ref\":\"refs/heads/testBranch2\",\"sha\":\"486418cfccc351dc18b68d0d8c699eefa504aec6\"}", "ignoreArrayOrder": true, "ignoreExtraElements": false } @@ -19,25 +19,25 @@ }, "response": { "status": 201, - "bodyFileName": "repos_jkalash_github-api_git_refs-19.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:12 GMT", + "Date": "Tue, 28 Jul 2020 18:18:52 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4806", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4974", + "X-RateLimit-Reset": "1595963741", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"6ede647acf123580f6db8f300e8241b5\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "\"e22d7994904ab29ab32a2c00756ed4c7\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", - "Location": "https://api.github.com/repos/JKalash/github-api/git/refs/heads/testBranch2", + "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch2", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Frame-Options": "deny", @@ -45,10 +45,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CFA94:F5BC56A:5F202A07" + "X-GitHub-Request-Id": "E982:6301:AA1A8:D2071:5F206C0C" } }, - "uuid": "d7c399ed-b545-4273-9bd8-f44ff6e60137", + "uuid": "ecce543d-da7c-49ac-b13d-09a2c925524b", "persistent": true, - "insertionIndex": 19 + "insertionIndex": 6 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json similarity index 55% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json index c2ca923b3..79229e875 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_master-8.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json @@ -1,8 +1,8 @@ { - "id": "35c8ed6c-5da6-40d0-8f2a-df2e448ed661", - "name": "repos_jkalash_github-api_git_refs_heads_master", + "id": "58813089-f68a-4e42-8258-ab6068b15431", + "name": "repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master", "request": { - "url": "/repos/JKalash/github-api/git/refs/heads/master", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/master", "method": "GET", "headers": { "Accept": { @@ -12,25 +12,25 @@ }, "response": { "status": 200, - "bodyFileName": "repos_jkalash_github-api_git_refs_heads_master-8.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:07 GMT", + "Date": "Tue, 28 Jul 2020 18:18:50 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4817", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4977", + "X-RateLimit-Reset": "1595963742", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"c8cdf4a2fe7e6f2985815cf4a922c10a\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", + "ETag": "W/\"5bf6a1f57b59a59055f972183109f5e2\"", + "Last-Modified": "Tue, 28 Jul 2020 18:18:49 GMT", "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -39,10 +39,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CEFA1:F5BB4A1:5F202A02" + "X-GitHub-Request-Id": "E982:6301:AA11B:D1FBE:5F206C0A" } }, - "uuid": "35c8ed6c-5da6-40d0-8f2a-df2e448ed661", + "uuid": "58813089-f68a-4e42-8258-ab6068b15431", "persistent": true, - "insertionIndex": 8 + "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json similarity index 59% rename from src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json rename to src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json index 5cc5e3ebc..792aafcc8 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_merges-23.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json @@ -1,8 +1,8 @@ { - "id": "f23aca40-3070-4e8c-bee4-236dff451881", - "name": "repos_jkalash_github-api_merges", + "id": "c946e38f-79c8-4606-a544-116fed67ff28", + "name": "repos_hub4j-test-org_temp-testmergebranch_merges", "request": { - "url": "/repos/JKalash/github-api/merges", + "url": "/repos/hub4j-test-org/temp-testMergeBranch/merges", "method": "POST", "headers": { "Accept": { @@ -19,25 +19,25 @@ }, "response": { "status": 201, - "bodyFileName": "repos_jkalash_github-api_merges-23.json", + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_merges-10.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:15 GMT", + "Date": "Tue, 28 Jul 2020 18:18:55 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4802", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4970", + "X-RateLimit-Reset": "1595963741", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"529089f37187d516ea2bf57ac9ed47f1\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "\"990b10169f450d12eabb23a2c7616adf\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", - "Location": "https://api.github.com/repos/JKalash/github-api/commits/069f4fc82ffc4f068e64e9339c87315de696bd8d", + "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Frame-Options": "deny", @@ -45,10 +45,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D035F:F5BD02D:5F202A0A" + "X-GitHub-Request-Id": "E982:6301:AA24C:D213D:5F206C0E" } }, - "uuid": "f23aca40-3070-4e8c-bee4-236dff451881", + "uuid": "c946e38f-79c8-4606-a544-116fed67ff28", "persistent": true, - "insertionIndex": 23 + "insertionIndex": 10 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json deleted file mode 100644 index cb91d4361..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_branches_testbranch1-22.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "id": "ae7ac5f2-9482-4ab6-881e-01e4f16a195b", - "name": "repos_jkalash_github-api_branches_testbranch1", - "request": { - "url": "/repos/JKalash/github-api/branches/testBranch1", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_jkalash_github-api_branches_testbranch1-22.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:14 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4803", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"374c96641d3ab66cbda64097b31dec94\"", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D02D8:F5BCF8A:5F202A0A" - } - }, - "uuid": "ae7ac5f2-9482-4ab6-881e-01e4f16a195b", - "persistent": true, - "insertionIndex": 22 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json deleted file mode 100644 index 3ff14b523..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-15.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "473fcf8f-4c4b-4d14-b970-2c76e3fe9ec9", - "name": "repos_jkalash_github-api_git_refs", - "request": { - "url": "/repos/JKalash/github-api/git/refs", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_jkalash_github-api_git_refs-15.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:10 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4810", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"24b39fd086ef661b89619b57125ecf4a\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF7D3:F5BC210:5F202A06", - "Link": "; rel=\"next\", ; rel=\"last\"" - } - }, - "uuid": "473fcf8f-4c4b-4d14-b970-2c76e3fe9ec9", - "persistent": true, - "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", - "requiredScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-3", - "newScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-4", - "insertionIndex": 15 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json deleted file mode 100644 index f5b2f692d..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-24.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "id": "8e0119e1-c25b-406c-a49d-e5916d1ef8a2", - "name": "repos_jkalash_github-api_git_refs", - "request": { - "url": "/repos/JKalash/github-api/git/refs", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_jkalash_github-api_git_refs-24.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:16 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4801", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"8f8bcee2de56b603461b85a24e1dfe1f\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D0741:F5BD4AB:5F202A0B", - "Link": "; rel=\"next\", ; rel=\"last\"" - } - }, - "uuid": "8e0119e1-c25b-406c-a49d-e5916d1ef8a2", - "persistent": true, - "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", - "requiredScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-4", - "insertionIndex": 24 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json deleted file mode 100644 index 46722a8f5..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-4.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "c98fb637-fa83-4944-b444-0c8fdaf6bb8a", - "name": "repos_jkalash_github-api_git_refs", - "request": { - "url": "/repos/JKalash/github-api/git/refs", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_jkalash_github-api_git_refs-4.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:04 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4821", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"b9642dfc3a8b5a801b41d52ff3770d90\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CE75D:F5BAE05:5F202A00", - "Link": "; rel=\"next\", ; rel=\"last\"" - } - }, - "uuid": "c98fb637-fa83-4944-b444-0c8fdaf6bb8a", - "persistent": true, - "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-2", - "insertionIndex": 4 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json deleted file mode 100644 index 9a67233f1..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs-9.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "c70314ca-c9da-4021-ad37-206659ac37b8", - "name": "repos_jkalash_github-api_git_refs", - "request": { - "url": "/repos/JKalash/github-api/git/refs", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_jkalash_github-api_git_refs-9.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:07 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4816", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"b9642dfc3a8b5a801b41d52ff3770d90\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF030:F5BB8CF:5F202A03", - "Link": "; rel=\"next\", ; rel=\"last\"" - } - }, - "uuid": "c70314ca-c9da-4021-ad37-206659ac37b8", - "persistent": true, - "scenarioName": "scenario-1-repos-JKalash-github-api-git-refs", - "requiredScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-2", - "newScenarioState": "scenario-1-repos-JKalash-github-api-git-refs-3", - "insertionIndex": 9 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json deleted file mode 100644 index b349d4e4b..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch1-28.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "d41ef91f-948f-4680-87df-1838891632d4", - "name": "repos_jkalash_github-api_git_refs_heads_testbranch1", - "request": { - "url": "/repos/JKalash/github-api/git/refs/heads/testBranch1", - "method": "DELETE", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 204, - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:17 GMT", - "Server": "GitHub.com", - "Status": "204 No Content", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4797", - "X-RateLimit-Reset": "1595945515", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "Vary": [ - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "X-GitHub-Request-Id": "C6F8:74C1:C8D0980:F5BD7B5:5F202A0C" - } - }, - "uuid": "d41ef91f-948f-4680-87df-1838891632d4", - "persistent": true, - "insertionIndex": 28 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json deleted file mode 100644 index ea72832ac..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_jkalash_github-api_git_refs_heads_testbranch2-29.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "f57b8401-d6a8-4ddc-809f-bed08a691853", - "name": "repos_jkalash_github-api_git_refs_heads_testbranch2", - "request": { - "url": "/repos/JKalash/github-api/git/refs/heads/testBranch2", - "method": "DELETE", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 204, - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:18 GMT", - "Server": "GitHub.com", - "Status": "204 No Content", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4796", - "X-RateLimit-Reset": "1595945515", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "Vary": [ - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "X-GitHub-Request-Id": "C6F8:74C1:C8D0B71:F5BDA18:5F202A0D" - } - }, - "uuid": "f57b8401-d6a8-4ddc-809f-bed08a691853", - "persistent": true, - "insertionIndex": 29 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json deleted file mode 100644 index 093e983c5..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-10.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "d0cac42b-059e-4b37-b088-62717d816105", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=2", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-10.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:08 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4815", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"3459f193198715d7ffba6decac0745b0\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF0D6:F5BB996:5F202A03", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "d0cac42b-059e-4b37-b088-62717d816105", - "persistent": true, - "scenarioName": "scenario-2-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-2-repositories-283171990-git-refs-2", - "newScenarioState": "scenario-2-repositories-283171990-git-refs-3", - "insertionIndex": 10 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json deleted file mode 100644 index 1902a32aa..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-11.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "dbbe4c22-b935-408b-959b-165c05ab88ec", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=3", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-11.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:08 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4814", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"df808d0715cbea37f848aefa8b53fb6c\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF176:F5BBA5F:5F202A04", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "dbbe4c22-b935-408b-959b-165c05ab88ec", - "persistent": true, - "scenarioName": "scenario-3-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-3-repositories-283171990-git-refs-2", - "newScenarioState": "scenario-3-repositories-283171990-git-refs-3", - "insertionIndex": 11 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json deleted file mode 100644 index ff15eadd2..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-12.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "195ca12d-f98f-4c16-8899-1d1d0153083f", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=4", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-12.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:08 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4813", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"2709bea0b47a5a2d8984f2b49db3f897\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF202:F5BBB0C:5F202A04", - "Link": "; rel=\"prev\", ; rel=\"first\"" - } - }, - "uuid": "195ca12d-f98f-4c16-8899-1d1d0153083f", - "persistent": true, - "scenarioName": "scenario-4-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-4-repositories-283171990-git-refs-2", - "newScenarioState": "scenario-4-repositories-283171990-git-refs-3", - "insertionIndex": 12 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json deleted file mode 100644 index 42e6835d8..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-16.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "e2597a11-68b6-47c2-8624-870fa0aba722", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=2", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-16.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:10 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4809", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"61900fb45f156e1651fe0424b8842322\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF88C:F5BC2F1:5F202A06", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "e2597a11-68b6-47c2-8624-870fa0aba722", - "persistent": true, - "scenarioName": "scenario-2-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-2-repositories-283171990-git-refs-3", - "newScenarioState": "scenario-2-repositories-283171990-git-refs-4", - "insertionIndex": 16 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json deleted file mode 100644 index 1fae0c627..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-17.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "86a93423-ea28-4bd0-a51f-a1cc4aac0c73", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=3", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-17.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:10 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4808", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"1d197cdbdc601ac5d75880ab4c1e7409\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF93C:F5BC3C4:5F202A06", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "86a93423-ea28-4bd0-a51f-a1cc4aac0c73", - "persistent": true, - "scenarioName": "scenario-3-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-3-repositories-283171990-git-refs-3", - "newScenarioState": "scenario-3-repositories-283171990-git-refs-4", - "insertionIndex": 17 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json deleted file mode 100644 index c4685e0b4..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-18.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "f3a8334a-a973-4e3f-8ca1-f6008e2868b3", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=4", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-18.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:11 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4807", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"572d201614e2d5dbb821854a7263e91d\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CF9EA:F5BC495:5F202A06", - "Link": "; rel=\"prev\", ; rel=\"first\"" - } - }, - "uuid": "f3a8334a-a973-4e3f-8ca1-f6008e2868b3", - "persistent": true, - "scenarioName": "scenario-4-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-4-repositories-283171990-git-refs-3", - "newScenarioState": "scenario-4-repositories-283171990-git-refs-4", - "insertionIndex": 18 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json deleted file mode 100644 index 7efee817e..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-25.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "id": "7cf55136-fd9c-4cfe-8993-ab3f44aec1cb", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=2", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-25.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:16 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4800", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"6672dc848c6d280363d3112ba7a5cd60\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D07D3:F5BD5B2:5F202A0C", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "7cf55136-fd9c-4cfe-8993-ab3f44aec1cb", - "persistent": true, - "scenarioName": "scenario-2-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-2-repositories-283171990-git-refs-4", - "insertionIndex": 25 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json deleted file mode 100644 index 7825b04cf..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-26.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "id": "b420ae5d-b4f7-4bcc-96bc-fdf37314e975", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=3", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-26.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:16 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4799", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"06a826a717ba9420e9fe2afdfa94e8cf\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D085E:F5BD65A:5F202A0C", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "b420ae5d-b4f7-4bcc-96bc-fdf37314e975", - "persistent": true, - "scenarioName": "scenario-3-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-3-repositories-283171990-git-refs-4", - "insertionIndex": 26 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json deleted file mode 100644 index b0371adcf..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-27.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "id": "fc45ae76-d334-40ea-8872-f5e9fd22ace6", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=4", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-27.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:16 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4798", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"6b7fbe0a6e40071b8631a8770ab800fd\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8D08F4:F5BD706:5F202A0C", - "Link": "; rel=\"prev\", ; rel=\"first\"" - } - }, - "uuid": "fc45ae76-d334-40ea-8872-f5e9fd22ace6", - "persistent": true, - "scenarioName": "scenario-4-repositories-283171990-git-refs", - "requiredScenarioState": "scenario-4-repositories-283171990-git-refs-4", - "insertionIndex": 27 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json deleted file mode 100644 index 410afb338..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-5.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "cffb4acc-aba4-4da5-a0e0-157a8826c3ee", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=2", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-5.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:05 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4820", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"3459f193198715d7ffba6decac0745b0\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CE82C:F5BAF2B:5F202A00", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "cffb4acc-aba4-4da5-a0e0-157a8826c3ee", - "persistent": true, - "scenarioName": "scenario-2-repositories-283171990-git-refs", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-2-repositories-283171990-git-refs-2", - "insertionIndex": 5 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json deleted file mode 100644 index 517a55919..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-6.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "84441cc7-de9a-431a-8e31-bb3c2febb8cb", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=3", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-6.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:06 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4819", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"df808d0715cbea37f848aefa8b53fb6c\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CEB63:F5BB298:5F202A01", - "Link": "; rel=\"prev\", ; rel=\"next\", ; rel=\"last\", ; rel=\"first\"" - } - }, - "uuid": "84441cc7-de9a-431a-8e31-bb3c2febb8cb", - "persistent": true, - "scenarioName": "scenario-3-repositories-283171990-git-refs", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-3-repositories-283171990-git-refs-2", - "insertionIndex": 6 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json deleted file mode 100644 index 01c6a6194..000000000 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repositories_283171990_git_refs-7.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "c36d43d7-ab0c-415e-ba55-261d35320088", - "name": "repositories_283171990_git_refs", - "request": { - "url": "/repositories/283171990/git/refs?page=4", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repositories_283171990_git_refs-7.json", - "headers": { - "Date": "Tue, 28 Jul 2020 13:37:06 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4818", - "X-RateLimit-Reset": "1595945515", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"2709bea0b47a5a2d8984f2b49db3f897\"", - "Last-Modified": "Tue, 28 Jul 2020 09:56:58 GMT", - "X-Poll-Interval": "300", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CEC24:F5BB3BF:5F202A02", - "Link": "; rel=\"prev\", ; rel=\"first\"" - } - }, - "uuid": "c36d43d7-ab0c-415e-ba55-261d35320088", - "persistent": true, - "scenarioName": "scenario-4-repositories-283171990-git-refs", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-4-repositories-283171990-git-refs-2", - "insertionIndex": 7 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json index 9db84fac9..1a2690064 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json @@ -1,5 +1,5 @@ { - "id": "a3777b6a-f373-40ec-8f4f-1e9f541810b8", + "id": "e1aed38d-07ba-4d45-951e-b98cd43111be", "name": "user", "request": { "url": "/user", @@ -14,22 +14,22 @@ "status": 200, "bodyFileName": "user-1.json", "headers": { - "Date": "Tue, 28 Jul 2020 13:37:03 GMT", + "Date": "Tue, 28 Jul 2020 18:18:43 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4825", - "X-RateLimit-Reset": "1595945515", + "X-RateLimit-Remaining": "4983", + "X-RateLimit-Reset": "1595963741", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"e6155dfc67e897e2293faef7dab8f8a5\"", - "Last-Modified": "Tue, 28 Jul 2020 10:50:06 GMT", - "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages", + "ETag": "W/\"45741c9b5046d0be498127215d6c1db7\"", + "Last-Modified": "Mon, 27 Jul 2020 20:21:05 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", @@ -38,10 +38,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "C6F8:74C1:C8CE2F5:F5BA92B:5F2029FF" + "X-GitHub-Request-Id": "E982:6301:A9F52:D1D88:5F206C03" } }, - "uuid": "a3777b6a-f373-40ec-8f4f-1e9f541810b8", + "uuid": "e1aed38d-07ba-4d45-951e-b98cd43111be", "persistent": true, "insertionIndex": 1 } \ No newline at end of file From 92c141cee6a4f6eac83d9f5e75a2c89c44beed84 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Tue, 28 Jul 2020 12:57:31 -0700 Subject: [PATCH 09/20] Add support for string head Also support all changes already merged. --- .../java/org/kohsuke/github/GHBranch.java | 44 +++++++-- .../org/kohsuke/github/GitHubResponse.java | 11 ++- .../java/org/kohsuke/github/GHBranchTest.java | 12 +++ ...hub4j-test-org_temp-testmergebranch-2.json | 10 +-- ...mp-testmergebranch_branches_master-11.json | 89 +++++++++++++++++++ ...estmergebranch_branches_testbranch1-9.json | 22 ++--- ...estmergebranch_branches_testbranch2-8.json | 22 ++--- ...estmergebranch_contents_testbranch1-5.json | 18 ++-- ...estmergebranch_contents_testbranch2-7.json | 18 ++-- ...t-org_temp-testmergebranch_git_refs-4.json | 6 +- ...t-org_temp-testmergebranch_git_refs-6.json | 6 +- ...stmergebranch_git_refs_heads_master-3.json | 6 +- ...st-org_temp-testmergebranch_merges-10.json | 32 +++---- ...st-org_temp-testmergebranch_merges-12.json | 84 +++++++++++++++++ ...hub4j-test-org_temp-testmergebranch-2.json | 16 ++-- ...mp-testmergebranch_branches_master-11.json | 46 ++++++++++ ...estmergebranch_branches_testbranch1-9.json | 14 +-- ...estmergebranch_branches_testbranch2-8.json | 14 +-- ...estmergebranch_contents_testbranch1-5.json | 14 +-- ...estmergebranch_contents_testbranch2-7.json | 14 +-- ...t-org_temp-testmergebranch_git_refs-4.json | 16 ++-- ...t-org_temp-testmergebranch_git_refs-6.json | 16 ++-- ...stmergebranch_git_refs_heads_master-3.json | 16 ++-- ...st-org_temp-testmergebranch_merges-10.json | 16 ++-- ...st-org_temp-testmergebranch_merges-12.json | 54 +++++++++++ ...st-org_temp-testmergebranch_merges-13.json | 48 ++++++++++ .../testMergeBranch/mappings/user-1.json | 12 +-- 27 files changed, 522 insertions(+), 154 deletions(-) create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-12.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-12.json create mode 100644 src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-13.json diff --git a/src/main/java/org/kohsuke/github/GHBranch.java b/src/main/java/org/kohsuke/github/GHBranch.java index 35c3da7f7..6788c9461 100644 --- a/src/main/java/org/kohsuke/github/GHBranch.java +++ b/src/main/java/org/kohsuke/github/GHBranch.java @@ -9,6 +9,8 @@ import java.net.URL; import java.util.Collection; import java.util.Objects; +import javax.annotation.CheckForNull; + /** * A branch in a repository. * @@ -166,28 +168,56 @@ public class GHBranch { } /** - * Merge branches. + * Merge a branch into this branch. * * @param headBranch - * the branch whose head is being merged + * the branch whose head will be merged * * @param commitMessage * the commit message * - * @return GHCommit the merge commit created + * @return the merge {@link GHCommit} created, or {@code null} if the base already contains the head (nothing to + * merge). * * @throws IOException * if merging fails */ + @CheckForNull public GHCommit merge(GHBranch headBranch, String commitMessage) throws IOException { - return root.createRequest() + return merge(headBranch.getName(), commitMessage); + } + + /** + * Merge a ref into this branch. + * + * @param head + * the ref name that will be merged into this branch. Follows the usual ref naming rules, could be a + * branch name, tag, or commit sha. + * + * @param commitMessage + * the commit message + * + * @return the merge {@link GHCommit} created, or {@code null} if the base already contains the head (nothing to + * merge). + * + * @throws IOException + * if merging fails + */ + @CheckForNull + public GHCommit merge(String head, String commitMessage) throws IOException { + GHCommit result = root.createRequest() .withUrlPath(owner.getApiTailUrl("merges")) .method("POST") .with("commit_message", commitMessage) .with("base", this.name) - .with("head", headBranch.getName()) - .fetch(GHCommit.class) - .wrapUp(owner); + .with("head", head) + .fetch(GHCommit.class); + + if (result != null) { + result.wrapUp(owner); + } + + return result; } String getApiRoute() { diff --git a/src/main/java/org/kohsuke/github/GitHubResponse.java b/src/main/java/org/kohsuke/github/GitHubResponse.java index a27a861b5..9e82eb80d 100644 --- a/src/main/java/org/kohsuke/github/GitHubResponse.java +++ b/src/main/java/org/kohsuke/github/GitHubResponse.java @@ -78,9 +78,14 @@ class GitHubResponse { @CheckForNull static T parseBody(ResponseInfo responseInfo, Class type) throws IOException { - if (responseInfo.statusCode() == HttpURLConnection.HTTP_NO_CONTENT && type != null && type.isArray()) { - // no content - return type.cast(Array.newInstance(type.getComponentType(), 0)); + if (responseInfo.statusCode() == HttpURLConnection.HTTP_NO_CONTENT) { + if (type != null && type.isArray()) { + // no content for array should be empty array + return type.cast(Array.newInstance(type.getComponentType(), 0)); + } else { + // no content for object should be null + return null; + } } String data = responseInfo.getBodyAsString(); diff --git a/src/test/java/org/kohsuke/github/GHBranchTest.java b/src/test/java/org/kohsuke/github/GHBranchTest.java index 735581f73..2bffd8d05 100644 --- a/src/test/java/org/kohsuke/github/GHBranchTest.java +++ b/src/test/java/org/kohsuke/github/GHBranchTest.java @@ -25,6 +25,18 @@ public class GHBranchTest extends AbstractGitHubWireMockTest { GHCommit mergeCommit = repository.getBranch(BRANCH_1).merge(otherBranch, commitMessage); assertThat(mergeCommit, notNullValue()); assertThat(mergeCommit.getCommitShortInfo().getMessage(), equalTo(commitMessage)); + + // Merging commit sha should work + commitMessage = "merging from " + mergeCommit.getSHA1(); + GHBranch master = repository.getBranch("master"); + mergeCommit = master.merge(mergeCommit.getSHA1(), commitMessage); + + assertThat(mergeCommit, notNullValue()); + assertThat(mergeCommit.getCommitShortInfo().getMessage(), equalTo(commitMessage)); + + mergeCommit = master.merge(mergeCommit.getSHA1(), commitMessage); + // Should be null since all changes already merged + assertThat(mergeCommit, nullValue()); } private void createRefAndPostContent(String branchName, String sha) throws IOException { diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json index 91add7171..563abbe8d 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch-2.json @@ -1,6 +1,6 @@ { - "id": 283293221, - "node_id": "MDEwOlJlcG9zaXRvcnkyODMyOTMyMjE=", + "id": 283313593, + "node_id": "MDEwOlJlcG9zaXRvcnkyODMzMTM1OTM=", "name": "temp-testMergeBranch", "full_name": "hub4j-test-org/temp-testMergeBranch", "private": false, @@ -64,9 +64,9 @@ "labels_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/labels{/name}", "releases_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/releases{/id}", "deployments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/deployments", - "created_at": "2020-07-28T18:18:44Z", - "updated_at": "2020-07-28T18:18:49Z", - "pushed_at": "2020-07-28T18:18:46Z", + "created_at": "2020-07-28T19:54:49Z", + "updated_at": "2020-07-28T19:54:53Z", + "pushed_at": "2020-07-28T19:54:51Z", "git_url": "git://github.com/hub4j-test-org/temp-testMergeBranch.git", "ssh_url": "git@github.com:hub4j-test-org/temp-testMergeBranch.git", "clone_url": "https://github.com/hub4j-test-org/temp-testMergeBranch.git", diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json new file mode 100644 index 000000000..95014f264 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json @@ -0,0 +1,89 @@ +{ + "name": "master", + "commit": { + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOjY4OGExYzNmOGJjNjdkZWI3NjdmNjg1NjBlZDhjNzM1MGQ3MGQ1MGY=", + "commit": { + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T19:54:50Z" + }, + "committer": { + "name": "GitHub", + "email": "noreply@github.com", + "date": "2020-07-28T19:54:50Z" + }, + "message": "Initial commit", + "tree": { + "sha": "c6da5eb430eb876e5a03323a62ea01365a753d3b", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/c6da5eb430eb876e5a03323a62ea01365a753d3b" + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "comment_count": 0, + "verification": { + "verified": true, + "reason": "valid", + "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfIIKKCRBK7hj4Ov3rIwAAdHIIAH1NiSMFO1907U4QdfRgdqCP\nQHgc6KsflfLPxeP/Tt02Q+BJQeN8e1/IMXziwOp5dt5+CSuGFLN9U41fsBOxIRk6\nagqX5q4KleZaUEjOik2PfmXkwO+mQU64CX2QdpfHuqZNvCl6H1G4dnEAWdM1E3oA\nvLMIOHdjy6Fc1VJzmcc8+RVzUvKv/9Fq0uU6WR9Jl6TfMnfGqtVwQ1USuerhnIs0\nPSI9Yo12Wy8b+8psD3bwBcjbX8r6ItM//DjzU3XcKRZxv54u7tgQuLELqxh9dQSu\nCDSV9/LyHpMC3WMRAupusGsb4rMKeN+C7NYC4ZMmoRmwvWAhRKjTtCHBP8Ksapo=\n=OLMl\n-----END PGP SIGNATURE-----\n", + "payload": "tree c6da5eb430eb876e5a03323a62ea01365a753d3b\nauthor Liam Newman 1595966090 -0700\ncommitter GitHub 1595966090 -0700\n\nInitial commit" + } + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f/comments", + "author": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "web-flow", + "id": 19864447, + "node_id": "MDQ6VXNlcjE5ODY0NDQ3", + "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/web-flow", + "html_url": "https://github.com/web-flow", + "followers_url": "https://api.github.com/users/web-flow/followers", + "following_url": "https://api.github.com/users/web-flow/following{/other_user}", + "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", + "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", + "organizations_url": "https://api.github.com/users/web-flow/orgs", + "repos_url": "https://api.github.com/users/web-flow/repos", + "events_url": "https://api.github.com/users/web-flow/events{/privacy}", + "received_events_url": "https://api.github.com/users/web-flow/received_events", + "type": "User", + "site_admin": false + }, + "parents": [] + }, + "_links": { + "self": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches/master", + "html": "https://github.com/hub4j-test-org/temp-testMergeBranch/tree/master" + }, + "protected": false, + "protection": { + "enabled": false, + "required_status_checks": { + "enforcement_level": "off", + "contexts": [] + } + }, + "protection_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/branches/master/protection" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json index 277631c9d..0479f9a5b 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json @@ -1,25 +1,25 @@ { "name": "testBranch1", "commit": { - "sha": "1daaedca738fa6117848f3128a41058ae6c48277", - "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjFkYWFlZGNhNzM4ZmE2MTE3ODQ4ZjMxMjhhNDEwNThhZTZjNDgyNzc=", + "sha": "beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOmJlYWMwN2JiZmRlYjhhNWQyNjE3MzljZDY1YzRjYWFhY2E0OGFjNzk=", "commit": { "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:51Z" + "date": "2020-07-28T19:54:55Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:51Z" + "date": "2020-07-28T19:54:55Z" }, "message": "testBranch1", "tree": { "sha": "540c4a3c093ad09a869163c60d44218774ff5474", "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/540c4a3c093ad09a869163c60d44218774ff5474" }, - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/1daaedca738fa6117848f3128a41058ae6c48277", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/beac07bbfdeb8a5d261739cd65c4caaaca48ac79", "comment_count": 0, "verification": { "verified": false, @@ -28,9 +28,9 @@ "payload": null } }, - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/1daaedca738fa6117848f3128a41058ae6c48277", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/1daaedca738fa6117848f3128a41058ae6c48277", - "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/1daaedca738fa6117848f3128a41058ae6c48277/comments", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/beac07bbfdeb8a5d261739cd65c4caaaca48ac79/comments", "author": { "login": "bitwiseman", "id": 1958953, @@ -73,9 +73,9 @@ }, "parents": [ { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } ] }, diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json index 4e5802f95..2afd91f20 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json @@ -1,25 +1,25 @@ { "name": "testBranch2", "commit": { - "sha": "2294f9e512939576357baf7556ff3cb87d75c4bd", - "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjIyOTRmOWU1MTI5Mzk1NzYzNTdiYWY3NTU2ZmYzY2I4N2Q3NWM0YmQ=", + "sha": "506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOjUwNmNmYzViYjQ3YWMwODdiMjZjNmQ5NWQwYWQzMDVjNTkxN2M0YjI=", "commit": { "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:53Z" + "date": "2020-07-28T19:54:57Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:53Z" + "date": "2020-07-28T19:54:57Z" }, "message": "testBranch2", "tree": { "sha": "a183aaff617bc52ba1bdcea74faf24687194faf1", "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/a183aaff617bc52ba1bdcea74faf24687194faf1" }, - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", "comment_count": 0, "verification": { "verified": false, @@ -28,9 +28,9 @@ "payload": null } }, - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/2294f9e512939576357baf7556ff3cb87d75c4bd", - "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/2294f9e512939576357baf7556ff3cb87d75c4bd/comments", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2/comments", "author": { "login": "bitwiseman", "id": 1958953, @@ -73,9 +73,9 @@ }, "parents": [ { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } ] }, diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json index 6f490f253..a1db105bc 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json @@ -16,19 +16,19 @@ } }, "commit": { - "sha": "1daaedca738fa6117848f3128a41058ae6c48277", - "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjFkYWFlZGNhNzM4ZmE2MTE3ODQ4ZjMxMjhhNDEwNThhZTZjNDgyNzc=", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/1daaedca738fa6117848f3128a41058ae6c48277", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/1daaedca738fa6117848f3128a41058ae6c48277", + "sha": "beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOmJlYWMwN2JiZmRlYjhhNWQyNjE3MzljZDY1YzRjYWFhY2E0OGFjNzk=", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/beac07bbfdeb8a5d261739cd65c4caaaca48ac79", "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:51Z" + "date": "2020-07-28T19:54:55Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:51Z" + "date": "2020-07-28T19:54:55Z" }, "tree": { "sha": "540c4a3c093ad09a869163c60d44218774ff5474", @@ -37,9 +37,9 @@ "message": "testBranch1", "parents": [ { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } ], "verification": { diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json index 5138a0987..bc545ee59 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json @@ -16,19 +16,19 @@ } }, "commit": { - "sha": "2294f9e512939576357baf7556ff3cb87d75c4bd", - "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjIyOTRmOWU1MTI5Mzk1NzYzNTdiYWY3NTU2ZmYzY2I4N2Q3NWM0YmQ=", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/2294f9e512939576357baf7556ff3cb87d75c4bd", + "sha": "506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOjUwNmNmYzViYjQ3YWMwODdiMjZjNmQ5NWQwYWQzMDVjNTkxN2M0YjI=", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:53Z" + "date": "2020-07-28T19:54:57Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:53Z" + "date": "2020-07-28T19:54:57Z" }, "tree": { "sha": "a183aaff617bc52ba1bdcea74faf24687194faf1", @@ -37,9 +37,9 @@ "message": "testBranch2", "parents": [ { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/486418cfccc351dc18b68d0d8c699eefa504aec6" + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } ], "verification": { diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json index 06593c739..d7e09f156 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json @@ -1,10 +1,10 @@ { "ref": "refs/heads/testBranch1", - "node_id": "MDM6UmVmMjgzMjkzMjIxOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", + "node_id": "MDM6UmVmMjgzMzEzNTkzOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDE=", "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch1", "object": { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", "type": "commit", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6" + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json index afdac0242..a3cfca16c 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json @@ -1,10 +1,10 @@ { "ref": "refs/heads/testBranch2", - "node_id": "MDM6UmVmMjgzMjkzMjIxOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", + "node_id": "MDM6UmVmMjgzMzEzNTkzOnJlZnMvaGVhZHMvdGVzdEJyYW5jaDI=", "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch2", "object": { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", "type": "commit", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6" + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json index 66e0f8f8e..d9e93d0e9 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json @@ -1,10 +1,10 @@ { "ref": "refs/heads/master", - "node_id": "MDM6UmVmMjgzMjkzMjIxOnJlZnMvaGVhZHMvbWFzdGVy", + "node_id": "MDM6UmVmMjgzMzEzNTkzOnJlZnMvaGVhZHMvbWFzdGVy", "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/master", "object": { - "sha": "486418cfccc351dc18b68d0d8c699eefa504aec6", + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", "type": "commit", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/486418cfccc351dc18b68d0d8c699eefa504aec6" + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f" } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json index 5c16972cf..0600189cb 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-10.json @@ -1,34 +1,34 @@ { - "sha": "4dd8b1013c99d4bb85766bf69427f39aae49a263", - "node_id": "MDY6Q29tbWl0MjgzMjkzMjIxOjRkZDhiMTAxM2M5OWQ0YmI4NTc2NmJmNjk0MjdmMzlhYWU0OWEyNjM=", + "sha": "4cfa1cac01c59db507f550c8c870dac98859b353", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOjRjZmExY2FjMDFjNTlkYjUwN2Y1NTBjOGM4NzBkYWM5ODg1OWIzNTM=", "commit": { "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2020-07-28T18:18:54Z" + "date": "2020-07-28T19:54:59Z" }, "committer": { "name": "GitHub", "email": "noreply@github.com", - "date": "2020-07-28T18:18:54Z" + "date": "2020-07-28T19:54:59Z" }, "message": "merging testBranch2", "tree": { "sha": "a5ae8da88efbf6ff508c9575601f9a437a980626", "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/a5ae8da88efbf6ff508c9575601f9a437a980626" }, - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/4cfa1cac01c59db507f550c8c870dac98859b353", "comment_count": 0, "verification": { "verified": true, "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfIGwOCRBK7hj4Ov3rIwAAdHIIACnvZApf4BUxYjnJrc3bcJZD\nYlEfhLc2MwxlBDTkYK4JwzqSVj/iwl2CUjYE/JqX8xUvCfCWUlIZIbBUzua/YiId\nI+yd/b3wcT489zOJt7FNNFMSimq05o49DQcvwozxwSw8TvY/NlcQBd1b9OFX6MFy\nGP3KgHlIrj3iKDRhKqVuz3ONltq5xea+WwIt4gkMFqtc3YCxEjo/wnvPE3Xbu3x6\nVFasJkQuBelv1PAfmgbHIBc2t9A82/2e00hHkwuutqmIb27+1hHuegbb/bg6Obd9\nSslYfZwq6KllPk6LIfuUPSRxxFRfzkLjN7N9uV4eYneMmT5ys4KQJn1R6HeK7hY=\n=iEe2\n-----END PGP SIGNATURE-----\n", - "payload": "tree a5ae8da88efbf6ff508c9575601f9a437a980626\nparent 1daaedca738fa6117848f3128a41058ae6c48277\nparent 2294f9e512939576357baf7556ff3cb87d75c4bd\nauthor Liam Newman 1595960334 -0700\ncommitter GitHub 1595960334 -0700\n\nmerging testBranch2\n" + "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfIIKTCRBK7hj4Ov3rIwAAdHIIAKw4VKMUQj3CyA3VEOw08LCH\ng92h7Jy7ztaufDOGaRRlss77+Hdc0HyAhjnSI/ovj7uFKA0XOd+UZ8TVZzXQ0Nxo\ndBGAiR21l4YxRjb0wcvxCakjqjgYF0Pe5Jy4cptRIWlGp3HGgobF7Xq/80LaeFZ4\nnWS/DljtpQhuBgzD+boejookUrq5paZXr1q76cg7Orv6MbLALLs61QHkuihZQDA2\nZ5MeIVelxxXCVlw2+pceAKFtO8g7/lES7tBNtVhIwkdiGk3/V+Y8YR+U3nQC6vt9\nVVvCYAmCEnAQXWNJX+Dl4Zrx7n81FUPA0Y+0wMU86aY97flnopEt56Dge66wCDg=\n=S8yx\n-----END PGP SIGNATURE-----\n", + "payload": "tree a5ae8da88efbf6ff508c9575601f9a437a980626\nparent beac07bbfdeb8a5d261739cd65c4caaaca48ac79\nparent 506cfc5bb47ac087b26c6d95d0ad305c5917c4b2\nauthor Liam Newman 1595966099 -0700\ncommitter GitHub 1595966099 -0700\n\nmerging testBranch2\n" } }, - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/4dd8b1013c99d4bb85766bf69427f39aae49a263", - "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263/comments", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4cfa1cac01c59db507f550c8c870dac98859b353", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/4cfa1cac01c59db507f550c8c870dac98859b353", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4cfa1cac01c59db507f550c8c870dac98859b353/comments", "author": { "login": "bitwiseman", "id": 1958953, @@ -71,14 +71,14 @@ }, "parents": [ { - "sha": "1daaedca738fa6117848f3128a41058ae6c48277", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/1daaedca738fa6117848f3128a41058ae6c48277", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/1daaedca738fa6117848f3128a41058ae6c48277" + "sha": "beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/beac07bbfdeb8a5d261739cd65c4caaaca48ac79", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/beac07bbfdeb8a5d261739cd65c4caaaca48ac79" }, { - "sha": "2294f9e512939576357baf7556ff3cb87d75c4bd", - "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/2294f9e512939576357baf7556ff3cb87d75c4bd", - "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/2294f9e512939576357baf7556ff3cb87d75c4bd" + "sha": "506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/506cfc5bb47ac087b26c6d95d0ad305c5917c4b2" } ] } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-12.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-12.json new file mode 100644 index 000000000..cab4de502 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/__files/repos_hub4j-test-org_temp-testmergebranch_merges-12.json @@ -0,0 +1,84 @@ +{ + "sha": "223608e290ccc2f8902385528a24b1f7aec92acf", + "node_id": "MDY6Q29tbWl0MjgzMzEzNTkzOjIyMzYwOGUyOTBjY2MyZjg5MDIzODU1MjhhMjRiMWY3YWVjOTJhY2Y=", + "commit": { + "author": { + "name": "Liam Newman", + "email": "bitwiseman@gmail.com", + "date": "2020-07-28T19:55:00Z" + }, + "committer": { + "name": "GitHub", + "email": "noreply@github.com", + "date": "2020-07-28T19:55:00Z" + }, + "message": "merging from 4cfa1cac01c59db507f550c8c870dac98859b353", + "tree": { + "sha": "a5ae8da88efbf6ff508c9575601f9a437a980626", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/trees/a5ae8da88efbf6ff508c9575601f9a437a980626" + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/commits/223608e290ccc2f8902385528a24b1f7aec92acf", + "comment_count": 0, + "verification": { + "verified": true, + "reason": "valid", + "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfIIKUCRBK7hj4Ov3rIwAAdHIIAIdVJ69VtTQx9t3iZvp+k5J6\ncmI9Y/oIT/pqbsm/GuAMnmMgV1os9xhEa0QlwUu+MYDARw0ZuCKyeg3be/r5iigv\nXMhvU30hSsath7x/HNoeLROizuRcHCtkWRYmltXaNBeegCDDISFJAbMAa5XSb0/8\nwyH0FwxbA1kOtRqoebFBaAyrHZGzFTYjJil6ChTvVaDCMJLCXvZs1cFf3nQyWTa+\nV7sHSc1aqGO3N8O8CA4DFEwXDXdH1Fd5zKUlfCHve99hyKXX0n3N6F9nXAfx4bE2\ncZ0vbiLPHgIN+jc2PamSmBCNKYM31X5Nyw6Uatt2m21pMwbZ0goq7r7ZROtgzyg=\n=MS4E\n-----END PGP SIGNATURE-----\n", + "payload": "tree a5ae8da88efbf6ff508c9575601f9a437a980626\nparent 688a1c3f8bc67deb767f68560ed8c7350d70d50f\nparent 4cfa1cac01c59db507f550c8c870dac98859b353\nauthor Liam Newman 1595966100 -0700\ncommitter GitHub 1595966100 -0700\n\nmerging from 4cfa1cac01c59db507f550c8c870dac98859b353\n" + } + }, + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/223608e290ccc2f8902385528a24b1f7aec92acf", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/223608e290ccc2f8902385528a24b1f7aec92acf", + "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/223608e290ccc2f8902385528a24b1f7aec92acf/comments", + "author": { + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false + }, + "committer": { + "login": "web-flow", + "id": 19864447, + "node_id": "MDQ6VXNlcjE5ODY0NDQ3", + "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/web-flow", + "html_url": "https://github.com/web-flow", + "followers_url": "https://api.github.com/users/web-flow/followers", + "following_url": "https://api.github.com/users/web-flow/following{/other_user}", + "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", + "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", + "organizations_url": "https://api.github.com/users/web-flow/orgs", + "repos_url": "https://api.github.com/users/web-flow/repos", + "events_url": "https://api.github.com/users/web-flow/events{/privacy}", + "received_events_url": "https://api.github.com/users/web-flow/received_events", + "type": "User", + "site_admin": false + }, + "parents": [ + { + "sha": "688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/688a1c3f8bc67deb767f68560ed8c7350d70d50f", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/688a1c3f8bc67deb767f68560ed8c7350d70d50f" + }, + { + "sha": "4cfa1cac01c59db507f550c8c870dac98859b353", + "url": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4cfa1cac01c59db507f550c8c870dac98859b353", + "html_url": "https://github.com/hub4j-test-org/temp-testMergeBranch/commit/4cfa1cac01c59db507f550c8c870dac98859b353" + } + ] +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json index 4656d1fad..83db2e797 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch-2.json @@ -1,5 +1,5 @@ { - "id": "1382068f-7dc2-4750-8f69-b134d933a86a", + "id": "a05c0e96-b289-4199-a555-c2bfd303a19b", "name": "repos_hub4j-test-org_temp-testmergebranch", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch", @@ -14,21 +14,21 @@ "status": 200, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch-2.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:50 GMT", + "Date": "Tue, 28 Jul 2020 19:54:54 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4978", - "X-RateLimit-Reset": "1595963742", + "X-RateLimit-Remaining": "4994", + "X-RateLimit-Reset": "1595969687", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"8baa1cc09eff727a91205596c765b366\"", - "Last-Modified": "Tue, 28 Jul 2020 18:18:49 GMT", + "ETag": "W/\"50d2a9acff5c7f08e2753ccafeeb04a6\"", + "Last-Modified": "Tue, 28 Jul 2020 19:54:53 GMT", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "unknown, github.v3", @@ -38,10 +38,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA10A:D1D96:5F206C03" + "X-GitHub-Request-Id": "EE13:3784:A649D:D1586:5F208288" } }, - "uuid": "1382068f-7dc2-4750-8f69-b134d933a86a", + "uuid": "a05c0e96-b289-4199-a555-c2bfd303a19b", "persistent": true, "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json new file mode 100644 index 000000000..1f74650e2 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json @@ -0,0 +1,46 @@ +{ + "id": "149b51b4-e911-42b7-b181-488bb6a2bf95", + "name": "repos_hub4j-test-org_temp-testmergebranch_branches_master", + "request": { + "url": "/repos/hub4j-test-org/temp-testMergeBranch/branches/master", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_branches_master-11.json", + "headers": { + "Date": "Tue, 28 Jul 2020 19:55:00 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4985", + "X-RateLimit-Reset": "1595969688", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "W/\"c2772edda686a81b33fab1f45051da14\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "EE13:3784:A6552:D17AC:5F208293" + } + }, + "uuid": "149b51b4-e911-42b7-b181-488bb6a2bf95", + "persistent": true, + "insertionIndex": 11 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json index 3e2f0d7ab..1465e7903 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json @@ -1,5 +1,5 @@ { - "id": "b86dce11-724f-4230-8937-4c70593adc83", + "id": "3ae737b6-9240-422d-8e4e-f3c3e6fef444", "name": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch1", @@ -14,20 +14,20 @@ "status": 200, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch1-9.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:54 GMT", + "Date": "Tue, 28 Jul 2020 19:54:58 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4971", - "X-RateLimit-Reset": "1595963742", + "X-RateLimit-Remaining": "4987", + "X-RateLimit-Reset": "1595969687", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"7c53ab1d566b514959e33921ed458278\"", + "ETag": "W/\"34ff9c8b8f8d8123155a0db487411a1c\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -37,10 +37,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA236:D211C:5F206C0E" + "X-GitHub-Request-Id": "EE13:3784:A6519:D1765:5F208292" } }, - "uuid": "b86dce11-724f-4230-8937-4c70593adc83", + "uuid": "3ae737b6-9240-422d-8e4e-f3c3e6fef444", "persistent": true, "insertionIndex": 9 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json index 14210f4d9..3774f190f 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json @@ -1,5 +1,5 @@ { - "id": "77f61de8-e2a7-4a98-9504-96cd1eca9814", + "id": "0d9d8c6a-b1af-4836-ab6e-90649abe9314", "name": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/branches/testBranch2", @@ -14,20 +14,20 @@ "status": 200, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_branches_testbranch2-8.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:54 GMT", + "Date": "Tue, 28 Jul 2020 19:54:58 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4972", - "X-RateLimit-Reset": "1595963742", + "X-RateLimit-Remaining": "4988", + "X-RateLimit-Reset": "1595969688", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"643d430eeaecb29bcfc6ca6c2c8e4cac\"", + "ETag": "W/\"a0325b24ee9c35961b6e3bb036ce8150\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -37,10 +37,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA22A:D20FB:5F206C0D" + "X-GitHub-Request-Id": "EE13:3784:A6512:D1752:5F208292" } }, - "uuid": "77f61de8-e2a7-4a98-9504-96cd1eca9814", + "uuid": "0d9d8c6a-b1af-4836-ab6e-90649abe9314", "persistent": true, "insertionIndex": 8 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json index c36bffb2f..122afc79a 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json @@ -1,5 +1,5 @@ { - "id": "c88aabbb-cd4a-412b-8cc8-f760a712f2c0", + "id": "d02ffee7-28b2-4cba-96f5-b6c57d48c903", "name": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch1", @@ -21,20 +21,20 @@ "status": 201, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch1-5.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:52 GMT", + "Date": "Tue, 28 Jul 2020 19:54:56 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4975", - "X-RateLimit-Reset": "1595963742", + "X-RateLimit-Remaining": "4991", + "X-RateLimit-Reset": "1595969688", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"6ac8992b1f760b21e3f96d9757358151\"", + "ETag": "\"f4dbe8e0bd7a12c64e12252c4cc291f2\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -44,10 +44,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA157:D2000:5F206C0B" + "X-GitHub-Request-Id": "EE13:3784:A64BD:D16FF:5F20828F" } }, - "uuid": "c88aabbb-cd4a-412b-8cc8-f760a712f2c0", + "uuid": "d02ffee7-28b2-4cba-96f5-b6c57d48c903", "persistent": true, "insertionIndex": 5 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json index 5686895f1..64d256dab 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json @@ -1,5 +1,5 @@ { - "id": "d9cb5e0c-066a-4e74-9df9-b361f250edbc", + "id": "078c1c45-bf0f-49d1-99a2-cea8339d2c2d", "name": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/contents/testBranch2", @@ -21,20 +21,20 @@ "status": 201, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_contents_testbranch2-7.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:53 GMT", + "Date": "Tue, 28 Jul 2020 19:54:58 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4973", - "X-RateLimit-Reset": "1595963741", + "X-RateLimit-Remaining": "4989", + "X-RateLimit-Reset": "1595969688", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"bd560f0693dce50493fb4c42b6ac6d0c\"", + "ETag": "\"be8981ef90340e91391c74a9d8665f16\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -44,10 +44,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA1E4:D20BA:5F206C0C" + "X-GitHub-Request-Id": "EE13:3784:A64EE:D1730:5F208291" } }, - "uuid": "d9cb5e0c-066a-4e74-9df9-b361f250edbc", + "uuid": "078c1c45-bf0f-49d1-99a2-cea8339d2c2d", "persistent": true, "insertionIndex": 7 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json index 13ebcb0de..2fa41fc53 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json @@ -1,5 +1,5 @@ { - "id": "0510a368-9cc3-4d0e-9cb2-7ec36bdf2ea2", + "id": "94200d6b-4b21-4d99-9a46-e653c1b0be14", "name": "repos_hub4j-test-org_temp-testmergebranch_git_refs", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/git/refs", @@ -11,7 +11,7 @@ }, "bodyPatterns": [ { - "equalToJson": "{\"ref\":\"refs/heads/testBranch1\",\"sha\":\"486418cfccc351dc18b68d0d8c699eefa504aec6\"}", + "equalToJson": "{\"ref\":\"refs/heads/testBranch1\",\"sha\":\"688a1c3f8bc67deb767f68560ed8c7350d70d50f\"}", "ignoreArrayOrder": true, "ignoreExtraElements": false } @@ -21,20 +21,20 @@ "status": 201, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_git_refs-4.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:51 GMT", + "Date": "Tue, 28 Jul 2020 19:54:55 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4976", - "X-RateLimit-Reset": "1595963742", + "X-RateLimit-Remaining": "4992", + "X-RateLimit-Reset": "1595969688", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"c8d07c44c27014a80f409b1dbf99cfd3\"", + "ETag": "\"4c1d080908281566b4cbeca9d8febe6c\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch1", @@ -45,10 +45,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA125:D1FCF:5F206C0A" + "X-GitHub-Request-Id": "EE13:3784:A64A7:D16E2:5F20828E" } }, - "uuid": "0510a368-9cc3-4d0e-9cb2-7ec36bdf2ea2", + "uuid": "94200d6b-4b21-4d99-9a46-e653c1b0be14", "persistent": true, "insertionIndex": 4 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json index 0e44eff0d..3ceaa8d55 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json @@ -1,5 +1,5 @@ { - "id": "ecce543d-da7c-49ac-b13d-09a2c925524b", + "id": "031e30e3-6faa-44c2-b70f-3d9ba5bec9d8", "name": "repos_hub4j-test-org_temp-testmergebranch_git_refs", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/git/refs", @@ -11,7 +11,7 @@ }, "bodyPatterns": [ { - "equalToJson": "{\"ref\":\"refs/heads/testBranch2\",\"sha\":\"486418cfccc351dc18b68d0d8c699eefa504aec6\"}", + "equalToJson": "{\"ref\":\"refs/heads/testBranch2\",\"sha\":\"688a1c3f8bc67deb767f68560ed8c7350d70d50f\"}", "ignoreArrayOrder": true, "ignoreExtraElements": false } @@ -21,20 +21,20 @@ "status": 201, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_git_refs-6.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:52 GMT", + "Date": "Tue, 28 Jul 2020 19:54:57 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4974", - "X-RateLimit-Reset": "1595963741", + "X-RateLimit-Remaining": "4990", + "X-RateLimit-Reset": "1595969688", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"e22d7994904ab29ab32a2c00756ed4c7\"", + "ETag": "\"5da13192d2a1368f382c1593a66e9e6e\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/testBranch2", @@ -45,10 +45,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA1A8:D2071:5F206C0C" + "X-GitHub-Request-Id": "EE13:3784:A64DF:D171F:5F208290" } }, - "uuid": "ecce543d-da7c-49ac-b13d-09a2c925524b", + "uuid": "031e30e3-6faa-44c2-b70f-3d9ba5bec9d8", "persistent": true, "insertionIndex": 6 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json index 79229e875..db93ee649 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json @@ -1,5 +1,5 @@ { - "id": "58813089-f68a-4e42-8258-ab6068b15431", + "id": "c4e8c18e-a010-46fb-a605-9c4b83b5ee3b", "name": "repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/git/refs/heads/master", @@ -14,21 +14,21 @@ "status": 200, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_git_refs_heads_master-3.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:50 GMT", + "Date": "Tue, 28 Jul 2020 19:54:54 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4977", - "X-RateLimit-Reset": "1595963742", + "X-RateLimit-Remaining": "4993", + "X-RateLimit-Reset": "1595969687", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"5bf6a1f57b59a59055f972183109f5e2\"", - "Last-Modified": "Tue, 28 Jul 2020 18:18:49 GMT", + "ETag": "W/\"d3b5113fd53fc08d8d171deb0f400daa\"", + "Last-Modified": "Tue, 28 Jul 2020 19:54:53 GMT", "X-Poll-Interval": "300", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", @@ -39,10 +39,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA11B:D1FBE:5F206C0A" + "X-GitHub-Request-Id": "EE13:3784:A64A3:D16DC:5F20828E" } }, - "uuid": "58813089-f68a-4e42-8258-ab6068b15431", + "uuid": "c4e8c18e-a010-46fb-a605-9c4b83b5ee3b", "persistent": true, "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json index 792aafcc8..67c8cfe51 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-10.json @@ -1,5 +1,5 @@ { - "id": "c946e38f-79c8-4606-a544-116fed67ff28", + "id": "8f5eb5d0-5204-49ea-bc22-5f4e412f9def", "name": "repos_hub4j-test-org_temp-testmergebranch_merges", "request": { "url": "/repos/hub4j-test-org/temp-testMergeBranch/merges", @@ -21,23 +21,23 @@ "status": 201, "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_merges-10.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:55 GMT", + "Date": "Tue, 28 Jul 2020 19:54:59 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4970", - "X-RateLimit-Reset": "1595963741", + "X-RateLimit-Remaining": "4986", + "X-RateLimit-Reset": "1595969687", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "\"990b10169f450d12eabb23a2c7616adf\"", + "ETag": "\"9c320a3cf9eefca809ccbee57e38c84d\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", - "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4dd8b1013c99d4bb85766bf69427f39aae49a263", + "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/4cfa1cac01c59db507f550c8c870dac98859b353", "X-GitHub-Media-Type": "unknown, github.v3", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Frame-Options": "deny", @@ -45,10 +45,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:AA24C:D213D:5F206C0E" + "X-GitHub-Request-Id": "EE13:3784:A651D:D176C:5F208292" } }, - "uuid": "c946e38f-79c8-4606-a544-116fed67ff28", + "uuid": "8f5eb5d0-5204-49ea-bc22-5f4e412f9def", "persistent": true, "insertionIndex": 10 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-12.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-12.json new file mode 100644 index 000000000..a458d361e --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-12.json @@ -0,0 +1,54 @@ +{ + "id": "4ab064aa-6af9-4a2f-910a-6142b5afd337", + "name": "repos_hub4j-test-org_temp-testmergebranch_merges", + "request": { + "url": "/repos/hub4j-test-org/temp-testMergeBranch/merges", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"head\":\"4cfa1cac01c59db507f550c8c870dac98859b353\",\"commit_message\":\"merging from 4cfa1cac01c59db507f550c8c870dac98859b353\",\"base\":\"master\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 201, + "bodyFileName": "repos_hub4j-test-org_temp-testmergebranch_merges-12.json", + "headers": { + "Date": "Tue, 28 Jul 2020 19:55:01 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "201 Created", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4984", + "X-RateLimit-Reset": "1595969688", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "ETag": "\"23dae4db9910ea437dfc2d6cde7939de\"", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "Location": "https://api.github.com/repos/hub4j-test-org/temp-testMergeBranch/commits/223608e290ccc2f8902385528a24b1f7aec92acf", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "EE13:3784:A6562:D17CA:5F208294" + } + }, + "uuid": "4ab064aa-6af9-4a2f-910a-6142b5afd337", + "persistent": true, + "insertionIndex": 12 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-13.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-13.json new file mode 100644 index 000000000..2bc4b3621 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/repos_hub4j-test-org_temp-testmergebranch_merges-13.json @@ -0,0 +1,48 @@ +{ + "id": "8536e5ba-39e7-4985-b6dd-08abee17696c", + "name": "repos_hub4j-test-org_temp-testmergebranch_merges", + "request": { + "url": "/repos/hub4j-test-org/temp-testMergeBranch/merges", + "method": "POST", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + }, + "bodyPatterns": [ + { + "equalToJson": "{\"head\":\"223608e290ccc2f8902385528a24b1f7aec92acf\",\"commit_message\":\"merging from 4cfa1cac01c59db507f550c8c870dac98859b353\",\"base\":\"master\"}", + "ignoreArrayOrder": true, + "ignoreExtraElements": false + } + ] + }, + "response": { + "status": 204, + "headers": { + "Date": "Tue, 28 Jul 2020 19:55:01 GMT", + "Server": "GitHub.com", + "Status": "204 No Content", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4983", + "X-RateLimit-Reset": "1595969687", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "Vary": [ + "Accept-Encoding, Accept, X-Requested-With", + "Accept-Encoding" + ], + "X-GitHub-Request-Id": "EE13:3784:A65C4:D182E:5F208295" + } + }, + "uuid": "8536e5ba-39e7-4985-b6dd-08abee17696c", + "persistent": true, + "insertionIndex": 13 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json index 1a2690064..c1f95b6c7 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json +++ b/src/test/resources/org/kohsuke/github/GHBranchTest/wiremock/testMergeBranch/mappings/user-1.json @@ -1,5 +1,5 @@ { - "id": "e1aed38d-07ba-4d45-951e-b98cd43111be", + "id": "0e802578-0945-4434-a5de-bf83270366b5", "name": "user", "request": { "url": "/user", @@ -14,13 +14,13 @@ "status": 200, "bodyFileName": "user-1.json", "headers": { - "Date": "Tue, 28 Jul 2020 18:18:43 GMT", + "Date": "Tue, 28 Jul 2020 19:54:48 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4983", - "X-RateLimit-Reset": "1595963741", + "X-RateLimit-Remaining": "4999", + "X-RateLimit-Reset": "1595969688", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", @@ -38,10 +38,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "E982:6301:A9F52:D1D88:5F206C03" + "X-GitHub-Request-Id": "EE13:3784:A637F:D157E:5F208287" } }, - "uuid": "e1aed38d-07ba-4d45-951e-b98cd43111be", + "uuid": "0e802578-0945-4434-a5de-bf83270366b5", "persistent": true, "insertionIndex": 1 } \ No newline at end of file From c55719c67a1b187d11b7489806f746cfffc70c87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 02:00:49 +0000 Subject: [PATCH 10/20] Chore(deps-dev): Bump mockito-core from 3.4.4 to 3.4.6 Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.4 to 3.4.6. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.4.4...v3.4.6) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de50af5b6..32db3ee6d 100644 --- a/pom.xml +++ b/pom.xml @@ -519,7 +519,7 @@ org.mockito mockito-core - 3.4.4 + 3.4.6 test From 2f2f26767ebc0f668beddbcb98daf1c0703977de Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 13:59:36 +0100 Subject: [PATCH 11/20] make getPullRequests public --- src/main/java/org/kohsuke/github/GHCheckRun.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index a615e942a..0c7cfbb49 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -107,7 +107,7 @@ public class GHCheckRun extends GHObject { * * @return Pull requests of this check run */ - GHPullRequest[] getPullRequests() throws IOException { + public GHPullRequest[] getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); From d5913dc292b7ba776cf0767707cef9e04c0c5b76 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 15:25:35 +0100 Subject: [PATCH 12/20] fix array exposure --- src/main/java/org/kohsuke/github/GHCheckRun.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index 0c7cfbb49..0f01f5a68 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -5,6 +5,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; import java.util.Date; +import java.util.List; /** * Represents a check run. @@ -29,7 +30,7 @@ public class GHCheckRun extends GHObject { private URL detailsUrl; private Output output; private GHApp app; - private GHPullRequest[] pullRequests; + private List pullRequests; private GHCheckSuite checkSuite; GHCheckRun wrap(GHRepository owner) { @@ -46,7 +47,7 @@ public class GHCheckRun extends GHObject { return this; } - GHPullRequest[] wrap() { + List wrap() { return pullRequests; } @@ -107,8 +108,8 @@ public class GHCheckRun extends GHObject { * * @return Pull requests of this check run */ - public GHPullRequest[] getPullRequests() throws IOException { - if (pullRequests != null && pullRequests.length != 0) { + public List getPullRequests() throws IOException { + if (pullRequests != null && pullRequests.size() != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } From 81bf818573ed430498ba0d60eef6ef53b07552fd Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 20:01:44 +0100 Subject: [PATCH 13/20] pullRequests returns iterable --- .../java/org/kohsuke/github/GHCheckRun.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index 0f01f5a68..1ed5c9eab 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -4,8 +4,10 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; +import java.util.Arrays; import java.util.Date; -import java.util.List; +import java.util.Iterator; +import java.util.stream.Stream; /** * Represents a check run. @@ -30,7 +32,7 @@ public class GHCheckRun extends GHObject { private URL detailsUrl; private Output output; private GHApp app; - private List pullRequests; + private GHPullRequest[] pullRequests; private GHCheckSuite checkSuite; GHCheckRun wrap(GHRepository owner) { @@ -47,7 +49,7 @@ public class GHCheckRun extends GHObject { return this; } - List wrap() { + GHPullRequest[] wrap() { return pullRequests; } @@ -107,14 +109,17 @@ public class GHCheckRun extends GHObject { * Gets the pull requests participated in this check run. * * @return Pull requests of this check run + * @throws IOException + * the io exception */ - public List getPullRequests() throws IOException { - if (pullRequests != null && pullRequests.size() != 0) { + public Iterator getPullRequests() throws IOException { + if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } + return Arrays.stream(pullRequests).iterator(); } - return pullRequests; + return Stream.empty().iterator(); } /** From a0bbba748af79552373818ca4f32848354d9ed2f Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 20:10:44 +0100 Subject: [PATCH 14/20] check suite exposes pull requests --- src/main/java/org/kohsuke/github/GHCheckRun.java | 4 ++-- src/main/java/org/kohsuke/github/GHCheckSuite.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index 1ed5c9eab..a2c74a304 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -112,12 +112,12 @@ public class GHCheckRun extends GHObject { * @throws IOException * the io exception */ - public Iterator getPullRequests() throws IOException { + public Iterator getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } - return Arrays.stream(pullRequests).iterator(); + return Arrays.stream(pullRequests).iterator(); } return Stream.empty().iterator(); } diff --git a/src/main/java/org/kohsuke/github/GHCheckSuite.java b/src/main/java/org/kohsuke/github/GHCheckSuite.java index 3a0a4bb98..0fca06302 100644 --- a/src/main/java/org/kohsuke/github/GHCheckSuite.java +++ b/src/main/java/org/kohsuke/github/GHCheckSuite.java @@ -4,7 +4,10 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; +import java.util.Arrays; import java.util.Date; +import java.util.Iterator; +import java.util.stream.Stream; /** * Represents a check suite. @@ -154,14 +157,17 @@ public class GHCheckSuite extends GHObject { * Gets the pull requests participated in this check suite. * * @return Pull requests + * @throws IOException + * the io exception */ - GHPullRequest[] getPullRequests() throws IOException { + public Iterator getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } + return Arrays.stream(pullRequests).iterator(); } - return pullRequests; + return Stream.empty().iterator(); } /** From f146ae94ecd7e71ffc2c88ba87f9672f8e07a79a Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 21:41:16 +0100 Subject: [PATCH 15/20] return iterable --- src/main/java/org/kohsuke/github/GHCheckRun.java | 10 +++++----- src/main/java/org/kohsuke/github/GHCheckSuite.java | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index a2c74a304..b63537086 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -5,9 +5,9 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; import java.util.Arrays; +import java.util.Collections; import java.util.Date; -import java.util.Iterator; -import java.util.stream.Stream; +import java.util.List; /** * Represents a check run. @@ -112,14 +112,14 @@ public class GHCheckRun extends GHObject { * @throws IOException * the io exception */ - public Iterator getPullRequests() throws IOException { + public List getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } - return Arrays.stream(pullRequests).iterator(); + return Arrays.asList(pullRequests); } - return Stream.empty().iterator(); + return Collections.emptyList(); } /** diff --git a/src/main/java/org/kohsuke/github/GHCheckSuite.java b/src/main/java/org/kohsuke/github/GHCheckSuite.java index 0fca06302..54bcd485e 100644 --- a/src/main/java/org/kohsuke/github/GHCheckSuite.java +++ b/src/main/java/org/kohsuke/github/GHCheckSuite.java @@ -5,8 +5,10 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.Iterator; +import java.util.List; import java.util.stream.Stream; /** @@ -160,14 +162,14 @@ public class GHCheckSuite extends GHObject { * @throws IOException * the io exception */ - public Iterator getPullRequests() throws IOException { + public List getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } - return Arrays.stream(pullRequests).iterator(); + return Arrays.asList(pullRequests); } - return Stream.empty().iterator(); + return Collections.emptyList(); } /** From 72a1c24b3b48f70301d3a85d733b294bf6ff378d Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 21:43:37 +0100 Subject: [PATCH 16/20] format --- src/main/java/org/kohsuke/github/GHCheckRun.java | 2 +- src/main/java/org/kohsuke/github/GHCheckSuite.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index b63537086..296ef5ff2 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -117,7 +117,7 @@ public class GHCheckRun extends GHObject { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } - return Arrays.asList(pullRequests); + return Arrays.asList(pullRequests); } return Collections.emptyList(); } diff --git a/src/main/java/org/kohsuke/github/GHCheckSuite.java b/src/main/java/org/kohsuke/github/GHCheckSuite.java index 54bcd485e..838403eef 100644 --- a/src/main/java/org/kohsuke/github/GHCheckSuite.java +++ b/src/main/java/org/kohsuke/github/GHCheckSuite.java @@ -7,9 +7,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.List; -import java.util.stream.Stream; /** * Represents a check suite. From 5405fb0370a2db44e18ed6de2d620c90483629f1 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 30 Jul 2020 21:48:42 +0100 Subject: [PATCH 17/20] return unmodifiable list --- src/main/java/org/kohsuke/github/GHCheckRun.java | 2 +- src/main/java/org/kohsuke/github/GHCheckSuite.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index 296ef5ff2..52a8da3b8 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -117,7 +117,7 @@ public class GHCheckRun extends GHObject { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } - return Arrays.asList(pullRequests); + return Collections.unmodifiableList(Arrays.asList(pullRequests)); } return Collections.emptyList(); } diff --git a/src/main/java/org/kohsuke/github/GHCheckSuite.java b/src/main/java/org/kohsuke/github/GHCheckSuite.java index 838403eef..812fea145 100644 --- a/src/main/java/org/kohsuke/github/GHCheckSuite.java +++ b/src/main/java/org/kohsuke/github/GHCheckSuite.java @@ -165,7 +165,7 @@ public class GHCheckSuite extends GHObject { for (GHPullRequest singlePull : pullRequests) { singlePull.refresh(); } - return Arrays.asList(pullRequests); + return Collections.unmodifiableList(Arrays.asList(pullRequests)); } return Collections.emptyList(); } From b177d98e296ce7863c009907edb8fb51feebd6a8 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Fri, 31 Jul 2020 14:21:00 -0700 Subject: [PATCH 18/20] Populate Check pull requests Turns out there were quite a few bugs in this area (it was exposed publicly before. Some tweaking was needed and updates to the tests to show this working as expected. --- .../java/org/kohsuke/github/GHCheckRun.java | 30 +- .../java/org/kohsuke/github/GHCheckSuite.java | 21 +- .../kohsuke/github/GHEventPayloadTest.java | 61 +++- ...epos_codertocat_hello-world_pulls_2-3.json | 329 ++++++++++++++++++ .../checkRunEvent/__files/user-1.json | 46 +++ .../__files/users_codertocat-2.json | 34 ++ ...epos_codertocat_hello-world_pulls_2-3.json | 46 +++ .../checkRunEvent/mappings/user-1.json | 46 +++ .../mappings/users_codertocat-2.json | 46 +++ ...epos_codertocat_hello-world_pulls_2-3.json | 329 ++++++++++++++++++ .../checkSuiteEvent/__files/user-1.json | 46 +++ .../__files/users_codertocat-2.json | 34 ++ ...epos_codertocat_hello-world_pulls_2-3.json | 46 +++ .../checkSuiteEvent/mappings/user-1.json | 46 +++ .../mappings/users_codertocat-2.json | 46 +++ 15 files changed, 1193 insertions(+), 13 deletions(-) create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/repos_codertocat_hello-world_pulls_2-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/users_codertocat-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/users_codertocat-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/repos_codertocat_hello-world_pulls_2-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/users_codertocat-2.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/user-1.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/users_codertocat-2.json diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index 52a8da3b8..4f0bbe273 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -1,5 +1,6 @@ package org.kohsuke.github; +import com.fasterxml.jackson.annotation.JsonProperty; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; @@ -17,6 +18,8 @@ import java.util.List; @SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD" }, justification = "JSON API") public class GHCheckRun extends GHObject { + + @JsonProperty("repository") GHRepository owner; GitHub root; @@ -37,7 +40,7 @@ public class GHCheckRun extends GHObject { GHCheckRun wrap(GHRepository owner) { this.owner = owner; - this.root = owner.root; + wrap(owner.root); return this; } @@ -45,7 +48,24 @@ public class GHCheckRun extends GHObject { this.root = root; if (owner != null) { owner.wrap(root); + if (pullRequests != null && pullRequests.length != 0) { + for (GHPullRequest singlePull : pullRequests) { + singlePull.wrap(owner); + } + } + } + if (checkSuite != null) { + if (owner != null) { + checkSuite.wrap(owner); + } else { + checkSuite.wrap(root); + } + } + if (app != null) { + app.wrapUp(root); + } + return this; } @@ -108,14 +128,18 @@ public class GHCheckRun extends GHObject { /** * Gets the pull requests participated in this check run. * - * @return Pull requests of this check run + * Note this field is only populated for events. When getting a {@link GHCheckRun} outside of an event, this is + * always empty. + * + * @return the list of {@link GHPullRequest}s for this check run. Only populated for events. * @throws IOException * the io exception */ public List getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { - singlePull.refresh(); + // Only refresh if we haven't do so before + singlePull.refresh(singlePull.getTitle()); } return Collections.unmodifiableList(Arrays.asList(pullRequests)); } diff --git a/src/main/java/org/kohsuke/github/GHCheckSuite.java b/src/main/java/org/kohsuke/github/GHCheckSuite.java index 812fea145..2f4bf5543 100644 --- a/src/main/java/org/kohsuke/github/GHCheckSuite.java +++ b/src/main/java/org/kohsuke/github/GHCheckSuite.java @@ -1,5 +1,6 @@ package org.kohsuke.github; +import com.fasterxml.jackson.annotation.JsonProperty; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; @@ -17,6 +18,8 @@ import java.util.List; @SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD" }, justification = "JSON API") public class GHCheckSuite extends GHObject { + + @JsonProperty("repository") GHRepository owner; GitHub root; @@ -35,7 +38,7 @@ public class GHCheckSuite extends GHObject { GHCheckSuite wrap(GHRepository owner) { this.owner = owner; - this.root = owner.root; + this.wrap(owner.root); return this; } @@ -43,6 +46,14 @@ public class GHCheckSuite extends GHObject { this.root = root; if (owner != null) { owner.wrap(root); + if (pullRequests != null && pullRequests.length != 0) { + for (GHPullRequest singlePull : pullRequests) { + singlePull.wrap(owner); + } + } + } + if (app != null) { + app.wrapUp(root); } return this; } @@ -156,14 +167,18 @@ public class GHCheckSuite extends GHObject { /** * Gets the pull requests participated in this check suite. * - * @return Pull requests + * Note this field is only populated for events. When getting a {@link GHCheckSuite} outside of an event, this is + * always empty. + * + * @return the list of {@link GHPullRequest}s for this check suite. Only populated for events. * @throws IOException * the io exception */ public List getPullRequests() throws IOException { if (pullRequests != null && pullRequests.length != 0) { for (GHPullRequest singlePull : pullRequests) { - singlePull.refresh(); + // Only refresh if we haven't do so before + singlePull.refresh(singlePull.getTitle()); } return Collections.unmodifiableList(Arrays.asList(pullRequests)); } diff --git a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java index b8dd31172..b618635d7 100644 --- a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java +++ b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java @@ -3,6 +3,7 @@ package org.kohsuke.github; import org.junit.Rule; import org.junit.Test; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Collections; import java.util.TimeZone; @@ -387,7 +388,25 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { @Payload("check-run") public void checkRunEvent() throws Exception { GHEventPayload.CheckRun event = GitHub.offline() - .parseEventPayload(payload.asReader(), GHEventPayload.CheckRun.class); + .parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.CheckRun.class); + GHCheckRun checkRun = verifyBasicCheckRunEvent(event); + assertThat("pull body not populated offline", checkRun.getPullRequests().get(0).getBody(), nullValue()); + assertThat("using offline github", mockGitHub.getRequestCount(), equalTo(0)); + + gitHub = getGitHubBuilder().withEndpoint(mockGitHub.apiServer().baseUrl()).build(); + event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.CheckRun.class); + checkRun = verifyBasicCheckRunEvent(event); + + int expectedRequestCount = mockGitHub.isUseProxy() ? 3 : 2; + assertThat("pull body should be populated", + checkRun.getPullRequests().get(0).getBody(), + equalTo("This is a pretty simple change that we need to pull into master.")); + assertThat("multiple getPullRequests() calls are made, the pull is populated only once", + mockGitHub.getRequestCount(), + equalTo(expectedRequestCount)); + } + + private GHCheckRun verifyBasicCheckRunEvent(GHEventPayload.CheckRun event) throws IOException { assertThat(event.getRepository().getName(), is("Hello-World")); assertThat(event.getRepository().getOwner().getLogin(), is("Codertocat")); assertThat(event.getAction(), is("created")); @@ -406,9 +425,9 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { assertThat(formatter.format(checkRun.getCompletedAt()), is("2019-05-15T20:22:22Z")); assertThat(checkRun.getConclusion(), is("success")); - assertThat(checkRun.getUrl().toString(), - is("https://api.github.com/repos/Codertocat/Hello-World/check-runs/128620228")); - assertThat(checkRun.getHtmlUrl().toString(), is("https://github.com/Codertocat/Hello-World/runs/128620228")); + assertThat(checkRun.getUrl().toString(), endsWith("/repos/Codertocat/Hello-World/check-runs/128620228")); + assertThat(checkRun.getHtmlUrl().toString(), + endsWith("https://github.com/Codertocat/Hello-World/runs/128620228")); assertThat(checkRun.getDetailsUrl().toString(), is("https://octocoders.io")); assertThat(checkRun.getApp().getId(), is(29310L)); assertThat(checkRun.getCheckSuite().getId(), is(118578147L)); @@ -417,18 +436,41 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { assertThat(checkRun.getOutput().getText(), nullValue()); assertThat(checkRun.getOutput().getAnnotationsCount(), is(0)); assertThat(checkRun.getOutput().getAnnotationsUrl().toString(), - is("https://api.github.com/repos/Codertocat/Hello-World/check-runs/128620228/annotations")); + endsWith("/repos/Codertocat/Hello-World/check-runs/128620228/annotations")); // Checks the deserialization of sender assertThat(event.getSender().getId(), is(21031067L)); + + assertThat(checkRun.getPullRequests(), notNullValue()); + assertThat(checkRun.getPullRequests().size(), equalTo(1)); + assertThat(checkRun.getPullRequests().get(0).getNumber(), equalTo(2)); + return checkRun; } @Test @Payload("check-suite") public void checkSuiteEvent() throws Exception { GHEventPayload.CheckSuite event = GitHub.offline() - .parseEventPayload(payload.asReader(), GHEventPayload.CheckSuite.class); + .parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.CheckSuite.class); + GHCheckSuite checkSuite = verifyBasicCheckSuiteEvent(event); + assertThat("pull body not populated offline", checkSuite.getPullRequests().get(0).getBody(), nullValue()); + assertThat("using offline github", mockGitHub.getRequestCount(), equalTo(0)); + gitHub = getGitHubBuilder().withEndpoint(mockGitHub.apiServer().baseUrl()).build(); + event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), + GHEventPayload.CheckSuite.class); + checkSuite = verifyBasicCheckSuiteEvent(event); + + int expectedRequestCount = mockGitHub.isUseProxy() ? 3 : 2; + assertThat("pull body should be populated", + checkSuite.getPullRequests().get(0).getBody(), + equalTo("This is a pretty simple change that we need to pull into master.")); + assertThat("multiple getPullRequests() calls are made, the pull is populated only once", + mockGitHub.getRequestCount(), + lessThanOrEqualTo(expectedRequestCount)); + } + + private GHCheckSuite verifyBasicCheckSuiteEvent(GHEventPayload.CheckSuite event) throws IOException { assertThat(event.getRepository().getName(), is("Hello-World")); assertThat(event.getRepository().getOwner().getLogin(), is("Codertocat")); assertThat(event.getAction(), is("completed")); @@ -445,7 +487,7 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { assertThat(checkSuite.getAfter(), is("ec26c3e57ca3a959ca5aad62de7213c562f8c821")); assertThat(checkSuite.getLatestCheckRunsCount(), is(1)); assertThat(checkSuite.getCheckRunsUrl().toString(), - is("https://api.github.com/repos/Codertocat/Hello-World/check-suites/118578147/check-runs")); + endsWith("/repos/Codertocat/Hello-World/check-suites/118578147/check-runs")); assertThat(checkSuite.getHeadCommit().getMessage(), is("Update README.md")); assertThat(checkSuite.getHeadCommit().getId(), is("ec26c3e57ca3a959ca5aad62de7213c562f8c821")); assertThat(checkSuite.getHeadCommit().getTreeId(), is("31b122c26a97cf9af023e9ddab94a82c6e77b0ea")); @@ -457,6 +499,11 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { assertThat(formatter.format(checkSuite.getHeadCommit().getTimestamp()), is("2019-05-15T15:20:30Z")); assertThat(checkSuite.getApp().getId(), is(29310L)); + + assertThat(checkSuite.getPullRequests(), notNullValue()); + assertThat(checkSuite.getPullRequests().size(), equalTo(1)); + assertThat(checkSuite.getPullRequests().get(0).getNumber(), equalTo(2)); + return checkSuite; } @Test diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/repos_codertocat_hello-world_pulls_2-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/repos_codertocat_hello-world_pulls_2-3.json new file mode 100644 index 000000000..c2f9a50f4 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/repos_codertocat_hello-world_pulls_2-3.json @@ -0,0 +1,329 @@ +{ + "url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2", + "id": 279147437, + "node_id": "MDExOlB1bGxSZXF1ZXN0Mjc5MTQ3NDM3", + "html_url": "https://github.com/Codertocat/Hello-World/pull/2", + "diff_url": "https://github.com/Codertocat/Hello-World/pull/2.diff", + "patch_url": "https://github.com/Codertocat/Hello-World/pull/2.patch", + "issue_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/2", + "number": 2, + "state": "closed", + "locked": false, + "title": "Update the README with new information.", + "user": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "body": "This is a pretty simple change that we need to pull into master.", + "created_at": "2019-05-15T15:20:33Z", + "updated_at": "2020-07-11T10:41:23Z", + "closed_at": "2019-05-15T15:21:18Z", + "merged_at": null, + "merge_commit_sha": "c4295bd74fb0f4fda03689c3df3f2803b658fd85", + "assignee": null, + "assignees": [], + "requested_reviewers": [], + "requested_teams": [], + "labels": [], + "milestone": null, + "draft": false, + "commits_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/commits", + "review_comments_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/comments", + "review_comment_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/2/comments", + "statuses_url": "https://api.github.com/repos/Codertocat/Hello-World/statuses/ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "head": { + "label": "Codertocat:changes", + "ref": "changes", + "sha": "ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "user": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "repo": { + "id": 186853002, + "node_id": "MDEwOlJlcG9zaXRvcnkxODY4NTMwMDI=", + "name": "Hello-World", + "full_name": "Codertocat/Hello-World", + "private": false, + "owner": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/Codertocat/Hello-World", + "description": null, + "fork": false, + "url": "https://api.github.com/repos/Codertocat/Hello-World", + "forks_url": "https://api.github.com/repos/Codertocat/Hello-World/forks", + "keys_url": "https://api.github.com/repos/Codertocat/Hello-World/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/Codertocat/Hello-World/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/Codertocat/Hello-World/teams", + "hooks_url": "https://api.github.com/repos/Codertocat/Hello-World/hooks", + "issue_events_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/events{/number}", + "events_url": "https://api.github.com/repos/Codertocat/Hello-World/events", + "assignees_url": "https://api.github.com/repos/Codertocat/Hello-World/assignees{/user}", + "branches_url": "https://api.github.com/repos/Codertocat/Hello-World/branches{/branch}", + "tags_url": "https://api.github.com/repos/Codertocat/Hello-World/tags", + "blobs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/Codertocat/Hello-World/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/Codertocat/Hello-World/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/Codertocat/Hello-World/statuses/{sha}", + "languages_url": "https://api.github.com/repos/Codertocat/Hello-World/languages", + "stargazers_url": "https://api.github.com/repos/Codertocat/Hello-World/stargazers", + "contributors_url": "https://api.github.com/repos/Codertocat/Hello-World/contributors", + "subscribers_url": "https://api.github.com/repos/Codertocat/Hello-World/subscribers", + "subscription_url": "https://api.github.com/repos/Codertocat/Hello-World/subscription", + "commits_url": "https://api.github.com/repos/Codertocat/Hello-World/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/Codertocat/Hello-World/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/Codertocat/Hello-World/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/Codertocat/Hello-World/contents/{+path}", + "compare_url": "https://api.github.com/repos/Codertocat/Hello-World/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/Codertocat/Hello-World/merges", + "archive_url": "https://api.github.com/repos/Codertocat/Hello-World/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/Codertocat/Hello-World/downloads", + "issues_url": "https://api.github.com/repos/Codertocat/Hello-World/issues{/number}", + "pulls_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls{/number}", + "milestones_url": "https://api.github.com/repos/Codertocat/Hello-World/milestones{/number}", + "notifications_url": "https://api.github.com/repos/Codertocat/Hello-World/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/Codertocat/Hello-World/labels{/name}", + "releases_url": "https://api.github.com/repos/Codertocat/Hello-World/releases{/id}", + "deployments_url": "https://api.github.com/repos/Codertocat/Hello-World/deployments", + "created_at": "2019-05-15T15:19:25Z", + "updated_at": "2020-03-18T18:23:11Z", + "pushed_at": "2019-05-15T15:20:57Z", + "git_url": "git://github.com/Codertocat/Hello-World.git", + "ssh_url": "git@github.com:Codertocat/Hello-World.git", + "clone_url": "https://github.com/Codertocat/Hello-World.git", + "svn_url": "https://github.com/Codertocat/Hello-World", + "homepage": null, + "size": 1, + "stargazers_count": 4, + "watchers_count": 4, + "language": "Ruby", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 2, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 1, + "license": null, + "forks": 2, + "open_issues": 1, + "watchers": 4, + "default_branch": "master" + } + }, + "base": { + "label": "Codertocat:master", + "ref": "master", + "sha": "f95f852bd8fca8fcc58a9a2d6c842781e32a215e", + "user": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "repo": { + "id": 186853002, + "node_id": "MDEwOlJlcG9zaXRvcnkxODY4NTMwMDI=", + "name": "Hello-World", + "full_name": "Codertocat/Hello-World", + "private": false, + "owner": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/Codertocat/Hello-World", + "description": null, + "fork": false, + "url": "https://api.github.com/repos/Codertocat/Hello-World", + "forks_url": "https://api.github.com/repos/Codertocat/Hello-World/forks", + "keys_url": "https://api.github.com/repos/Codertocat/Hello-World/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/Codertocat/Hello-World/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/Codertocat/Hello-World/teams", + "hooks_url": "https://api.github.com/repos/Codertocat/Hello-World/hooks", + "issue_events_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/events{/number}", + "events_url": "https://api.github.com/repos/Codertocat/Hello-World/events", + "assignees_url": "https://api.github.com/repos/Codertocat/Hello-World/assignees{/user}", + "branches_url": "https://api.github.com/repos/Codertocat/Hello-World/branches{/branch}", + "tags_url": "https://api.github.com/repos/Codertocat/Hello-World/tags", + "blobs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/Codertocat/Hello-World/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/Codertocat/Hello-World/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/Codertocat/Hello-World/statuses/{sha}", + "languages_url": "https://api.github.com/repos/Codertocat/Hello-World/languages", + "stargazers_url": "https://api.github.com/repos/Codertocat/Hello-World/stargazers", + "contributors_url": "https://api.github.com/repos/Codertocat/Hello-World/contributors", + "subscribers_url": "https://api.github.com/repos/Codertocat/Hello-World/subscribers", + "subscription_url": "https://api.github.com/repos/Codertocat/Hello-World/subscription", + "commits_url": "https://api.github.com/repos/Codertocat/Hello-World/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/Codertocat/Hello-World/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/Codertocat/Hello-World/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/Codertocat/Hello-World/contents/{+path}", + "compare_url": "https://api.github.com/repos/Codertocat/Hello-World/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/Codertocat/Hello-World/merges", + "archive_url": "https://api.github.com/repos/Codertocat/Hello-World/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/Codertocat/Hello-World/downloads", + "issues_url": "https://api.github.com/repos/Codertocat/Hello-World/issues{/number}", + "pulls_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls{/number}", + "milestones_url": "https://api.github.com/repos/Codertocat/Hello-World/milestones{/number}", + "notifications_url": "https://api.github.com/repos/Codertocat/Hello-World/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/Codertocat/Hello-World/labels{/name}", + "releases_url": "https://api.github.com/repos/Codertocat/Hello-World/releases{/id}", + "deployments_url": "https://api.github.com/repos/Codertocat/Hello-World/deployments", + "created_at": "2019-05-15T15:19:25Z", + "updated_at": "2020-03-18T18:23:11Z", + "pushed_at": "2019-05-15T15:20:57Z", + "git_url": "git://github.com/Codertocat/Hello-World.git", + "ssh_url": "git@github.com:Codertocat/Hello-World.git", + "clone_url": "https://github.com/Codertocat/Hello-World.git", + "svn_url": "https://github.com/Codertocat/Hello-World", + "homepage": null, + "size": 1, + "stargazers_count": 4, + "watchers_count": 4, + "language": "Ruby", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 2, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 1, + "license": null, + "forks": 2, + "open_issues": 1, + "watchers": 4, + "default_branch": "master" + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2" + }, + "html": { + "href": "https://github.com/Codertocat/Hello-World/pull/2" + }, + "issue": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/issues/2" + }, + "comments": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/issues/2/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/statuses/ec26c3e57ca3a959ca5aad62de7213c562f8c821" + } + }, + "author_association": "OWNER", + "active_lock_reason": null, + "merged": false, + "mergeable": true, + "rebaseable": false, + "mergeable_state": "clean", + "merged_by": null, + "comments": 2, + "review_comments": 3, + "maintainer_can_modify": false, + "commits": 1, + "additions": 1, + "deletions": 1, + "changed_files": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/user-1.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/user-1.json new file mode 100644 index 000000000..ab7a3f404 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/user-1.json @@ -0,0 +1,46 @@ +{ + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false, + "name": "Liam Newman", + "company": "Cloudbees, Inc.", + "blog": "", + "location": "Seattle, WA, USA", + "email": "bitwiseman@gmail.com", + "hireable": null, + "bio": null, + "twitter_username": "bitwiseman", + "public_repos": 197, + "public_gists": 7, + "followers": 164, + "following": 9, + "created_at": "2012-07-11T20:38:33Z", + "updated_at": "2020-07-30T20:38:23Z", + "private_gists": 19, + "total_private_repos": 13, + "owned_private_repos": 0, + "disk_usage": 33700, + "collaborators": 0, + "two_factor_authentication": true, + "plan": { + "name": "free", + "space": 976562499, + "collaborators": 0, + "private_repos": 10000 + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/users_codertocat-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/users_codertocat-2.json new file mode 100644 index 000000000..5c9453c4b --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/__files/users_codertocat-2.json @@ -0,0 +1,34 @@ +{ + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false, + "name": "Codertocat", + "company": null, + "blog": "", + "location": "Octoverse", + "email": null, + "hireable": null, + "bio": "⚡️ ☕️ ", + "twitter_username": null, + "public_repos": 3, + "public_gists": 0, + "followers": 38, + "following": 0, + "created_at": "2016-08-15T03:51:49Z", + "updated_at": "2020-05-25T00:39:05Z" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json new file mode 100644 index 000000000..93152212b --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json @@ -0,0 +1,46 @@ +{ + "id": "abca14dd-149a-458c-8aa6-a774c620cc44", + "name": "repos_codertocat_hello-world_pulls_2", + "request": { + "url": "/repos/Codertocat/Hello-World/pulls/2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "application/vnd.github.shadow-cat-preview+json" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_codertocat_hello-world_pulls_2-3.json", + "headers": { + "Server": "GitHub.com", + "Date": "Fri, 31 Jul 2020 21:47:31 GMT", + "Content-Type": "application/json; charset=utf-8", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4980", + "X-RateLimit-Reset": "1596235134", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With" + ], + "ETag": "W/\"6f504844c60099cd7bf7576af481d6b8\"", + "Last-Modified": "Sat, 11 Jul 2020 10:41:23 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "github.v3; param=shadow-cat-preview; format=json", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "F660:5BE7:14CF46:300F25:5F249173" + } + }, + "uuid": "abca14dd-149a-458c-8aa6-a774c620cc44", + "persistent": true, + "insertionIndex": 3 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/user-1.json new file mode 100644 index 000000000..da2d9cc24 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/user-1.json @@ -0,0 +1,46 @@ +{ + "id": "7311a2f2-a7f7-45a8-bd1b-8eaa4dd986d5", + "name": "user", + "request": { + "url": "/user", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "user-1.json", + "headers": { + "Server": "GitHub.com", + "Date": "Fri, 31 Jul 2020 21:47:31 GMT", + "Content-Type": "application/json; charset=utf-8", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4982", + "X-RateLimit-Reset": "1596235134", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With" + ], + "ETag": "W/\"fd90864a27d8465275943fa60d303b11\"", + "Last-Modified": "Thu, 30 Jul 2020 20:38:23 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "F660:5BE7:14CF24:300ED5:5F249173" + } + }, + "uuid": "7311a2f2-a7f7-45a8-bd1b-8eaa4dd986d5", + "persistent": true, + "insertionIndex": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/users_codertocat-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/users_codertocat-2.json new file mode 100644 index 000000000..efb210c26 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkRunEvent/mappings/users_codertocat-2.json @@ -0,0 +1,46 @@ +{ + "id": "dda0acac-03c9-444c-8bca-8054f499937e", + "name": "users_codertocat", + "request": { + "url": "/users/Codertocat", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "users_codertocat-2.json", + "headers": { + "Server": "GitHub.com", + "Date": "Fri, 31 Jul 2020 21:47:31 GMT", + "Content-Type": "application/json; charset=utf-8", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4981", + "X-RateLimit-Reset": "1596235134", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With" + ], + "ETag": "W/\"d13752bbc4a282a7318b1ee3e52f041e\"", + "Last-Modified": "Mon, 25 May 2020 00:39:05 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "F660:5BE7:14CF3D:300EDF:5F249173" + } + }, + "uuid": "dda0acac-03c9-444c-8bca-8054f499937e", + "persistent": true, + "insertionIndex": 2 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/repos_codertocat_hello-world_pulls_2-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/repos_codertocat_hello-world_pulls_2-3.json new file mode 100644 index 000000000..c2f9a50f4 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/repos_codertocat_hello-world_pulls_2-3.json @@ -0,0 +1,329 @@ +{ + "url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2", + "id": 279147437, + "node_id": "MDExOlB1bGxSZXF1ZXN0Mjc5MTQ3NDM3", + "html_url": "https://github.com/Codertocat/Hello-World/pull/2", + "diff_url": "https://github.com/Codertocat/Hello-World/pull/2.diff", + "patch_url": "https://github.com/Codertocat/Hello-World/pull/2.patch", + "issue_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/2", + "number": 2, + "state": "closed", + "locked": false, + "title": "Update the README with new information.", + "user": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "body": "This is a pretty simple change that we need to pull into master.", + "created_at": "2019-05-15T15:20:33Z", + "updated_at": "2020-07-11T10:41:23Z", + "closed_at": "2019-05-15T15:21:18Z", + "merged_at": null, + "merge_commit_sha": "c4295bd74fb0f4fda03689c3df3f2803b658fd85", + "assignee": null, + "assignees": [], + "requested_reviewers": [], + "requested_teams": [], + "labels": [], + "milestone": null, + "draft": false, + "commits_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/commits", + "review_comments_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/comments", + "review_comment_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/2/comments", + "statuses_url": "https://api.github.com/repos/Codertocat/Hello-World/statuses/ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "head": { + "label": "Codertocat:changes", + "ref": "changes", + "sha": "ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "user": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "repo": { + "id": 186853002, + "node_id": "MDEwOlJlcG9zaXRvcnkxODY4NTMwMDI=", + "name": "Hello-World", + "full_name": "Codertocat/Hello-World", + "private": false, + "owner": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/Codertocat/Hello-World", + "description": null, + "fork": false, + "url": "https://api.github.com/repos/Codertocat/Hello-World", + "forks_url": "https://api.github.com/repos/Codertocat/Hello-World/forks", + "keys_url": "https://api.github.com/repos/Codertocat/Hello-World/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/Codertocat/Hello-World/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/Codertocat/Hello-World/teams", + "hooks_url": "https://api.github.com/repos/Codertocat/Hello-World/hooks", + "issue_events_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/events{/number}", + "events_url": "https://api.github.com/repos/Codertocat/Hello-World/events", + "assignees_url": "https://api.github.com/repos/Codertocat/Hello-World/assignees{/user}", + "branches_url": "https://api.github.com/repos/Codertocat/Hello-World/branches{/branch}", + "tags_url": "https://api.github.com/repos/Codertocat/Hello-World/tags", + "blobs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/Codertocat/Hello-World/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/Codertocat/Hello-World/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/Codertocat/Hello-World/statuses/{sha}", + "languages_url": "https://api.github.com/repos/Codertocat/Hello-World/languages", + "stargazers_url": "https://api.github.com/repos/Codertocat/Hello-World/stargazers", + "contributors_url": "https://api.github.com/repos/Codertocat/Hello-World/contributors", + "subscribers_url": "https://api.github.com/repos/Codertocat/Hello-World/subscribers", + "subscription_url": "https://api.github.com/repos/Codertocat/Hello-World/subscription", + "commits_url": "https://api.github.com/repos/Codertocat/Hello-World/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/Codertocat/Hello-World/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/Codertocat/Hello-World/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/Codertocat/Hello-World/contents/{+path}", + "compare_url": "https://api.github.com/repos/Codertocat/Hello-World/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/Codertocat/Hello-World/merges", + "archive_url": "https://api.github.com/repos/Codertocat/Hello-World/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/Codertocat/Hello-World/downloads", + "issues_url": "https://api.github.com/repos/Codertocat/Hello-World/issues{/number}", + "pulls_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls{/number}", + "milestones_url": "https://api.github.com/repos/Codertocat/Hello-World/milestones{/number}", + "notifications_url": "https://api.github.com/repos/Codertocat/Hello-World/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/Codertocat/Hello-World/labels{/name}", + "releases_url": "https://api.github.com/repos/Codertocat/Hello-World/releases{/id}", + "deployments_url": "https://api.github.com/repos/Codertocat/Hello-World/deployments", + "created_at": "2019-05-15T15:19:25Z", + "updated_at": "2020-03-18T18:23:11Z", + "pushed_at": "2019-05-15T15:20:57Z", + "git_url": "git://github.com/Codertocat/Hello-World.git", + "ssh_url": "git@github.com:Codertocat/Hello-World.git", + "clone_url": "https://github.com/Codertocat/Hello-World.git", + "svn_url": "https://github.com/Codertocat/Hello-World", + "homepage": null, + "size": 1, + "stargazers_count": 4, + "watchers_count": 4, + "language": "Ruby", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 2, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 1, + "license": null, + "forks": 2, + "open_issues": 1, + "watchers": 4, + "default_branch": "master" + } + }, + "base": { + "label": "Codertocat:master", + "ref": "master", + "sha": "f95f852bd8fca8fcc58a9a2d6c842781e32a215e", + "user": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "repo": { + "id": 186853002, + "node_id": "MDEwOlJlcG9zaXRvcnkxODY4NTMwMDI=", + "name": "Hello-World", + "full_name": "Codertocat/Hello-World", + "private": false, + "owner": { + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/Codertocat/Hello-World", + "description": null, + "fork": false, + "url": "https://api.github.com/repos/Codertocat/Hello-World", + "forks_url": "https://api.github.com/repos/Codertocat/Hello-World/forks", + "keys_url": "https://api.github.com/repos/Codertocat/Hello-World/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/Codertocat/Hello-World/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/Codertocat/Hello-World/teams", + "hooks_url": "https://api.github.com/repos/Codertocat/Hello-World/hooks", + "issue_events_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/events{/number}", + "events_url": "https://api.github.com/repos/Codertocat/Hello-World/events", + "assignees_url": "https://api.github.com/repos/Codertocat/Hello-World/assignees{/user}", + "branches_url": "https://api.github.com/repos/Codertocat/Hello-World/branches{/branch}", + "tags_url": "https://api.github.com/repos/Codertocat/Hello-World/tags", + "blobs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/Codertocat/Hello-World/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/Codertocat/Hello-World/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/Codertocat/Hello-World/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/Codertocat/Hello-World/statuses/{sha}", + "languages_url": "https://api.github.com/repos/Codertocat/Hello-World/languages", + "stargazers_url": "https://api.github.com/repos/Codertocat/Hello-World/stargazers", + "contributors_url": "https://api.github.com/repos/Codertocat/Hello-World/contributors", + "subscribers_url": "https://api.github.com/repos/Codertocat/Hello-World/subscribers", + "subscription_url": "https://api.github.com/repos/Codertocat/Hello-World/subscription", + "commits_url": "https://api.github.com/repos/Codertocat/Hello-World/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/Codertocat/Hello-World/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/Codertocat/Hello-World/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/Codertocat/Hello-World/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/Codertocat/Hello-World/contents/{+path}", + "compare_url": "https://api.github.com/repos/Codertocat/Hello-World/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/Codertocat/Hello-World/merges", + "archive_url": "https://api.github.com/repos/Codertocat/Hello-World/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/Codertocat/Hello-World/downloads", + "issues_url": "https://api.github.com/repos/Codertocat/Hello-World/issues{/number}", + "pulls_url": "https://api.github.com/repos/Codertocat/Hello-World/pulls{/number}", + "milestones_url": "https://api.github.com/repos/Codertocat/Hello-World/milestones{/number}", + "notifications_url": "https://api.github.com/repos/Codertocat/Hello-World/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/Codertocat/Hello-World/labels{/name}", + "releases_url": "https://api.github.com/repos/Codertocat/Hello-World/releases{/id}", + "deployments_url": "https://api.github.com/repos/Codertocat/Hello-World/deployments", + "created_at": "2019-05-15T15:19:25Z", + "updated_at": "2020-03-18T18:23:11Z", + "pushed_at": "2019-05-15T15:20:57Z", + "git_url": "git://github.com/Codertocat/Hello-World.git", + "ssh_url": "git@github.com:Codertocat/Hello-World.git", + "clone_url": "https://github.com/Codertocat/Hello-World.git", + "svn_url": "https://github.com/Codertocat/Hello-World", + "homepage": null, + "size": 1, + "stargazers_count": 4, + "watchers_count": 4, + "language": "Ruby", + "has_issues": true, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": true, + "forks_count": 2, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 1, + "license": null, + "forks": 2, + "open_issues": 1, + "watchers": 4, + "default_branch": "master" + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2" + }, + "html": { + "href": "https://github.com/Codertocat/Hello-World/pull/2" + }, + "issue": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/issues/2" + }, + "comments": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/issues/2/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/pulls/2/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/Codertocat/Hello-World/statuses/ec26c3e57ca3a959ca5aad62de7213c562f8c821" + } + }, + "author_association": "OWNER", + "active_lock_reason": null, + "merged": false, + "mergeable": true, + "rebaseable": false, + "mergeable_state": "clean", + "merged_by": null, + "comments": 2, + "review_comments": 3, + "maintainer_can_modify": false, + "commits": 1, + "additions": 1, + "deletions": 1, + "changed_files": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/user-1.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/user-1.json new file mode 100644 index 000000000..ab7a3f404 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/user-1.json @@ -0,0 +1,46 @@ +{ + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false, + "name": "Liam Newman", + "company": "Cloudbees, Inc.", + "blog": "", + "location": "Seattle, WA, USA", + "email": "bitwiseman@gmail.com", + "hireable": null, + "bio": null, + "twitter_username": "bitwiseman", + "public_repos": 197, + "public_gists": 7, + "followers": 164, + "following": 9, + "created_at": "2012-07-11T20:38:33Z", + "updated_at": "2020-07-30T20:38:23Z", + "private_gists": 19, + "total_private_repos": 13, + "owned_private_repos": 0, + "disk_usage": 33700, + "collaborators": 0, + "two_factor_authentication": true, + "plan": { + "name": "free", + "space": 976562499, + "collaborators": 0, + "private_repos": 10000 + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/users_codertocat-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/users_codertocat-2.json new file mode 100644 index 000000000..5c9453c4b --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/__files/users_codertocat-2.json @@ -0,0 +1,34 @@ +{ + "login": "Codertocat", + "id": 21031067, + "node_id": "MDQ6VXNlcjIxMDMxMDY3", + "avatar_url": "https://avatars1.githubusercontent.com/u/21031067?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/Codertocat", + "html_url": "https://github.com/Codertocat", + "followers_url": "https://api.github.com/users/Codertocat/followers", + "following_url": "https://api.github.com/users/Codertocat/following{/other_user}", + "gists_url": "https://api.github.com/users/Codertocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/Codertocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/Codertocat/subscriptions", + "organizations_url": "https://api.github.com/users/Codertocat/orgs", + "repos_url": "https://api.github.com/users/Codertocat/repos", + "events_url": "https://api.github.com/users/Codertocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/Codertocat/received_events", + "type": "User", + "site_admin": false, + "name": "Codertocat", + "company": null, + "blog": "", + "location": "Octoverse", + "email": null, + "hireable": null, + "bio": "⚡️ ☕️ ", + "twitter_username": null, + "public_repos": 3, + "public_gists": 0, + "followers": 38, + "following": 0, + "created_at": "2016-08-15T03:51:49Z", + "updated_at": "2020-05-25T00:39:05Z" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json new file mode 100644 index 000000000..2ecbc42e0 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/repos_codertocat_hello-world_pulls_2-3.json @@ -0,0 +1,46 @@ +{ + "id": "450042f9-be05-4c1c-bc1b-3e8a86a99d81", + "name": "repos_codertocat_hello-world_pulls_2", + "request": { + "url": "/repos/Codertocat/Hello-World/pulls/2", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "application/vnd.github.shadow-cat-preview+json" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "repos_codertocat_hello-world_pulls_2-3.json", + "headers": { + "Server": "GitHub.com", + "Date": "Fri, 31 Jul 2020 21:49:55 GMT", + "Content-Type": "application/json; charset=utf-8", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4962", + "X-RateLimit-Reset": "1596235134", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With" + ], + "ETag": "W/\"6f504844c60099cd7bf7576af481d6b8\"", + "Last-Modified": "Sat, 11 Jul 2020 10:41:23 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "github.v3; param=shadow-cat-preview; format=json", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "F8DC:246B:17C38A:34AD28:5F249203" + } + }, + "uuid": "450042f9-be05-4c1c-bc1b-3e8a86a99d81", + "persistent": true, + "insertionIndex": 3 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/user-1.json new file mode 100644 index 000000000..3d794489e --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/user-1.json @@ -0,0 +1,46 @@ +{ + "id": "bb8d640f-470f-49f1-8e0e-1a0181669592", + "name": "user", + "request": { + "url": "/user", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "user-1.json", + "headers": { + "Server": "GitHub.com", + "Date": "Fri, 31 Jul 2020 21:49:54 GMT", + "Content-Type": "application/json; charset=utf-8", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4964", + "X-RateLimit-Reset": "1596235133", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With" + ], + "ETag": "W/\"fd90864a27d8465275943fa60d303b11\"", + "Last-Modified": "Thu, 30 Jul 2020 20:38:23 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "F8DC:246B:17C362:34ACEF:5F249202" + } + }, + "uuid": "bb8d640f-470f-49f1-8e0e-1a0181669592", + "persistent": true, + "insertionIndex": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/users_codertocat-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/users_codertocat-2.json new file mode 100644 index 000000000..02c4a8d10 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/checkSuiteEvent/mappings/users_codertocat-2.json @@ -0,0 +1,46 @@ +{ + "id": "b29d95ea-fbcf-4efe-84d1-14f729bb4322", + "name": "users_codertocat", + "request": { + "url": "/users/Codertocat", + "method": "GET", + "headers": { + "Accept": { + "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + } + } + }, + "response": { + "status": 200, + "bodyFileName": "users_codertocat-2.json", + "headers": { + "Server": "GitHub.com", + "Date": "Fri, 31 Jul 2020 21:49:55 GMT", + "Content-Type": "application/json; charset=utf-8", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4963", + "X-RateLimit-Reset": "1596235134", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding, Accept, X-Requested-With" + ], + "ETag": "W/\"d13752bbc4a282a7318b1ee3e52f041e\"", + "Last-Modified": "Mon, 25 May 2020 00:39:05 GMT", + "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", + "X-Accepted-OAuth-Scopes": "", + "X-GitHub-Media-Type": "unknown, github.v3", + "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options": "deny", + "X-Content-Type-Options": "nosniff", + "X-XSS-Protection": "1; mode=block", + "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy": "default-src 'none'", + "X-GitHub-Request-Id": "F8DC:246B:17C37F:34ACF6:5F249202" + } + }, + "uuid": "b29d95ea-fbcf-4efe-84d1-14f729bb4322", + "persistent": true, + "insertionIndex": 2 +} \ No newline at end of file From 9cfc3c22b5efd06f9a6cdddb088e815feb70cc35 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Fri, 31 Jul 2020 16:03:34 -0700 Subject: [PATCH 19/20] Add GHEvent.WORKFLOW_RUN --- src/main/java/org/kohsuke/github/GHEvent.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/kohsuke/github/GHEvent.java b/src/main/java/org/kohsuke/github/GHEvent.java index d60115be9..0fb2834cb 100644 --- a/src/main/java/org/kohsuke/github/GHEvent.java +++ b/src/main/java/org/kohsuke/github/GHEvent.java @@ -63,6 +63,7 @@ public enum GHEvent { TEAM_ADD, WATCH, WORKFLOW_DISPATCH, + WORKFLOW_RUN, /** * Special event type that means "every possible event" From 77dc009c95cd14178324402d4dc8fc1e41887956 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 02:00:46 +0000 Subject: [PATCH 20/20] Chore(deps): Bump spotbugs.version from 4.0.6 to 4.1.1 Bumps `spotbugs.version` from 4.0.6 to 4.1.1. Updates `spotbugs` from 4.0.6 to 4.1.1 - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.6...4.1.1) Updates `spotbugs-annotations` from 4.0.6 to 4.1.1 - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.6...4.1.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32db3ee6d..43d56b352 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ UTF-8 4.0.4 - 4.0.6 + 4.1.1 true 2.2 4.4.1