diff --git a/src/test/java/org/kohsuke/github/GHPullRequestTest.java b/src/test/java/org/kohsuke/github/GHPullRequestTest.java index c1c61fb21..1d67f7315 100644 --- a/src/test/java/org/kohsuke/github/GHPullRequestTest.java +++ b/src/test/java/org/kohsuke/github/GHPullRequestTest.java @@ -132,22 +132,47 @@ public class GHPullRequestTest extends AbstractGitHubWireMockTest { GHTeam testTeam = testOrg.getTeamBySlug("dummy-team"); p.requestTeamReviewers(Collections.singletonList(testTeam)); + + int baseRequestCount = mockGitHub.getRequestCount(); p.refresh(); - assertFalse(p.getRequestedTeams().isEmpty()); + assertThat("We should not eagerly load organizations for teams", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(1)); + assertThat(p.getRequestedTeams().size(), equalTo(1)); + assertThat("We should not eagerly load organizations for teams", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(1)); + assertThat("Org should be queried for automatically if asked for", + p.getRequestedTeams().get(0).getOrganization(), notNullValue()); + assertThat("Request count should show lazy load occurred", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(2)); } + @Test public void mergeCommitSHA() throws Exception { String name = "mergeCommitSHA"; - GHPullRequest p = getRepository().createPullRequest(name, "test/mergeable_branch", "master", "## test"); - p.getMergeable(); - // mergeability computation takes time. give it more chance - Thread.sleep(1000); - for (int i = 0; i < 10; i++) { - GHPullRequest updated = getRepository().getPullRequest(p.getNumber()); - if (updated.getMergeable() && updated.getMergeCommitSha() != null) { + GHRepository repo = getRepository(); + GHPullRequest p = repo.createPullRequest(name, "test/mergeable_branch", "master", "## test"); + int baseRequestCount = mockGitHub.getRequestCount(); + assertThat(p.getMergeableNoRefresh(), nullValue()); + assertThat("Used existing value", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(0)); + + // mergeability computation takes time, this should still be null immediately after creation + assertThat(p.getMergeable(), nullValue()); + assertThat("Asked for PR information", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(1)); + + for (int i = 2; i <= 10; i++) { + if (Boolean.TRUE.equals(p.getMergeable()) && p.getMergeCommitSha() != null) { + assertThat("Asked for PR information", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(i)); + // make sure commit exists - GHCommit commit = getRepository().getCommit(updated.getMergeCommitSha()); + GHCommit commit = repo.getCommit(p.getMergeCommitSha()); assertNotNull(commit); + + assertThat("Asked for PR information", + mockGitHub.getRequestCount() - baseRequestCount , equalTo(i + 1)); + return; } diff --git a/src/test/java/org/kohsuke/github/GHTeamTest.java b/src/test/java/org/kohsuke/github/GHTeamTest.java index 0e636a9d8..208f07f7d 100644 --- a/src/test/java/org/kohsuke/github/GHTeamTest.java +++ b/src/test/java/org/kohsuke/github/GHTeamTest.java @@ -30,4 +30,6 @@ public class GHTeamTest extends AbstractGitHubWireMockTest { team = gitHub.getOrganization(GITHUB_API_TEST_ORG).getTeamBySlug(teamSlug); assertEquals(description, team.getDescription()); } + + } diff --git a/src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java b/src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java index cc3d1b88b..381a2c437 100644 --- a/src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java +++ b/src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java @@ -215,7 +215,7 @@ public class OkHttpConnectorTest extends AbstractGitHubWireMockTest { private void checkRequestAndLimit(int networkRequestCount, int rateLimitUsed) throws IOException { GHRateLimit rateLimitAfter = gitHub.rateLimit(); assertThat("Request Count", - getRequestCount(), + mockGitHub.getRequestCount(), is(networkRequestCount + userRequestCount)); // Rate limit must be under this value, but if it wiggles we don't care @@ -225,10 +225,6 @@ public class OkHttpConnectorTest extends AbstractGitHubWireMockTest { } - private int getRequestCount() { - return mockGitHub.apiServer().countRequestsMatching(RequestPatternBuilder.allRequests().build()).getCount(); - } - private OkHttpClient createClient(boolean useCache) throws IOException { OkHttpClient client = new OkHttpClient(); diff --git a/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java b/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java index dcb744a9f..7d008fdff 100644 --- a/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java +++ b/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java @@ -9,6 +9,7 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.extension.Parameters; import com.github.tomakehurst.wiremock.extension.ResponseTransformer; import com.github.tomakehurst.wiremock.http.*; +import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder; import com.github.tomakehurst.wiremock.verification.*; import com.google.gson.*; import org.junit.rules.MethodRule; @@ -118,6 +119,15 @@ public class GitHubWireMockRule extends WireMockMultiServerRule { } } + public int getRequestCount() { + return getRequestCount(apiServer()); + } + + public static int getRequestCount(WireMockServer server) { + return server.countRequestsMatching(RequestPatternBuilder.allRequests().build()).getCount(); + } + + private void formatJsonFiles(Path path) { // The more consistent we can make the json output the more meaningful it will be. Gson g = new Gson().newBuilder().serializeNulls().disableHtmlEscaping().setPrettyPrinting() diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-9a6723ee-af32-469d-a26a-5f8eca5da1fb.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json similarity index 96% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-9a6723ee-af32-469d-a26a-5f8eca5da1fb.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json index 61547e3d9..6a1869b89 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-9a6723ee-af32-469d-a26a-5f8eca5da1fb.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json @@ -14,7 +14,7 @@ "is_verified": false, "has_organization_projects": true, "has_repository_projects": true, - "public_repos": 9, + "public_repos": 10, "public_gists": 0, "followers": 0, "following": 0, @@ -35,7 +35,7 @@ "name": "free", "space": 976562499, "private_repos": 0, - "filled_seats": 3, + "filled_seats": 5, "seats": 0 } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-0605c9f6-9c49-40ed-864f-ad6bc27e8b71.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-0605c9f6-9c49-40ed-864f-ad6bc27e8b71.json deleted file mode 100644 index 34838e665..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-0605c9f6-9c49-40ed-864f-ad6bc27e8b71.json +++ /dev/null @@ -1,330 +0,0 @@ -{ - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "github-api-test-org/github-api", - "private": false, - "owner": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/github-api", - "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", - "git_url": "git://github.com/github-api-test-org/github-api.git", - "ssh_url": "git@github.com:github-api-test-org/github-api.git", - "clone_url": "https://github.com/github-api-test-org/github-api.git", - "svn_url": "https://github.com/github-api-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "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": 1, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 1, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "organization": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "github-api/github-api", - "private": false, - "owner": { - "login": "github-api", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/github-api", - "html_url": "https://github.com/github-api", - "followers_url": "https://api.github.com/users/github-api/followers", - "following_url": "https://api.github.com/users/github-api/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api/subscriptions", - "organizations_url": "https://api.github.com/users/github-api/orgs", - "repos_url": "https://api.github.com/users/github-api/repos", - "events_url": "https://api.github.com/users/github-api/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/github-api/github-api", - "forks_url": "https://api.github.com/repos/github-api/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", - "git_url": "git://github.com/github-api/github-api.git", - "ssh_url": "git@github.com:github-api/github-api.git", - "clone_url": "https://github.com/github-api/github-api.git", - "svn_url": "https://github.com/github-api/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 427, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 96, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 427, - "open_issues": 96, - "watchers": 551, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "github-api/github-api", - "private": false, - "owner": { - "login": "github-api", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/github-api", - "html_url": "https://github.com/github-api", - "followers_url": "https://api.github.com/users/github-api/followers", - "following_url": "https://api.github.com/users/github-api/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api/subscriptions", - "organizations_url": "https://api.github.com/users/github-api/orgs", - "repos_url": "https://api.github.com/users/github-api/repos", - "events_url": "https://api.github.com/users/github-api/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/github-api/github-api", - "forks_url": "https://api.github.com/repos/github-api/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", - "git_url": "git://github.com/github-api/github-api.git", - "ssh_url": "git@github.com:github-api/github-api.git", - "clone_url": "https://github.com/github-api/github-api.git", - "svn_url": "https://github.com/github-api/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 427, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 96, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 427, - "open_issues": 96, - "watchers": 551, - "default_branch": "master" - }, - "network_count": 427, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-28e3a735-30c7-4678-a90e-8b4d6bdeff31.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-28e3a735-30c7-4678-a90e-8b4d6bdeff31.json deleted file mode 100644 index 34838e665..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-28e3a735-30c7-4678-a90e-8b4d6bdeff31.json +++ /dev/null @@ -1,330 +0,0 @@ -{ - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "github-api-test-org/github-api", - "private": false, - "owner": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/github-api", - "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", - "git_url": "git://github.com/github-api-test-org/github-api.git", - "ssh_url": "git@github.com:github-api-test-org/github-api.git", - "clone_url": "https://github.com/github-api-test-org/github-api.git", - "svn_url": "https://github.com/github-api-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "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": 1, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 1, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "organization": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "github-api/github-api", - "private": false, - "owner": { - "login": "github-api", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/github-api", - "html_url": "https://github.com/github-api", - "followers_url": "https://api.github.com/users/github-api/followers", - "following_url": "https://api.github.com/users/github-api/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api/subscriptions", - "organizations_url": "https://api.github.com/users/github-api/orgs", - "repos_url": "https://api.github.com/users/github-api/repos", - "events_url": "https://api.github.com/users/github-api/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/github-api/github-api", - "forks_url": "https://api.github.com/repos/github-api/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", - "git_url": "git://github.com/github-api/github-api.git", - "ssh_url": "git@github.com:github-api/github-api.git", - "clone_url": "https://github.com/github-api/github-api.git", - "svn_url": "https://github.com/github-api/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 427, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 96, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 427, - "open_issues": 96, - "watchers": 551, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "github-api/github-api", - "private": false, - "owner": { - "login": "github-api", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/github-api", - "html_url": "https://github.com/github-api", - "followers_url": "https://api.github.com/users/github-api/followers", - "following_url": "https://api.github.com/users/github-api/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api/subscriptions", - "organizations_url": "https://api.github.com/users/github-api/orgs", - "repos_url": "https://api.github.com/users/github-api/repos", - "events_url": "https://api.github.com/users/github-api/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/github-api/github-api", - "forks_url": "https://api.github.com/repos/github-api/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", - "git_url": "git://github.com/github-api/github-api.git", - "ssh_url": "git@github.com:github-api/github-api.git", - "clone_url": "https://github.com/github-api/github-api.git", - "svn_url": "https://github.com/github-api/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 427, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 96, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 427, - "open_issues": 96, - "watchers": 551, - "default_branch": "master" - }, - "network_count": 427, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-304b1818-f809-4768-940e-50792fb3f7fc.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-304b1818-f809-4768-940e-50792fb3f7fc.json deleted file mode 100644 index 34838e665..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-304b1818-f809-4768-940e-50792fb3f7fc.json +++ /dev/null @@ -1,330 +0,0 @@ -{ - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "github-api-test-org/github-api", - "private": false, - "owner": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/github-api", - "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", - "git_url": "git://github.com/github-api-test-org/github-api.git", - "ssh_url": "git@github.com:github-api-test-org/github-api.git", - "clone_url": "https://github.com/github-api-test-org/github-api.git", - "svn_url": "https://github.com/github-api-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "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": 1, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 1, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "organization": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "github-api/github-api", - "private": false, - "owner": { - "login": "github-api", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/github-api", - "html_url": "https://github.com/github-api", - "followers_url": "https://api.github.com/users/github-api/followers", - "following_url": "https://api.github.com/users/github-api/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api/subscriptions", - "organizations_url": "https://api.github.com/users/github-api/orgs", - "repos_url": "https://api.github.com/users/github-api/repos", - "events_url": "https://api.github.com/users/github-api/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/github-api/github-api", - "forks_url": "https://api.github.com/repos/github-api/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", - "git_url": "git://github.com/github-api/github-api.git", - "ssh_url": "git@github.com:github-api/github-api.git", - "clone_url": "https://github.com/github-api/github-api.git", - "svn_url": "https://github.com/github-api/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 427, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 96, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 427, - "open_issues": 96, - "watchers": 551, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "github-api/github-api", - "private": false, - "owner": { - "login": "github-api", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/github-api", - "html_url": "https://github.com/github-api", - "followers_url": "https://api.github.com/users/github-api/followers", - "following_url": "https://api.github.com/users/github-api/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api/subscriptions", - "organizations_url": "https://api.github.com/users/github-api/orgs", - "repos_url": "https://api.github.com/users/github-api/repos", - "events_url": "https://api.github.com/users/github-api/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/github-api/github-api", - "forks_url": "https://api.github.com/repos/github-api/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", - "git_url": "git://github.com/github-api/github-api.git", - "ssh_url": "git@github.com:github-api/github-api.git", - "clone_url": "https://github.com/github-api/github-api.git", - "svn_url": "https://github.com/github-api/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 427, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 96, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 427, - "open_issues": 96, - "watchers": 551, - "default_branch": "master" - }, - "network_count": 427, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-a531caa8-31f1-4277-9cd4-698d0e32f079.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json similarity index 96% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-a531caa8-31f1-4277-9cd4-698d0e32f079.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json index a69a4fcbd..6df07c5a9 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-a531caa8-31f1-4277-9cd4-698d0e32f079.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json @@ -25,7 +25,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -65,18 +65,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:35Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:06:15Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -192,27 +192,27 @@ "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", + "updated_at": "2019-10-05T15:04:16Z", + "pushed_at": "2019-10-05T13:19:54Z", "git_url": "git://github.com/github-api/github-api.git", "ssh_url": "git@github.com:github-api/github-api.git", "clone_url": "https://github.com/github-api/github-api.git", "svn_url": "https://github.com/github-api/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, + "size": 12841, + "stargazers_count": 558, + "watchers_count": 558, "language": "Java", "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, "has_pages": true, - "forks_count": 427, + "forks_count": 429, "mirror_url": null, "archived": false, "disabled": false, - "open_issues_count": 96, + "open_issues_count": 82, "license": { "key": "mit", "name": "MIT License", @@ -220,9 +220,9 @@ "url": "https://api.github.com/licenses/mit", "node_id": "MDc6TGljZW5zZTEz" }, - "forks": 427, - "open_issues": 96, - "watchers": 551, + "forks": 429, + "open_issues": 82, + "watchers": 558, "default_branch": "master" }, "source": { @@ -292,27 +292,27 @@ "releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api/github-api/deployments", "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2019-09-07T00:07:16Z", - "pushed_at": "2019-09-07T00:07:14Z", + "updated_at": "2019-10-05T15:04:16Z", + "pushed_at": "2019-10-05T13:19:54Z", "git_url": "git://github.com/github-api/github-api.git", "ssh_url": "git@github.com:github-api/github-api.git", "clone_url": "https://github.com/github-api/github-api.git", "svn_url": "https://github.com/github-api/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 551, - "watchers_count": 551, + "size": 12841, + "stargazers_count": 558, + "watchers_count": 558, "language": "Java", "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, "has_pages": true, - "forks_count": 427, + "forks_count": 429, "mirror_url": null, "archived": false, "disabled": false, - "open_issues_count": 96, + "open_issues_count": 82, "license": { "key": "mit", "name": "MIT License", @@ -320,11 +320,11 @@ "url": "https://api.github.com/licenses/mit", "node_id": "MDc6TGljZW5zZTEz" }, - "forks": 427, - "open_issues": 96, - "watchers": 551, + "forks": 429, + "open_issues": 82, + "watchers": 558, "default_branch": "master" }, - "network_count": 427, + "network_count": 429, "subscribers_count": 0 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-d61ffef0-862d-4b9b-9817-ff777efb8c5e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json similarity index 70% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-d61ffef0-862d-4b9b-9817-ff777efb8c5e.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json index 675a4f8ae..82387e966 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-d61ffef0-862d-4b9b-9817-ff777efb8c5e.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json @@ -1,34 +1,34 @@ { - "sha": "a6d4683ed59c03bda91ef94ec463ae95ac0d31da", - "node_id": "MDY6Q29tbWl0MjA2ODg4MjAxOmE2ZDQ2ODNlZDU5YzAzYmRhOTFlZjk0ZWM0NjNhZTk1YWMwZDMxZGE=", + "sha": "48eb1a9b8cd56782d11ea45adcf062eade17528e", + "node_id": "MDY6Q29tbWl0MjA2ODg4MjAxOjQ4ZWIxYTliOGNkNTY3ODJkMTFlYTQ1YWRjZjA2MmVhZGUxNzUyOGU=", "commit": { "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-09-08T07:24:38Z" + "date": "2019-10-05T21:11:41Z" }, "committer": { "name": "GitHub", "email": "noreply@github.com", - "date": "2019-09-08T07:24:38Z" + "date": "2019-10-05T21:11:41Z" }, - "message": "Merge b036909fcf45565c82c888ee326ebd0e382f6173 into 912e2176a00e60e02196737e0ae4c218a14b5dcb", + "message": "Merge b036909fcf45565c82c888ee326ebd0e382f6173 into 3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", "tree": { - "sha": "b47f8df1c36a62c6d67bc9bb905fbe10ea30ba16", - "url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees/b47f8df1c36a62c6d67bc9bb905fbe10ea30ba16" + "sha": "3abf688e5c9e7c888f28a1672cd59a59cf414159", + "url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees/3abf688e5c9e7c888f28a1672cd59a59cf414159" }, - "url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits/a6d4683ed59c03bda91ef94ec463ae95ac0d31da", + "url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits/48eb1a9b8cd56782d11ea45adcf062eade17528e", "comment_count": 0, "verification": { "verified": true, "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJddKy2CRBK7hj4Ov3rIwAAdHIIAA1Er8XH1+vjTIgGhT3487SE\n44Z1hM7ME3y/j6pcXwtlK4AyS6UAjEZ5oFRBQAajStVU4NwUUaTz/5sq+EOjTo/t\nVdeKyR7jydBe/3I5wnPwgLSB8JqvxSWAE+vEhopN0EwrCDmjPlMcN+FHGnhXNu7D\niC8AarpNiK22CNeujOKfN5fNpkmwwkIAK8HCpv5OChqHfooJG2YD23ErIN0oPr47\naZIAe02cIfElm5veY1u4A+UJw9mPWOCnNRpzuVzcymeoY3CqeB1Vs8RoT+uUab3p\npEWuNwLLuwSCevg2t2TEqdU4IG4To1kxTn9pwbzKmR5stC6lpPQwLIK7K7BbaIM=\n=JFHD\n-----END PGP SIGNATURE-----\n", - "payload": "tree b47f8df1c36a62c6d67bc9bb905fbe10ea30ba16\nparent 912e2176a00e60e02196737e0ae4c218a14b5dcb\nparent b036909fcf45565c82c888ee326ebd0e382f6173\nauthor Liam Newman 1567927478 +0000\ncommitter GitHub 1567927478 +0000\n\nMerge b036909fcf45565c82c888ee326ebd0e382f6173 into 912e2176a00e60e02196737e0ae4c218a14b5dcb\n" + "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJdmQcNCRBK7hj4Ov3rIwAAdHIIAEOQH/mfMnhJReTmpOTLdyB3\nD0LBkuzbiZybP1TAtYFbRJRU9KspRFm/VxbClq2DkL5RJQ0aR64xDbG3bCyoPCYJ\nNMgaB7D569+EJldQyG1HRY8FUMw4JEXQ9Vu8z9R7qD95cOk0IvKx7VzZmUM1LNmJ\nUhMz+bcMVSyAkd5YgAjNhnlFF5WIvLISALOyuh7ollKkQWIbA61mK9CDF1BRJxk8\nwrgSineedyTrxptbZ0MkdoFRsOftTL4zYECcUPP4gfnSS8ZzKb4t7o5qKMEs9Uo3\nUGr0Lz/gT5lgvRLMfNJJBXOCPLpT+32RtlvS3EehJkkiPlAzgfjd91YHIuvOELQ=\n=RNmv\n-----END PGP SIGNATURE-----\n", + "payload": "tree 3abf688e5c9e7c888f28a1672cd59a59cf414159\nparent 3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353\nparent b036909fcf45565c82c888ee326ebd0e382f6173\nauthor Liam Newman 1570309901 +0000\ncommitter GitHub 1570309901 +0000\n\nMerge b036909fcf45565c82c888ee326ebd0e382f6173 into 3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353\n" } }, - "url": "https://api.github.com/repos/github-api-test-org/github-api/commits/a6d4683ed59c03bda91ef94ec463ae95ac0d31da", - "html_url": "https://github.com/github-api-test-org/github-api/commit/a6d4683ed59c03bda91ef94ec463ae95ac0d31da", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/commits/a6d4683ed59c03bda91ef94ec463ae95ac0d31da/comments", + "url": "https://api.github.com/repos/github-api-test-org/github-api/commits/48eb1a9b8cd56782d11ea45adcf062eade17528e", + "html_url": "https://github.com/github-api-test-org/github-api/commit/48eb1a9b8cd56782d11ea45adcf062eade17528e", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/commits/48eb1a9b8cd56782d11ea45adcf062eade17528e/comments", "author": { "login": "bitwiseman", "id": 1958953, @@ -71,9 +71,9 @@ }, "parents": [ { - "sha": "912e2176a00e60e02196737e0ae4c218a14b5dcb", - "url": "https://api.github.com/repos/github-api-test-org/github-api/commits/912e2176a00e60e02196737e0ae4c218a14b5dcb", - "html_url": "https://github.com/github-api-test-org/github-api/commit/912e2176a00e60e02196737e0ae4c218a14b5dcb" + "sha": "3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", + "url": "https://api.github.com/repos/github-api-test-org/github-api/commits/3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", + "html_url": "https://github.com/github-api-test-org/github-api/commit/3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353" }, { "sha": "b036909fcf45565c82c888ee326ebd0e382f6173", @@ -94,9 +94,9 @@ "additions": 4, "deletions": 0, "changes": 4, - "blob_url": "https://github.com/github-api-test-org/github-api/blob/a6d4683ed59c03bda91ef94ec463ae95ac0d31da/README.md", - "raw_url": "https://github.com/github-api-test-org/github-api/raw/a6d4683ed59c03bda91ef94ec463ae95ac0d31da/README.md", - "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/README.md?ref=a6d4683ed59c03bda91ef94ec463ae95ac0d31da", + "blob_url": "https://github.com/github-api-test-org/github-api/blob/48eb1a9b8cd56782d11ea45adcf062eade17528e/README.md", + "raw_url": "https://github.com/github-api-test-org/github-api/raw/48eb1a9b8cd56782d11ea45adcf062eade17528e/README.md", + "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/README.md?ref=48eb1a9b8cd56782d11ea45adcf062eade17528e", "patch": "@@ -1,3 +1,7 @@\n Java API for GitHub\n \n See https://github-api.kohsuke.org/ for more details\n+\n+# No conflict\n+\n+Mergeable_branch\n\\ No newline at end of file" } ] diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-8f286e1a-bf89-4038-9df2-226e0026e09a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json similarity index 95% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-8f286e1a-bf89-4038-9df2-226e0026e09a.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json index e9d96695b..9f08c34c0 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-8f286e1a-bf89-4038-9df2-226e0026e09a.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json @@ -1,12 +1,12 @@ { - "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265", - "id": 315252334, - "node_id": "MDExOlB1bGxSZXF1ZXN0MzE1MjUyMzM0", - "html_url": "https://github.com/github-api-test-org/github-api/pull/265", - "diff_url": "https://github.com/github-api-test-org/github-api/pull/265.diff", - "patch_url": "https://github.com/github-api-test-org/github-api/pull/265.patch", - "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265", - "number": 265, + "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309", + "id": 324976764, + "node_id": "MDExOlB1bGxSZXF1ZXN0MzI0OTc2NzY0", + "html_url": "https://github.com/github-api-test-org/github-api/pull/309", + "diff_url": "https://github.com/github-api-test-org/github-api/pull/309.diff", + "patch_url": "https://github.com/github-api-test-org/github-api/pull/309.patch", + "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309", + "number": 309, "state": "open", "locked": false, "title": "mergeCommitSHA", @@ -31,8 +31,8 @@ "site_admin": false }, "body": "## test", - "created_at": "2019-09-08T07:24:38Z", - "updated_at": "2019-09-08T07:24:38Z", + "created_at": "2019-10-05T21:11:40Z", + "updated_at": "2019-10-05T21:11:40Z", "closed_at": null, "merged_at": null, "merge_commit_sha": null, @@ -42,10 +42,10 @@ "requested_teams": [], "labels": [], "milestone": null, - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits", - "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments", + "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits", + "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments", "review_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments", "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173", "head": { "label": "github-api-test-org:test/mergeable_branch", @@ -98,7 +98,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -138,18 +138,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:35Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:06:15Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -175,7 +175,7 @@ "base": { "label": "github-api-test-org:master", "ref": "master", - "sha": "912e2176a00e60e02196737e0ae4c218a14b5dcb", + "sha": "3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", "user": { "login": "github-api-test-org", "id": 7544739, @@ -223,7 +223,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -263,18 +263,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:35Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:06:15Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -299,25 +299,25 @@ }, "_links": { "self": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309" }, "html": { - "href": "https://github.com/github-api-test-org/github-api/pull/265" + "href": "https://github.com/github-api-test-org/github-api/pull/309" }, "issue": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265" + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309" }, "comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments" + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments" }, "review_comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments" }, "review_comment": { "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}" }, "commits": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits" }, "statuses": { "href": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173" diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-b79392e0-49d2-49e2-84b2-af914db01158.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-b79392e0-49d2-49e2-84b2-af914db01158.json deleted file mode 100644 index c391ec54c..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-b79392e0-49d2-49e2-84b2-af914db01158.json +++ /dev/null @@ -1,329 +0,0 @@ -[ - { - "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265", - "id": 315252334, - "node_id": "MDExOlB1bGxSZXF1ZXN0MzE1MjUyMzM0", - "html_url": "https://github.com/github-api-test-org/github-api/pull/265", - "diff_url": "https://github.com/github-api-test-org/github-api/pull/265.diff", - "patch_url": "https://github.com/github-api-test-org/github-api/pull/265.patch", - "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265", - "number": 265, - "state": "open", - "locked": false, - "title": "mergeCommitSHA", - "user": { - "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 - }, - "body": "## test", - "created_at": "2019-09-08T07:24:38Z", - "updated_at": "2019-09-08T07:24:38Z", - "closed_at": null, - "merged_at": null, - "merge_commit_sha": "a6d4683ed59c03bda91ef94ec463ae95ac0d31da", - "assignee": null, - "assignees": [], - "requested_reviewers": [], - "requested_teams": [], - "labels": [], - "milestone": null, - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits", - "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments", - "review_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments", - "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173", - "head": { - "label": "github-api-test-org:test/mergeable_branch", - "ref": "test/mergeable_branch", - "sha": "b036909fcf45565c82c888ee326ebd0e382f6173", - "user": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "repo": { - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "github-api-test-org/github-api", - "private": false, - "owner": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/github-api", - "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", - "git_url": "git://github.com/github-api-test-org/github-api.git", - "ssh_url": "git@github.com:github-api-test-org/github-api.git", - "clone_url": "https://github.com/github-api-test-org/github-api.git", - "svn_url": "https://github.com/github-api-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "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": 1, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 1, - "watchers": 0, - "default_branch": "master" - } - }, - "base": { - "label": "github-api-test-org:master", - "ref": "master", - "sha": "912e2176a00e60e02196737e0ae4c218a14b5dcb", - "user": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "repo": { - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "github-api-test-org/github-api", - "private": false, - "owner": { - "login": "github-api-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/github-api-test-org", - "html_url": "https://github.com/github-api-test-org", - "followers_url": "https://api.github.com/users/github-api-test-org/followers", - "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", - "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", - "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", - "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", - "repos_url": "https://api.github.com/users/github-api-test-org/repos", - "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", - "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/github-api", - "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", - "git_url": "git://github.com/github-api-test-org/github-api.git", - "ssh_url": "git@github.com:github-api-test-org/github-api.git", - "clone_url": "https://github.com/github-api-test-org/github-api.git", - "svn_url": "https://github.com/github-api-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 11386, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "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": 1, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 1, - "watchers": 0, - "default_branch": "master" - } - }, - "_links": { - "self": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265" - }, - "html": { - "href": "https://github.com/github-api-test-org/github-api/pull/265" - }, - "issue": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265" - }, - "comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments" - }, - "review_comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments" - }, - "review_comment": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}" - }, - "commits": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits" - }, - "statuses": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173" - } - }, - "author_association": "MEMBER" - } -] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_265-d6d01d9b-8021-466e-96c2-7abf0da928be.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json similarity index 93% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_265-d6d01d9b-8021-466e-96c2-7abf0da928be.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json index c0ffe046e..9f08c34c0 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_265-d6d01d9b-8021-466e-96c2-7abf0da928be.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json @@ -1,13 +1,13 @@ { - "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265", - "id": 315252334, - "node_id": "MDExOlB1bGxSZXF1ZXN0MzE1MjUyMzM0", - "html_url": "https://github.com/github-api-test-org/github-api/pull/265", - "diff_url": "https://github.com/github-api-test-org/github-api/pull/265.diff", - "patch_url": "https://github.com/github-api-test-org/github-api/pull/265.patch", - "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265", - "number": 265, - "state": "closed", + "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309", + "id": 324976764, + "node_id": "MDExOlB1bGxSZXF1ZXN0MzI0OTc2NzY0", + "html_url": "https://github.com/github-api-test-org/github-api/pull/309", + "diff_url": "https://github.com/github-api-test-org/github-api/pull/309.diff", + "patch_url": "https://github.com/github-api-test-org/github-api/pull/309.patch", + "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309", + "number": 309, + "state": "open", "locked": false, "title": "mergeCommitSHA", "user": { @@ -31,21 +31,21 @@ "site_admin": false }, "body": "## test", - "created_at": "2019-09-08T07:24:38Z", - "updated_at": "2019-09-08T07:24:42Z", - "closed_at": "2019-09-08T07:24:42Z", + "created_at": "2019-10-05T21:11:40Z", + "updated_at": "2019-10-05T21:11:40Z", + "closed_at": null, "merged_at": null, - "merge_commit_sha": "a6d4683ed59c03bda91ef94ec463ae95ac0d31da", + "merge_commit_sha": null, "assignee": null, "assignees": [], "requested_reviewers": [], "requested_teams": [], "labels": [], "milestone": null, - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits", - "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments", + "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits", + "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments", "review_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments", "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173", "head": { "label": "github-api-test-org:test/mergeable_branch", @@ -98,7 +98,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -138,18 +138,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:06:15Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -158,7 +158,7 @@ "mirror_url": null, "archived": false, "disabled": false, - "open_issues_count": 0, + "open_issues_count": 1, "license": { "key": "mit", "name": "MIT License", @@ -167,7 +167,7 @@ "node_id": "MDc6TGljZW5zZTEz" }, "forks": 0, - "open_issues": 0, + "open_issues": 1, "watchers": 0, "default_branch": "master" } @@ -175,7 +175,7 @@ "base": { "label": "github-api-test-org:master", "ref": "master", - "sha": "912e2176a00e60e02196737e0ae4c218a14b5dcb", + "sha": "3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", "user": { "login": "github-api-test-org", "id": 7544739, @@ -223,7 +223,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -263,18 +263,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:06:15Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -283,7 +283,7 @@ "mirror_url": null, "archived": false, "disabled": false, - "open_issues_count": 0, + "open_issues_count": 1, "license": { "key": "mit", "name": "MIT License", @@ -292,32 +292,32 @@ "node_id": "MDc6TGljZW5zZTEz" }, "forks": 0, - "open_issues": 0, + "open_issues": 1, "watchers": 0, "default_branch": "master" } }, "_links": { "self": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309" }, "html": { - "href": "https://github.com/github-api-test-org/github-api/pull/265" + "href": "https://github.com/github-api-test-org/github-api/pull/309" }, "issue": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265" + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309" }, "comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments" + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments" }, "review_comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments" }, "review_comment": { "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}" }, "commits": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits" }, "statuses": { "href": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173" @@ -325,9 +325,9 @@ }, "author_association": "MEMBER", "merged": false, - "mergeable": true, - "rebaseable": true, - "mergeable_state": "clean", + "mergeable": null, + "rebaseable": null, + "mergeable_state": "unknown", "merged_by": null, "comments": 0, "review_comments": 0, diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_265-782b855f-1bd3-4b7e-bc5a-0e48e4db1c2d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json similarity index 94% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_265-782b855f-1bd3-4b7e-bc5a-0e48e4db1c2d.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json index 147b6cd30..fa091346e 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_265-782b855f-1bd3-4b7e-bc5a-0e48e4db1c2d.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json @@ -1,12 +1,12 @@ { - "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265", - "id": 315252334, - "node_id": "MDExOlB1bGxSZXF1ZXN0MzE1MjUyMzM0", - "html_url": "https://github.com/github-api-test-org/github-api/pull/265", - "diff_url": "https://github.com/github-api-test-org/github-api/pull/265.diff", - "patch_url": "https://github.com/github-api-test-org/github-api/pull/265.patch", - "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265", - "number": 265, + "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309", + "id": 324976764, + "node_id": "MDExOlB1bGxSZXF1ZXN0MzI0OTc2NzY0", + "html_url": "https://github.com/github-api-test-org/github-api/pull/309", + "diff_url": "https://github.com/github-api-test-org/github-api/pull/309.diff", + "patch_url": "https://github.com/github-api-test-org/github-api/pull/309.patch", + "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309", + "number": 309, "state": "open", "locked": false, "title": "mergeCommitSHA", @@ -31,21 +31,21 @@ "site_admin": false }, "body": "## test", - "created_at": "2019-09-08T07:24:38Z", - "updated_at": "2019-09-08T07:24:38Z", + "created_at": "2019-10-05T21:11:40Z", + "updated_at": "2019-10-05T21:11:40Z", "closed_at": null, "merged_at": null, - "merge_commit_sha": "a6d4683ed59c03bda91ef94ec463ae95ac0d31da", + "merge_commit_sha": "48eb1a9b8cd56782d11ea45adcf062eade17528e", "assignee": null, "assignees": [], "requested_reviewers": [], "requested_teams": [], "labels": [], "milestone": null, - "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits", - "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments", + "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits", + "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments", "review_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}", - "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments", "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173", "head": { "label": "github-api-test-org:test/mergeable_branch", @@ -98,7 +98,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -138,18 +138,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:11:41Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -175,7 +175,7 @@ "base": { "label": "github-api-test-org:master", "ref": "master", - "sha": "912e2176a00e60e02196737e0ae4c218a14b5dcb", + "sha": "3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", "user": { "login": "github-api-test-org", "id": 7544739, @@ -223,7 +223,7 @@ "site_admin": false }, "html_url": "https://github.com/github-api-test-org/github-api", - "description": "Java API for GitHub", + "description": "Tricky", "fork": true, "url": "https://api.github.com/repos/github-api-test-org/github-api", "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", @@ -263,18 +263,18 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2019-09-08T07:24:28Z", - "pushed_at": "2019-09-08T07:24:38Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:11:41Z", "git_url": "git://github.com/github-api-test-org/github-api.git", "ssh_url": "git@github.com:github-api-test-org/github-api.git", "clone_url": "https://github.com/github-api-test-org/github-api.git", "svn_url": "https://github.com/github-api-test-org/github-api", "homepage": "http://github-api.kohsuke.org/", - "size": 11386, + "size": 11391, "stargazers_count": 0, "watchers_count": 0, "language": "Java", - "has_issues": false, + "has_issues": true, "has_projects": true, "has_downloads": true, "has_wiki": true, @@ -299,25 +299,25 @@ }, "_links": { "self": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309" }, "html": { - "href": "https://github.com/github-api-test-org/github-api/pull/265" + "href": "https://github.com/github-api-test-org/github-api/pull/309" }, "issue": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265" + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309" }, "comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/265/comments" + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments" }, "review_comments": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/comments" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments" }, "review_comment": { "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}" }, "commits": { - "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/265/commits" + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits" }, "statuses": { "href": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173" diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json new file mode 100644 index 000000000..6c57e102c --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json @@ -0,0 +1,339 @@ +{ + "url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309", + "id": 324976764, + "node_id": "MDExOlB1bGxSZXF1ZXN0MzI0OTc2NzY0", + "html_url": "https://github.com/github-api-test-org/github-api/pull/309", + "diff_url": "https://github.com/github-api-test-org/github-api/pull/309.diff", + "patch_url": "https://github.com/github-api-test-org/github-api/pull/309.patch", + "issue_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309", + "number": 309, + "state": "open", + "locked": false, + "title": "mergeCommitSHA", + "user": { + "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 + }, + "body": "## test", + "created_at": "2019-10-05T21:11:40Z", + "updated_at": "2019-10-05T21:11:40Z", + "closed_at": null, + "merged_at": null, + "merge_commit_sha": null, + "assignee": null, + "assignees": [], + "requested_reviewers": [], + "requested_teams": [], + "labels": [], + "milestone": null, + "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits", + "review_comments_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments", + "review_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments", + "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173", + "head": { + "label": "github-api-test-org:test/mergeable_branch", + "ref": "test/mergeable_branch", + "sha": "b036909fcf45565c82c888ee326ebd0e382f6173", + "user": { + "login": "github-api-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/github-api-test-org", + "html_url": "https://github.com/github-api-test-org", + "followers_url": "https://api.github.com/users/github-api-test-org/followers", + "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", + "repos_url": "https://api.github.com/users/github-api-test-org/repos", + "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "github-api-test-org/github-api", + "private": false, + "owner": { + "login": "github-api-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/github-api-test-org", + "html_url": "https://github.com/github-api-test-org", + "followers_url": "https://api.github.com/users/github-api-test-org/followers", + "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", + "repos_url": "https://api.github.com/users/github-api-test-org/repos", + "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/github-api-test-org/github-api", + "description": "Tricky", + "fork": true, + "url": "https://api.github.com/repos/github-api-test-org/github-api", + "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:11:41Z", + "git_url": "git://github.com/github-api-test-org/github-api.git", + "ssh_url": "git@github.com:github-api-test-org/github-api.git", + "clone_url": "https://github.com/github-api-test-org/github-api.git", + "svn_url": "https://github.com/github-api-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 11391, + "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": 1, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 1, + "watchers": 0, + "default_branch": "master" + } + }, + "base": { + "label": "github-api-test-org:master", + "ref": "master", + "sha": "3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353", + "user": { + "login": "github-api-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/github-api-test-org", + "html_url": "https://github.com/github-api-test-org", + "followers_url": "https://api.github.com/users/github-api-test-org/followers", + "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", + "repos_url": "https://api.github.com/users/github-api-test-org/repos", + "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "repo": { + "id": 206888201, + "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", + "name": "github-api", + "full_name": "github-api-test-org/github-api", + "private": false, + "owner": { + "login": "github-api-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/github-api-test-org", + "html_url": "https://github.com/github-api-test-org", + "followers_url": "https://api.github.com/users/github-api-test-org/followers", + "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}", + "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}", + "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions", + "organizations_url": "https://api.github.com/users/github-api-test-org/orgs", + "repos_url": "https://api.github.com/users/github-api-test-org/repos", + "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}", + "received_events_url": "https://api.github.com/users/github-api-test-org/received_events", + "type": "Organization", + "site_admin": false + }, + "html_url": "https://github.com/github-api-test-org/github-api", + "description": "Tricky", + "fork": true, + "url": "https://api.github.com/repos/github-api-test-org/github-api", + "forks_url": "https://api.github.com/repos/github-api-test-org/github-api/forks", + "keys_url": "https://api.github.com/repos/github-api-test-org/github-api/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/github-api-test-org/github-api/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/github-api-test-org/github-api/teams", + "hooks_url": "https://api.github.com/repos/github-api-test-org/github-api/hooks", + "issue_events_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/events{/number}", + "events_url": "https://api.github.com/repos/github-api-test-org/github-api/events", + "assignees_url": "https://api.github.com/repos/github-api-test-org/github-api/assignees{/user}", + "branches_url": "https://api.github.com/repos/github-api-test-org/github-api/branches{/branch}", + "tags_url": "https://api.github.com/repos/github-api-test-org/github-api/tags", + "blobs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/github-api-test-org/github-api/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/github-api-test-org/github-api/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/github-api-test-org/github-api/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/github-api-test-org/github-api/statuses/{sha}", + "languages_url": "https://api.github.com/repos/github-api-test-org/github-api/languages", + "stargazers_url": "https://api.github.com/repos/github-api-test-org/github-api/stargazers", + "contributors_url": "https://api.github.com/repos/github-api-test-org/github-api/contributors", + "subscribers_url": "https://api.github.com/repos/github-api-test-org/github-api/subscribers", + "subscription_url": "https://api.github.com/repos/github-api-test-org/github-api/subscription", + "commits_url": "https://api.github.com/repos/github-api-test-org/github-api/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/github-api-test-org/github-api/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/github-api-test-org/github-api/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/github-api-test-org/github-api/contents/{+path}", + "compare_url": "https://api.github.com/repos/github-api-test-org/github-api/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/github-api-test-org/github-api/merges", + "archive_url": "https://api.github.com/repos/github-api-test-org/github-api/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/github-api-test-org/github-api/downloads", + "issues_url": "https://api.github.com/repos/github-api-test-org/github-api/issues{/number}", + "pulls_url": "https://api.github.com/repos/github-api-test-org/github-api/pulls{/number}", + "milestones_url": "https://api.github.com/repos/github-api-test-org/github-api/milestones{/number}", + "notifications_url": "https://api.github.com/repos/github-api-test-org/github-api/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/github-api-test-org/github-api/labels{/name}", + "releases_url": "https://api.github.com/repos/github-api-test-org/github-api/releases{/id}", + "deployments_url": "https://api.github.com/repos/github-api-test-org/github-api/deployments", + "created_at": "2019-09-06T23:26:04Z", + "updated_at": "2019-09-30T22:36:47Z", + "pushed_at": "2019-10-05T21:11:41Z", + "git_url": "git://github.com/github-api-test-org/github-api.git", + "ssh_url": "git@github.com:github-api-test-org/github-api.git", + "clone_url": "https://github.com/github-api-test-org/github-api.git", + "svn_url": "https://github.com/github-api-test-org/github-api", + "homepage": "http://github-api.kohsuke.org/", + "size": 11391, + "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": 1, + "license": { + "key": "mit", + "name": "MIT License", + "spdx_id": "MIT", + "url": "https://api.github.com/licenses/mit", + "node_id": "MDc6TGljZW5zZTEz" + }, + "forks": 0, + "open_issues": 1, + "watchers": 0, + "default_branch": "master" + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309" + }, + "html": { + "href": "https://github.com/github-api-test-org/github-api/pull/309" + }, + "issue": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309" + }, + "comments": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/issues/309/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/github-api-test-org/github-api/statuses/b036909fcf45565c82c888ee326ebd0e382f6173" + } + }, + "author_association": "MEMBER", + "merged": false, + "mergeable": null, + "rebaseable": null, + "mergeable_state": "unknown", + "merged_by": null, + "comments": 0, + "review_comments": 0, + "maintainer_can_modify": false, + "commits": 1, + "additions": 4, + "deletions": 0, + "changed_files": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-96a90d94-5e9a-4d05-9f3a-d4ae250f59e9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json similarity index 78% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-96a90d94-5e9a-4d05-9f3a-d4ae250f59e9.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json index b9ce24cb0..41fc9e3d0 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-96a90d94-5e9a-4d05-9f3a-d4ae250f59e9.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json @@ -24,10 +24,22 @@ "email": "bitwiseman@gmail.com", "hireable": null, "bio": "https://twitter.com/bitwiseman", - "public_repos": 166, + "public_repos": 168, "public_gists": 4, - "followers": 133, + "followers": 136, "following": 9, "created_at": "2012-07-11T20:38:33Z", - "updated_at": "2019-06-03T17:47:20Z" + "updated_at": "2019-09-24T19:32:29Z", + "private_gists": 7, + "total_private_repos": 9, + "owned_private_repos": 0, + "disk_usage": 33697, + "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/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-9a6723.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json similarity index 69% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-9a6723.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json index 4aada9007..3524f2788 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-9a6723.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json @@ -1,5 +1,5 @@ { - "id": "9a6723ee-af32-469d-a26a-5f8eca5da1fb", + "id": "e3ff360d-d2e8-48a3-aaa4-38a5acd11580", "name": "orgs_github-api-test-org", "request": { "url": "/orgs/github-api-test-org", @@ -7,23 +7,23 @@ }, "response": { "status": 200, - "bodyFileName": "orgs_github-api-test-org-9a6723ee-af32-469d-a26a-5f8eca5da1fb.json", + "bodyFileName": "orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:37 GMT", + "Date": "Sat, 05 Oct 2019 21:11:38 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4897", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Remaining": "4894", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"", + "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"", "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", + "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": "admin:org, read:org, repo, user, write:org", "X-GitHub-Media-Type": "unknown, github.v3", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", @@ -34,10 +34,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": "FF8D:9A32:9E9FBC:BB5C36:5D74ACB5" + "X-GitHub-Request-Id": "E2BB:2CE6:D397A1:FC6B78:5D990709" } }, - "uuid": "9a6723ee-af32-469d-a26a-5f8eca5da1fb", + "uuid": "e3ff360d-d2e8-48a3-aaa4-38a5acd11580", "persistent": true, "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-a531ca.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json similarity index 63% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-a531ca.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json index 0b669478f..b1dbdcd10 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-a531ca.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json @@ -1,5 +1,5 @@ { - "id": "a531caa8-31f1-4277-9cd4-698d0e32f079", + "id": "7a223c60-fbe1-4ed6-b30d-617b9ca84e8e", "name": "repos_github-api-test-org_github-api", "request": { "url": "/repos/github-api-test-org/github-api", @@ -7,23 +7,23 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api-a531caa8-31f1-4277-9cd4-698d0e32f079.json", + "bodyFileName": "repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:37 GMT", + "Date": "Sat, 05 Oct 2019 21:11:39 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4896", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Remaining": "4893", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"3c30bde80ee040608ed7f15ed1d1e11b\"", - "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", + "ETag": "W/\"be90246cc993b01cbcfdf5cf4455dd5e\"", + "Last-Modified": "Mon, 30 Sep 2019 22:36:47 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", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", @@ -34,13 +34,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": "FF8D:9A32:9E9FE1:BB5C58:5D74ACB5" + "X-GitHub-Request-Id": "E2BB:2CE6:D397A5:FC6BA6:5D99070A" } }, - "uuid": "a531caa8-31f1-4277-9cd4-698d0e32f079", + "uuid": "7a223c60-fbe1-4ed6-b30d-617b9ca84e8e", "persistent": true, - "scenarioName": "scenario-1-repos-github-api-test-org-github-api", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2", "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-8-d61ffe.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json similarity index 59% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-8-d61ffe.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json index 3eac132bc..0b4ca6e03 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-8-d61ffe.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json @@ -1,29 +1,29 @@ { - "id": "d61ffef0-862d-4b9b-9817-ff777efb8c5e", - "name": "repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da", + "id": "59cc8825-ac31-418a-b4ae-47fd733fd3e1", + "name": "repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e", "request": { - "url": "/repos/github-api-test-org/github-api/commits/a6d4683ed59c03bda91ef94ec463ae95ac0d31da", + "url": "/repos/github-api-test-org/github-api/commits/48eb1a9b8cd56782d11ea45adcf062eade17528e", "method": "GET" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_commits_a6d4683ed59c03bda91ef94ec463ae95ac0d31da-d61ffef0-862d-4b9b-9817-ff777efb8c5e.json", + "bodyFileName": "repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:41 GMT", + "Date": "Sat, 05 Oct 2019 21:11:43 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4890", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Remaining": "4888", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"d460abb29684444082281fca1f27296a\"", - "Last-Modified": "Sun, 08 Sep 2019 07:24:38 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", + "ETag": "W/\"857c6e4332bf6ace84e0f8c8eca1f234\"", + "Last-Modified": "Sat, 05 Oct 2019 21:11:41 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", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", @@ -34,10 +34,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": "FF8D:9A32:9EA0B5:BB5D58:5D74ACB9" + "X-GitHub-Request-Id": "E2BB:2CE6:D3984D:FC6C67:5D99070F" } }, - "uuid": "d61ffef0-862d-4b9b-9817-ff777efb8c5e", + "uuid": "59cc8825-ac31-418a-b4ae-47fd733fd3e1", "persistent": true, "insertionIndex": 8 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-10-b79392.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-10-b79392.json deleted file mode 100644 index d231646cd..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-10-b79392.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "id": "b79392e0-49d2-49e2-84b2-af914db01158", - "name": "repos_github-api-test-org_github-api_pulls", - "request": { - "url": "/repos/github-api-test-org/github-api/pulls?state=open", - "method": "GET" - }, - "response": { - "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_pulls-b79392e0-49d2-49e2-84b2-af914db01158.json", - "headers": { - "Date": "Sun, 08 Sep 2019 07:24:42 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4888", - "X-RateLimit-Reset": "1567929276", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding" - ], - "ETag": "W/\"4053b88e6f934767af8000ddf035fced\"", - "X-OAuth-Scopes": "gist, notifications, repo", - "X-Accepted-OAuth-Scopes": "", - "X-GitHub-Media-Type": "unknown, github.v3", - "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", - "Access-Control-Allow-Origin": "*", - "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": "FF8D:9A32:9EA0EF:BB5D91:5D74ACB9" - } - }, - "uuid": "b79392e0-49d2-49e2-84b2-af914db01158", - "persistent": true, - "insertionIndex": 10 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-8f286e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-8f286e.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json index 285694cf9..b20226758 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-8f286e.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json @@ -1,5 +1,5 @@ { - "id": "8f286e1a-bf89-4038-9df2-226e0026e09a", + "id": "361c15b4-b52d-4da7-a810-bfabf94e819a", "name": "repos_github-api-test-org_github-api_pulls", "request": { "url": "/repos/github-api-test-org/github-api/pulls", @@ -14,24 +14,24 @@ }, "response": { "status": 201, - "bodyFileName": "repos_github-api-test-org_github-api_pulls-8f286e1a-bf89-4038-9df2-226e0026e09a.json", + "bodyFileName": "repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:38 GMT", + "Date": "Sat, 05 Oct 2019 21:11:41 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4895", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Remaining": "4892", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "\"0a534bae39e513a8b52d701350dadc96\"", - "X-OAuth-Scopes": "gist, notifications, repo", + "ETag": "\"9960683cf7257316abbf7d1515d2c274\"", + "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/github-api-test-org/github-api/pulls/265", + "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309", "X-GitHub-Media-Type": "unknown, github.v3", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", "Access-Control-Allow-Origin": "*", @@ -41,10 +41,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": "FF8D:9A32:9E9FEB:BB5C69:5D74ACB5" + "X-GitHub-Request-Id": "E2BB:2CE6:D397AD:FC6BB1:5D99070B" } }, - "uuid": "8f286e1a-bf89-4038-9df2-226e0026e09a", + "uuid": "361c15b4-b52d-4da7-a810-bfabf94e819a", "persistent": true, "insertionIndex": 4 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_265-11-d6d01d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_265-11-d6d01d.json deleted file mode 100644 index 0093ae203..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_265-11-d6d01d.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "id": "d6d01d9b-8021-466e-96c2-7abf0da928be", - "name": "repos_github-api-test-org_github-api_pulls_265", - "request": { - "url": "/repos/github-api-test-org/github-api/pulls/265", - "method": "PATCH", - "bodyPatterns": [ - { - "equalToJson": "{\"state\":\"closed\"}", - "ignoreArrayOrder": true, - "ignoreExtraElements": true - } - ] - }, - "response": { - "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_pulls_265-d6d01d9b-8021-466e-96c2-7abf0da928be.json", - "headers": { - "Date": "Sun, 08 Sep 2019 07:24:42 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4887", - "X-RateLimit-Reset": "1567929276", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding" - ], - "ETag": "W/\"c6ea7b32074f78e3113a7191a0614427\"", - "X-OAuth-Scopes": "gist, notifications, repo", - "X-Accepted-OAuth-Scopes": "", - "X-GitHub-Media-Type": "unknown, github.v3", - "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", - "Access-Control-Allow-Origin": "*", - "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": "FF8D:9A32:9EA0FC:BB5DA8:5D74ACBA" - } - }, - "uuid": "d6d01d9b-8021-466e-96c2-7abf0da928be", - "persistent": true, - "insertionIndex": 11 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_265-6-782b85.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_265-6-782b85.json deleted file mode 100644 index 90064404b..000000000 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_265-6-782b85.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "id": "782b855f-1bd3-4b7e-bc5a-0e48e4db1c2d", - "name": "repos_github-api-test-org_github-api_pulls_265", - "request": { - "url": "/repos/github-api-test-org/github-api/pulls/265", - "method": "GET" - }, - "response": { - "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_pulls_265-782b855f-1bd3-4b7e-bc5a-0e48e4db1c2d.json", - "headers": { - "Date": "Sun, 08 Sep 2019 07:24:40 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4892", - "X-RateLimit-Reset": "1567929276", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding" - ], - "ETag": "W/\"afab047337d28f469e2fb3e3163a9a4d\"", - "Last-Modified": "Sun, 08 Sep 2019 07:24:38 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", - "X-Accepted-OAuth-Scopes": "", - "X-GitHub-Media-Type": "unknown, github.v3", - "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", - "Access-Control-Allow-Origin": "*", - "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": "FF8D:9A32:9EA094:BB5D30:5D74ACB8" - } - }, - "uuid": "782b855f-1bd3-4b7e-bc5a-0e48e4db1c2d", - "persistent": true, - "insertionIndex": 6 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-7-0605c9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json similarity index 59% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-7-0605c9.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json index 0acbabfb6..652e45864 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-7-0605c9.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json @@ -1,30 +1,30 @@ { - "id": "0605c9f6-9c49-40ed-864f-ad6bc27e8b71", - "name": "repos_github-api-test-org_github-api", + "id": "1566b3f6-560a-4c1c-a6cd-bdaa25774c7a", + "name": "repos_github-api-test-org_github-api_pulls_309", "request": { - "url": "/repos/github-api-test-org/github-api", + "url": "/repos/github-api-test-org/github-api/pulls/309", "method": "GET" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api-0605c9f6-9c49-40ed-864f-ad6bc27e8b71.json", + "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:41 GMT", + "Date": "Sat, 05 Oct 2019 21:11:41 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4891", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"e4f58a65857ec638bfd00d967b5983b9\"", - "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", - "X-Accepted-OAuth-Scopes": "repo", + "ETag": "W/\"9960683cf7257316abbf7d1515d2c274\"", + "Last-Modified": "Sat, 05 Oct 2019 21:11:40 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", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", "Access-Control-Allow-Origin": "*", @@ -34,13 +34,13 @@ "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": "FF8D:9A32:9EA0A9:BB5D45:5D74ACB8" + "X-GitHub-Request-Id": "E2BB:2CE6:D3980B:FC6C1B:5D99070D" } }, - "uuid": "0605c9f6-9c49-40ed-864f-ad6bc27e8b71", + "uuid": "1566b3f6-560a-4c1c-a6cd-bdaa25774c7a", "persistent": true, - "scenarioName": "scenario-1-repos-github-api-test-org-github-api", - "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3", - "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4", - "insertionIndex": 7 + "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-2", + "insertionIndex": 5 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-5-304b18.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json similarity index 58% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-5-304b18.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json index d232d711a..2a9262589 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-5-304b18.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json @@ -1,30 +1,30 @@ { - "id": "304b1818-f809-4768-940e-50792fb3f7fc", - "name": "repos_github-api-test-org_github-api", + "id": "c8fd7b5e-b5f3-4179-bb56-1f2b150f248d", + "name": "repos_github-api-test-org_github-api_pulls_309", "request": { - "url": "/repos/github-api-test-org/github-api", + "url": "/repos/github-api-test-org/github-api/pulls/309", "method": "GET" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api-304b1818-f809-4768-940e-50792fb3f7fc.json", + "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:40 GMT", + "Date": "Sat, 05 Oct 2019 21:11:41 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4893", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Remaining": "4890", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"e4f58a65857ec638bfd00d967b5983b9\"", - "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", - "X-Accepted-OAuth-Scopes": "repo", + "ETag": "W/\"e69c3fd661d08c3ffd1d054d9efc7f5c\"", + "Last-Modified": "Sat, 05 Oct 2019 21:11:40 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", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", "Access-Control-Allow-Origin": "*", @@ -34,13 +34,13 @@ "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": "FF8D:9A32:9EA087:BB5CA4:5D74ACB6" + "X-GitHub-Request-Id": "E2BB:2CE6:D39817:FC6C31:5D99070D" } }, - "uuid": "304b1818-f809-4768-940e-50792fb3f7fc", + "uuid": "c8fd7b5e-b5f3-4179-bb56-1f2b150f248d", "persistent": true, - "scenarioName": "scenario-1-repos-github-api-test-org-github-api", - "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2", - "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3", - "insertionIndex": 5 + "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309", + "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-2", + "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-3", + "insertionIndex": 6 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-9-28e3a7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json similarity index 60% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-9-28e3a7.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json index be60556b2..e16397ef3 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-9-28e3a7.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json @@ -1,30 +1,30 @@ { - "id": "28e3a735-30c7-4678-a90e-8b4d6bdeff31", - "name": "repos_github-api-test-org_github-api", + "id": "97966102-337f-4c57-8b20-ba00a3769317", + "name": "repos_github-api-test-org_github-api_pulls_309", "request": { - "url": "/repos/github-api-test-org/github-api", + "url": "/repos/github-api-test-org/github-api/pulls/309", "method": "GET" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api-28e3a735-30c7-4678-a90e-8b4d6bdeff31.json", + "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:41 GMT", + "Date": "Sat, 05 Oct 2019 21:11:43 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4889", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"e4f58a65857ec638bfd00d967b5983b9\"", - "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", - "X-Accepted-OAuth-Scopes": "repo", + "ETag": "W/\"7e7fd7b9217593932b122cb8a1f3675b\"", + "Last-Modified": "Sat, 05 Oct 2019 21:11:40 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", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", "Access-Control-Allow-Origin": "*", @@ -34,12 +34,12 @@ "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": "FF8D:9A32:9EA0CF:BB5D69:5D74ACB9" + "X-GitHub-Request-Id": "E2BB:2CE6:D39841:FC6C3B:5D99070D" } }, - "uuid": "28e3a735-30c7-4678-a90e-8b4d6bdeff31", + "uuid": "97966102-337f-4c57-8b20-ba00a3769317", "persistent": true, - "scenarioName": "scenario-1-repos-github-api-test-org-github-api", - "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4", - "insertionIndex": 9 + "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309", + "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-3", + "insertionIndex": 7 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-96a90d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json similarity index 66% rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-96a90d.json rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json index e53a33f55..b9e2478ac 100644 --- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-96a90d.json +++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json @@ -1,5 +1,5 @@ { - "id": "96a90d94-5e9a-4d05-9f3a-d4ae250f59e9", + "id": "c2903fd5-9175-47e3-b48e-c86bcc461b58", "name": "user", "request": { "url": "/user", @@ -7,23 +7,23 @@ }, "response": { "status": 200, - "bodyFileName": "user-96a90d94-5e9a-4d05-9f3a-d4ae250f59e9.json", + "bodyFileName": "user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json", "headers": { - "Date": "Sun, 08 Sep 2019 07:24:37 GMT", + "Date": "Sat, 05 Oct 2019 21:11:37 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4898", - "X-RateLimit-Reset": "1567929276", + "X-RateLimit-Remaining": "4899", + "X-RateLimit-Reset": "1570311642", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], - "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"", - "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT", - "X-OAuth-Scopes": "gist, notifications, repo", + "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"", + "Last-Modified": "Tue, 24 Sep 2019 19:32:29 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", "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", @@ -34,10 +34,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": "FF8D:9A32:9E9FB1:BB5C26:5D74ACB5" + "X-GitHub-Request-Id": "E2BB:2CE6:D39774:FC6B6F:5D990709" } }, - "uuid": "96a90d94-5e9a-4d05-9f3a-d4ae250f59e9", + "uuid": "c2903fd5-9175-47e3-b48e-c86bcc461b58", "persistent": true, "insertionIndex": 1 } \ No newline at end of file