From 05cbf36a01935bbdc180b5dc289dcd13d3d06d4f Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Mon, 25 Nov 2019 14:34:39 -0800 Subject: [PATCH] Fixed GHContent to allow spaces in path URI path encoding whack-a-mole. This fix should cover a significant number of cases. Also, fixed to NOT do URLEncode for URI path. The encoding is different between path and query. Fixes #624 --- .../java/org/kohsuke/github/GHContent.java | 8 +- .../org/kohsuke/github/GHContentBuilder.java | 3 +- .../java/org/kohsuke/github/GHRelease.java | 2 +- .../java/org/kohsuke/github/GHRepository.java | 36 +- .../java/org/kohsuke/github/Requester.java | 17 + .../github/GHContentIntegrationTest.java | 30 +- .../org/kohsuke/github/GHRepositoryTest.java | 2 +- ...e5080341-7377-4f3f-9427-388a105a91a7.json} | 16 +- ...-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json | 18 + ...04f85e50-583c-48ad-8d45-55368c542148.json} | 36 +- ...1d4297f8-515f-48b0-8f13-99894911d416.json} | 14 +- ...4be43bcb-37e3-4c54-8b0a-c190690dc820.json} | 14 +- ...-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json | 18 + ...-64a83a7d-a195-4f3b-989e-293e3f23611a.json | 18 + ...a5a649cc-8b2b-4c58-ba06-8445261108f8.json} | 18 +- ...a971220e-d7f0-4919-9963-dbcedf5577e7.json} | 36 +- ...6cfc78af-700f-404c-aef4-81cb448644d9.json} | 8 +- ...rg_ghcontentintegrationtest-2-e50803.json} | 25 +- ...st_contents_testdirectory-50-6-3cdae0.json | 43 +++ ...50_test-file-tocreate-1txt-10-a5a649.json} | 29 +- ...-50_test-file-tocreate-1txt-11-47d978.json | 38 +++ ...-50_test-file-tocreate-1txt-3-a97122.json} | 29 +- ...-50_test-file-tocreate-1txt-4-5b2d08.json} | 31 +- ...y-50_test-file-tocreate-1txt-5-4be43b.json | 46 +++ ...y-50_test-file-tocreate-1txt-7-64a83a.json | 46 +++ ...-50_test-file-tocreate-1txt-8-04f85e.json} | 31 +- ...-50_test-file-tocreate-1txt-9-1d4297.json} | 33 +- .../mappings/user-1-6cfc78.json} | 23 +- ...1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json} | 16 +- ...2d908c73-0706-4af1-86d4-005b3b91adba.json} | 0 ...34ca1601-0b3c-4808-b51e-b436851e0efd.json} | 8 +- ...rg_ghcontentintegrationtest-2-1d1a48.json} | 25 +- ...ent-ro_a-dir-with-3-entries-3-2d908c.json} | 23 +- .../mappings/user-1-34ca16.json} | 23 +- ...a5c7d08d-fd5b-4564-ac11-03cf714fae84.json} | 16 +- ...462ae734-fe48-4be5-b432-ddd9912ca0e5.json} | 0 ...ebccdfec-1cc2-4880-9f10-a0de20895d1a.json} | 8 +- ...rg_ghcontentintegrationtest-2-a5c7d0.json} | 25 +- ...ent-ro_a-dir-with-3-entries-3-462ae7.json} | 23 +- .../mappings/user-1-ebccdf.json} | 23 +- ...1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json} | 16 +- ...a4535a71-fd6d-464c-a1e0-efa719b10411.json} | 0 ...afa831d7-4300-49c9-8451-d76fecb86330.json} | 8 +- ...rg_ghcontentintegrationtest-2-1279fb.json} | 25 +- ..._ghcontent-ro_an-empty-file-3-a4535a.json} | 23 +- .../mappings/user-1-afa831.json | 43 +++ ...-54fda8c5-462b-477f-be65-918b40f75fa5.json | 312 ++++++++++++++++++ ...-788adbe0-455b-4ba5-b05e-f485ea1874a7.json | 312 ++++++++++++++++++ ...-a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f.json | 312 ------------------ ...-fbcbe20f-df3f-4011-9340-bb9be7b2c36e.json | 312 ------------------ ...3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json} | 0 ...-59f0edb6-895f-402d-946f-77e7511a9a27.json | 45 +++ ...-8aeceae0-b015-47cc-9b83-17411b8d4bbd.json | 45 --- ...rg_ghcontentintegrationtest-2-788adb.json} | 25 +- ...rg_ghcontentintegrationtest-3-54fda8.json} | 25 +- ...tent-ro_a-file-with-content-4-3e4aa2.json} | 23 +- .../mappings/user-1-59f0ed.json} | 23 +- .../mappings/user-1-8aecea.json | 40 --- ...pi_branches_test_nonexistent-4-b14df6.json | 2 +- ...-api_branches_test_urlencode-4-ed8bf5.json | 2 +- 60 files changed, 1376 insertions(+), 1075 deletions(-) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-4f1ed47c-f261-4520-80d7-16b5952dd0e9.json => repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json} (99%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-30d0709c-ebc9-4631-8f44-bd942c44a711.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json} (54%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-c2b7d86b-e154-4f46-8ab0-f253f77f5dda.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json} (57%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-67d9bcdb-d0e8-44b0-9077-8530b3b77997.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json} (58%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5d54ef56-18eb-43d3-9167-bf3bfae69460.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json} (61%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-fa09f0c6-b78d-4504-b3ab-6050682ab604.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json} (53%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetDirectoryContent/__files/user-842cc871-f338-4cc0-8fb0-db276fb4224a.json => testCRUDContent/__files/user-6cfc78af-700f-404c-aef4-81cb448644d9.json} (94%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-5c51b8.json => testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json} (71%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-7-5d54ef.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json} (62%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-3-fa09f0.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json} (63%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-4-67d9bc.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json} (66%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5-30d070.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json} (61%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-6-c2b7d8.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json} (64%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetDirectoryContent/mappings/user-1-842cc8.json => testCRUDContent/mappings/user-1-6cfc78.json} (71%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-7b176dc1-41fe-4677-ae9d-f420dfa1153f.json => repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json} (99%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-b4bdb0bb-efdb-4a83-b03e-053ac0e8c56a.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json} (100%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testCRUDContent/__files/user-c9f376fa-4819-4dc7-bc79-43cabec4276f.json => testGetDirectoryContent/__files/user-34ca1601-0b3c-4808-b51e-b436851e0efd.json} (94%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-0c161f.json => testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json} (71%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-b4bdb0.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json} (74%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetDirectoryContentTrailingSlash/mappings/user-1-00d46d.json => testGetDirectoryContent/mappings/user-1-34ca16.json} (71%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/{repos_github-api-test-org_ghcontentintegrationtest-5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed.json => repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json} (99%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-29ca1e20-a321-449e-93db-dc5155bb4118.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json} (100%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/{user-00d46d71-d7b4-430e-948c-8a70ecd0e9b3.json => user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json} (94%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-7b176d.json => testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json} (71%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-29ca1e.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json} (74%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testGetEmptyFileContent/mappings/user-1-94ede0.json => testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json} (71%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-0c161f59-1b24-493e-b05a-cea86caa45a9.json => repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json} (99%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-09629f63-a530-4e70-86d7-7c38d409c649.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json} (100%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/{user-94ede01e-bf08-434a-a769-b1ca13cbbe5c.json => user-afa831d7-4300-49c9-8451-d76fecb86330.json} (94%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-4f1ed4.json => testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json} (71%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-09629f.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json} (74%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f.json delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-fbcbe20f-df3f-4011-9340-bb9be7b2c36e.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-cf14dc4b-72ea-4159-bc7a-4d10a2ebb43e.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json} (100%) create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-59f0edb6-895f-402d-946f-77e7511a9a27.json delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-8aeceae0-b015-47cc-9b83-17411b8d4bbd.json rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest-2-fbcbe2.json => repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json} (74%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest-3-a90820.json => repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json} (74%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-cf14dc.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json} (74%) rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/{testCRUDContent/mappings/user-1-c9f376.json => testGetFileContent/mappings/user-1-59f0ed.json} (71%) delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-8aecea.json diff --git a/src/main/java/org/kohsuke/github/GHContent.java b/src/main/java/org/kohsuke/github/GHContent.java index 86f5a4aadc..8683e6c2fb 100644 --- a/src/main/java/org/kohsuke/github/GHContent.java +++ b/src/main/java/org/kohsuke/github/GHContent.java @@ -316,7 +316,7 @@ public GHContentUpdateResponse update(byte[] newContentBytes, String commitMessa requester.with("branch", branch); } - GHContentUpdateResponse response = requester.to(getApiRoute(), GHContentUpdateResponse.class); + GHContentUpdateResponse response = requester.to(getApiRoute(repository, path), GHContentUpdateResponse.class); response.getContent().wrap(repository); response.getCommit().wrapUp(repository); @@ -359,14 +359,14 @@ public GHContentUpdateResponse delete(String commitMessage, String branch) throw requester.with("branch", branch); } - GHContentUpdateResponse response = requester.to(getApiRoute(), GHContentUpdateResponse.class); + GHContentUpdateResponse response = requester.to(getApiRoute(repository, path), GHContentUpdateResponse.class); response.getCommit().wrapUp(repository); return response; } - private String getApiRoute() { - return "/repos/" + repository.getOwnerName() + "/" + repository.getName() + "/contents/" + path; + static String getApiRoute(GHRepository repository, String path) { + return repository.getApiTailUrl("contents/" + path); } GHContent wrap(GHRepository owner) { diff --git a/src/main/java/org/kohsuke/github/GHContentBuilder.java b/src/main/java/org/kohsuke/github/GHContentBuilder.java index 85fdc6522f..b50a7e257b 100644 --- a/src/main/java/org/kohsuke/github/GHContentBuilder.java +++ b/src/main/java/org/kohsuke/github/GHContentBuilder.java @@ -108,8 +108,7 @@ public GHContentBuilder message(String commitMessage) { * the io exception */ public GHContentUpdateResponse commit() throws IOException { - GHContentUpdateResponse response = req.to(repo.getApiTailUrl("contents/" + path), - GHContentUpdateResponse.class); + GHContentUpdateResponse response = req.to(GHContent.getApiRoute(repo, path), GHContentUpdateResponse.class); response.getContent().wrap(repo); response.getCommit().wrapUp(repo); diff --git a/src/main/java/org/kohsuke/github/GHRelease.java b/src/main/java/org/kohsuke/github/GHRelease.java index 3955693071..6d4c18c073 100644 --- a/src/main/java/org/kohsuke/github/GHRelease.java +++ b/src/main/java/org/kohsuke/github/GHRelease.java @@ -244,7 +244,7 @@ public GHAsset uploadAsset(String filename, InputStream stream, String contentTy String url = getUploadUrl(); // strip the helpful garbage from the url url = url.substring(0, url.indexOf('{')); - url += "?name=" + URLEncoder.encode(filename, "UTF-8"); + url += "?name=" + URLEncoder.encode(filename); return builder.contentType(contentType).with(stream).to(url, GHAsset.class).wrap(this); } diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index 58047b3429..932e769ad6 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -34,9 +34,7 @@ import java.io.InputStreamReader; import java.io.InterruptedIOException; import java.io.Reader; -import java.io.UnsupportedEncodingException; import java.net.URL; -import java.net.URLEncoder; import java.util.AbstractSet; import java.util.ArrayList; import java.util.Arrays; @@ -51,8 +49,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.WeakHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; import static java.util.Arrays.*; import static org.kohsuke.github.Previews.*; @@ -1460,14 +1456,7 @@ public PagedIterable listRefs(String refType) throws IOException { * on failure communicating with GitHub, potentially due to an invalid ref type being requested */ public GHRef getRef(String refName) throws IOException { - // hashes in branch names must be replaced with the url encoded equivalent or this call will fail - // FIXME: how about other URL unsafe characters, like space, @, : etc? do we need to be using - // URLEncoder.encode()? - // OTOH, '/' need no escaping - refName = refName.replaceAll("#", "%23"); - return root.retrieve() - .to(String.format("/repos/%s/%s/git/refs/%s", getOwnerName(), name, refName), GHRef.class) - .wrap(root); + return root.retrieve().to(getApiTailUrl(String.format("git/refs/%s", refName)), GHRef.class).wrap(root); } /** @@ -2031,25 +2020,6 @@ public Map getBranches() throws IOException { return r; } - /** - * Replace special characters (e.g. #) with standard values (e.g. %23) so GitHub understands what is being - * requested. - * - * @param value - * string to be encoded. - * @return The encoded string. - */ - private String UrlEncode(String value) { - try { - return URLEncoder.encode(value, org.apache.commons.codec.CharEncoding.UTF_8); - } catch (UnsupportedEncodingException ex) { - Logger.getLogger(GHRepository.class.getName()).log(Level.SEVERE, null, ex); - } - - // Something went wrong - just return original value as is. - return value; - } - /** * Gets branch. * @@ -2060,7 +2030,7 @@ private String UrlEncode(String value) { * the io exception */ public GHBranch getBranch(String name) throws IOException { - return root.retrieve().to(getApiTailUrl("branches/" + UrlEncode(name)), GHBranch.class).wrap(this); + return root.retrieve().to(getApiTailUrl("branches/" + name), GHBranch.class).wrap(this); } /** @@ -2576,7 +2546,7 @@ public boolean equals(Object obj) { String getApiTailUrl(String tail) { if (tail.length() > 0 && !tail.startsWith("/")) tail = '/' + tail; - return "/repos/" + getOwnerName() + "/" + name + tail; + return Requester.urlPathEncode("/repos/" + getOwnerName() + "/" + name + tail); } /** diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java index 1c69c3e154..1fe3bab8bb 100644 --- a/src/main/java/org/kohsuke/github/Requester.java +++ b/src/main/java/org/kohsuke/github/Requester.java @@ -40,6 +40,8 @@ import java.net.MalformedURLException; import java.net.ProtocolException; import java.net.SocketTimeoutException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLEncoder; import java.util.ArrayList; @@ -942,6 +944,21 @@ static String transformEnum(Enum en) { return en.toString().toLowerCase(Locale.ENGLISH).replace('_', '-'); } + /** + * Encode the path to url safe string. + * + * @param value + * string to be path encoded. + * @return The encoded string. + */ + public static String urlPathEncode(String value) { + try { + return new URI(null, null, value, null, null).toString(); + } catch (URISyntaxException ex) { + throw new AssertionError(ex); + } + } + private static final List METHODS_WITHOUT_BODY = asList("GET", "DELETE"); private static final Logger LOGGER = Logger.getLogger(Requester.class.getName()); } diff --git a/src/test/java/org/kohsuke/github/GHContentIntegrationTest.java b/src/test/java/org/kohsuke/github/GHContentIntegrationTest.java index 4b4b591353..0df362c7a5 100644 --- a/src/test/java/org/kohsuke/github/GHContentIntegrationTest.java +++ b/src/test/java/org/kohsuke/github/GHContentIntegrationTest.java @@ -9,13 +9,18 @@ import java.io.InputStreamReader; import java.util.List; +import static org.hamcrest.CoreMatchers.*; + /** * Integration test for {@link GHContent}. */ public class GHContentIntegrationTest extends AbstractGitHubWireMockTest { private GHRepository repo; - private String createdFilename = "test-file-to-create.txt"; + + // file name with spaces and other chars + private final String createdDirectory = "test+directory #50"; + private final String createdFilename = createdDirectory + "/test file-to+create-#1.txt"; @Before @After @@ -79,8 +84,23 @@ public void testCRUDContent() throws Exception { assertNotNull(created.getCommit()); assertNotNull(created.getContent()); assertNotNull(createdContent.getContent()); + assertThat(createdContent.getPath(), equalTo(createdFilename)); assertEquals("this is an awesome file I created\n", createdContent.getContent()); + GHContent content = repo.getFileContent(createdFilename); + assertThat(content, is(notNullValue())); + assertThat(content.getSha(), equalTo(createdContent.getSha())); + assertThat(content.getContent(), equalTo(createdContent.getContent())); + assertThat(content.getPath(), equalTo(createdContent.getPath())); + + List directoryContents = repo.getDirectoryContent(createdDirectory); + assertThat(directoryContents, is(notNullValue())); + assertThat(directoryContents.size(), equalTo(1)); + content = directoryContents.get(0); + assertThat(content.getSha(), is(created.getContent().getSha())); + assertThat(content.getContent(), is(created.getContent().getContent())); + assertThat(content.getPath(), equalTo(createdFilename)); + GHContentUpdateResponse updatedContentResponse = createdContent.update("this is some new content\n", "Updated file for integration tests."); GHContent updatedContent = updatedContentResponse.getContent(); @@ -96,5 +116,13 @@ public void testCRUDContent() throws Exception { assertNotNull(deleteResponse.getCommit()); assertNull(deleteResponse.getContent()); + + try { + repo.getFileContent(createdFilename); + fail("Delete didn't work!"); + } catch (GHFileNotFoundException e) { + assertThat(e.getMessage(), + equalTo("{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/repos/contents/#get-contents\"}")); + } } } diff --git a/src/test/java/org/kohsuke/github/GHRepositoryTest.java b/src/test/java/org/kohsuke/github/GHRepositoryTest.java index 6bfc2fd1b7..c27be6732c 100644 --- a/src/test/java/org/kohsuke/github/GHRepositoryTest.java +++ b/src/test/java/org/kohsuke/github/GHRepositoryTest.java @@ -65,7 +65,7 @@ public void getBranchNonExistentBut200Status() throws Exception { assertThat(e.getMessage(), equalTo("Server returned HTTP response code: 200, message: 'OK' for URL: " + mockGitHub.apiServer().baseUrl() - + "/repos/github-api-test-org/github-api/branches/test%2FNonExistent")); + + "/repos/github-api-test-org/github-api/branches/test/NonExistent")); } } diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-4f1ed47c-f261-4520-80d7-16b5952dd0e9.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json similarity index 99% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-4f1ed47c-f261-4520-80d7-16b5952dd0e9.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json index a2718e2e2d..15b132d251 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-4f1ed47c-f261-4520-80d7-16b5952dd0e9.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json @@ -65,14 +65,14 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", "created_at": "2015-08-15T14:14:57Z", - "updated_at": "2019-10-11T22:17:07Z", - "pushed_at": "2019-10-11T22:17:06Z", + "updated_at": "2019-11-26T01:09:15Z", + "pushed_at": "2019-11-26T01:09:14Z", "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", "homepage": null, - "size": 38, + "size": 45, "stargazers_count": 1, "watchers_count": 1, "language": null, @@ -81,13 +81,13 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 40, + "forks_count": 41, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 40, + "forks": 41, "open_issues": 0, "watchers": 1, "default_branch": "master", @@ -296,17 +296,17 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 59, + "forks_count": 60, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 59, + "forks": 60, "open_issues": 0, "watchers": 0, "default_branch": "master" }, - "network_count": 59, + "network_count": 60, "subscribers_count": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json new file mode 100644 index 0000000000..f2db32f596 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json @@ -0,0 +1,18 @@ +[ + { + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", + "sha": "8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "size": 34, + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", + "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", + "type": "file", + "_links": { + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" + } + } +] \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-30d0709c-ebc9-4631-8f44-bd942c44a711.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json similarity index 54% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-30d0709c-ebc9-4631-8f44-bd942c44a711.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json index ef8e34384d..65c175ff55 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-30d0709c-ebc9-4631-8f44-bd942c44a711.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json @@ -1,45 +1,45 @@ { "content": { - "name": "test-file-to-create.txt", - "path": "test-file-to-create.txt", + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", "sha": "da2d3cc78776aec68881668775c46a53f0ee2288", "size": 25, - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/da2d3cc78776aec68881668775c46a53f0ee2288", - "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test-file-to-create.txt", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "type": "file", "_links": { - "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/da2d3cc78776aec68881668775c46a53f0ee2288", - "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt" + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" } }, "commit": { - "sha": "bc9cda986e02ae2677358a28f9cb6097865b3536", - "node_id": "MDY6Q29tbWl0NDA3NjM1Nzc6YmM5Y2RhOTg2ZTAyYWUyNjc3MzU4YTI4ZjljYjYwOTc4NjViMzUzNg==", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/bc9cda986e02ae2677358a28f9cb6097865b3536", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/bc9cda986e02ae2677358a28f9cb6097865b3536", + "sha": "00c7107a9d00cfd9116747ce61c91f2fd9a7acbc", + "node_id": "MDY6Q29tbWl0NDA3NjM1Nzc6MDBjNzEwN2E5ZDAwY2ZkOTExNjc0N2NlNjFjOTFmMmZkOWE3YWNiYw==", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/00c7107a9d00cfd9116747ce61c91f2fd9a7acbc", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/00c7107a9d00cfd9116747ce61c91f2fd9a7acbc", "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-10-11T22:17:43Z" + "date": "2019-11-26T01:09:46Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-10-11T22:17:43Z" + "date": "2019-11-26T01:09:46Z" }, "tree": { - "sha": "7aaee6a6cddcf48f94a40093de05be83c580ce10", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees/7aaee6a6cddcf48f94a40093de05be83c580ce10" + "sha": "50e945108f168faeb2eaf15855904e65e70b9336", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees/50e945108f168faeb2eaf15855904e65e70b9336" }, "message": "Updated file for integration tests.", "parents": [ { - "sha": "88bd1f52fc1e8242758364cee7dce2c82790d272", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/88bd1f52fc1e8242758364cee7dce2c82790d272", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/88bd1f52fc1e8242758364cee7dce2c82790d272" + "sha": "ce407cde9c6e4c970e33a955197512a2c1922ecf", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/ce407cde9c6e4c970e33a955197512a2c1922ecf", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/ce407cde9c6e4c970e33a955197512a2c1922ecf" } ], "verification": { diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-c2b7d86b-e154-4f46-8ab0-f253f77f5dda.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json similarity index 57% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-c2b7d86b-e154-4f46-8ab0-f253f77f5dda.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json index b186b542ac..efbda9142c 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-c2b7d86b-e154-4f46-8ab0-f253f77f5dda.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json @@ -1,18 +1,18 @@ { - "name": "test-file-to-create.txt", - "path": "test-file-to-create.txt", + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", "sha": "da2d3cc78776aec68881668775c46a53f0ee2288", "size": 25, - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/da2d3cc78776aec68881668775c46a53f0ee2288", - "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test-file-to-create.txt", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "type": "file", "content": "dGhpcyBpcyBzb21lIG5ldyBjb250ZW50Cg==\n", "encoding": "base64", "_links": { - "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/da2d3cc78776aec68881668775c46a53f0ee2288", - "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt" + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-67d9bcdb-d0e8-44b0-9077-8530b3b77997.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json similarity index 58% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-67d9bcdb-d0e8-44b0-9077-8530b3b77997.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json index 3d20a236e0..7da4fdc6f7 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-67d9bcdb-d0e8-44b0-9077-8530b3b77997.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json @@ -1,18 +1,18 @@ { - "name": "test-file-to-create.txt", - "path": "test-file-to-create.txt", + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", "sha": "8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", "size": 34, - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", - "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test-file-to-create.txt", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "type": "file", "content": "dGhpcyBpcyBhbiBhd2Vzb21lIGZpbGUgSSBjcmVhdGVkCg==\n", "encoding": "base64", "_links": { - "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", - "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt" + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" } } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json new file mode 100644 index 0000000000..7da4fdc6f7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json @@ -0,0 +1,18 @@ +{ + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", + "sha": "8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "size": 34, + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", + "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", + "type": "file", + "content": "dGhpcyBpcyBhbiBhd2Vzb21lIGZpbGUgSSBjcmVhdGVkCg==\n", + "encoding": "base64", + "_links": { + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json new file mode 100644 index 0000000000..7da4fdc6f7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json @@ -0,0 +1,18 @@ +{ + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", + "sha": "8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "size": 34, + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", + "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", + "type": "file", + "content": "dGhpcyBpcyBhbiBhd2Vzb21lIGZpbGUgSSBjcmVhdGVkCg==\n", + "encoding": "base64", + "_links": { + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5d54ef56-18eb-43d3-9167-bf3bfae69460.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json similarity index 61% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5d54ef56-18eb-43d3-9167-bf3bfae69460.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json index 8f875233de..44ca7da82f 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5d54ef56-18eb-43d3-9167-bf3bfae69460.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json @@ -1,19 +1,19 @@ { "content": null, "commit": { - "sha": "9cc8aeb99d67bcbafbf0f5d18bd584ac49758ddd", - "node_id": "MDY6Q29tbWl0NDA3NjM1Nzc6OWNjOGFlYjk5ZDY3YmNiYWZiZjBmNWQxOGJkNTg0YWM0OTc1OGRkZA==", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/9cc8aeb99d67bcbafbf0f5d18bd584ac49758ddd", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/9cc8aeb99d67bcbafbf0f5d18bd584ac49758ddd", + "sha": "b1378c3baae84ff2656bda47f65f4d7dccd5b3df", + "node_id": "MDY6Q29tbWl0NDA3NjM1Nzc6YjEzNzhjM2JhYWU4NGZmMjY1NmJkYTQ3ZjY1ZjRkN2RjY2Q1YjNkZg==", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/b1378c3baae84ff2656bda47f65f4d7dccd5b3df", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/b1378c3baae84ff2656bda47f65f4d7dccd5b3df", "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-10-11T22:17:44Z" + "date": "2019-11-26T01:09:47Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-10-11T22:17:44Z" + "date": "2019-11-26T01:09:47Z" }, "tree": { "sha": "7cc7cd2aba0de1a3f684338c892c84b7ebe6635b", @@ -22,9 +22,9 @@ "message": "Enough of this foolishness!", "parents": [ { - "sha": "bc9cda986e02ae2677358a28f9cb6097865b3536", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/bc9cda986e02ae2677358a28f9cb6097865b3536", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/bc9cda986e02ae2677358a28f9cb6097865b3536" + "sha": "00c7107a9d00cfd9116747ce61c91f2fd9a7acbc", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/00c7107a9d00cfd9116747ce61c91f2fd9a7acbc", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/00c7107a9d00cfd9116747ce61c91f2fd9a7acbc" } ], "verification": { diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-fa09f0c6-b78d-4504-b3ab-6050682ab604.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json similarity index 53% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-fa09f0c6-b78d-4504-b3ab-6050682ab604.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json index 4758568bd0..310135063f 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-fa09f0c6-b78d-4504-b3ab-6050682ab604.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json @@ -1,45 +1,45 @@ { "content": { - "name": "test-file-to-create.txt", - "path": "test-file-to-create.txt", + "name": "test file-to+create-#1.txt", + "path": "test+directory #50/test file-to+create-#1.txt", "sha": "8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", "size": 34, - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "git_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", - "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test-file-to-create.txt", + "download_url": "https://raw.githubusercontent.com/github-api-test-org/GHContentIntegrationTest/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt", "type": "file", "_links": { - "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", + "self": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", "git": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs/8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1", - "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test-file-to-create.txt" + "html": "https://github.com/github-api-test-org/GHContentIntegrationTest/blob/master/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt" } }, "commit": { - "sha": "88bd1f52fc1e8242758364cee7dce2c82790d272", - "node_id": "MDY6Q29tbWl0NDA3NjM1Nzc6ODhiZDFmNTJmYzFlODI0Mjc1ODM2NGNlZTdkY2UyYzgyNzkwZDI3Mg==", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/88bd1f52fc1e8242758364cee7dce2c82790d272", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/88bd1f52fc1e8242758364cee7dce2c82790d272", + "sha": "ce407cde9c6e4c970e33a955197512a2c1922ecf", + "node_id": "MDY6Q29tbWl0NDA3NjM1Nzc6Y2U0MDdjZGU5YzZlNGM5NzBlMzNhOTU1MTk3NTEyYTJjMTkyMmVjZg==", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/ce407cde9c6e4c970e33a955197512a2c1922ecf", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/ce407cde9c6e4c970e33a955197512a2c1922ecf", "author": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-10-11T22:17:42Z" + "date": "2019-11-26T01:09:45Z" }, "committer": { "name": "Liam Newman", "email": "bitwiseman@gmail.com", - "date": "2019-10-11T22:17:42Z" + "date": "2019-11-26T01:09:45Z" }, "tree": { - "sha": "baa85f9e7c712c76d80024300011226f4b442945", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees/baa85f9e7c712c76d80024300011226f4b442945" + "sha": "1b852519fae94c3bca109754e408016f49fba41b", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees/1b852519fae94c3bca109754e408016f49fba41b" }, "message": "Creating a file for integration tests.", "parents": [ { - "sha": "89ac3f7e8c951288c26f6a80bddbd32ecf28fbba", - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/89ac3f7e8c951288c26f6a80bddbd32ecf28fbba", - "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/89ac3f7e8c951288c26f6a80bddbd32ecf28fbba" + "sha": "6b0e644dfd920c634cedba68ace4c50b8b3e5799", + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits/6b0e644dfd920c634cedba68ace4c50b8b3e5799", + "html_url": "https://github.com/github-api-test-org/GHContentIntegrationTest/commit/6b0e644dfd920c634cedba68ace4c50b8b3e5799" } ], "verification": { diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-842cc871-f338-4cc0-8fb0-db276fb4224a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-6cfc78af-700f-404c-aef4-81cb448644d9.json similarity index 94% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-842cc871-f338-4cc0-8fb0-db276fb4224a.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-6cfc78af-700f-404c-aef4-81cb448644d9.json index 760bd7fb8a..37691dd3c0 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-842cc871-f338-4cc0-8fb0-db276fb4224a.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-6cfc78af-700f-404c-aef4-81cb448644d9.json @@ -24,14 +24,14 @@ "email": "bitwiseman@gmail.com", "hireable": null, "bio": "https://twitter.com/bitwiseman", - "public_repos": 168, - "public_gists": 5, - "followers": 138, + "public_repos": 176, + "public_gists": 7, + "followers": 141, "following": 9, "created_at": "2012-07-11T20:38:33Z", "updated_at": "2019-09-24T19:32:29Z", "private_gists": 7, - "total_private_repos": 9, + "total_private_repos": 10, "owned_private_repos": 0, "disk_usage": 33697, "collaborators": 0, diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-5c51b8.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-5c51b8.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json index 2c83c43aa9..53ae1a6680 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-5c51b8.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json @@ -1,5 +1,5 @@ { - "id": "5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed", + "id": "e5080341-7377-4f3f-9427-388a105a91a7", "name": "repos_github-api-test-org_ghcontentintegrationtest", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:38 GMT", + "Date": "Tue, 26 Nov 2019 01:09:44 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4709", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4922", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"7a79bc3c7c98b7f2a0de605eea3ad3f6\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:07 GMT", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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", @@ -31,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": "C0EA:0DF0:11FF02:271656:5DA0FF82" + "X-GitHub-Request-Id": "EEAB:6915:6C7C5:82505:5DDC7B58" } }, - "uuid": "5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed", + "uuid": "e5080341-7377-4f3f-9427-388a105a91a7", "persistent": true, "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json new file mode 100644 index 0000000000..0035d15f51 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json @@ -0,0 +1,43 @@ +{ + "id": "3cdae02b-77ed-4fb7-96fa-fee8aab5e88d", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50", + "request": { + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350", + "method": "GET" + }, + "response": { + "status": 200, + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json", + "headers": { + "Date": "Tue, 26 Nov 2019 01:09:46 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4918", + "X-RateLimit-Reset": "1574734142", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"1b852519fae94c3bca109754e408016f49fba41b\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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": "*", + "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": "EEAB:6915:6C7EE:82553:5DDC7B5A" + } + }, + "uuid": "3cdae02b-77ed-4fb7-96fa-fee8aab5e88d", + "persistent": true, + "insertionIndex": 6 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-7-5d54ef.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json similarity index 62% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-7-5d54ef.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json index cf34d0a0b9..ce4be41f98 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-7-5d54ef.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json @@ -1,24 +1,27 @@ { - "id": "5d54ef56-18eb-43d3-9167-bf3bfae69460", - "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt", + "id": "a5a649cc-8b2b-4c58-ba06-8445261108f8", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", "request": { - "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?path=test-file-to-create.txt&message=Enough+of+this+foolishness%21&sha=da2d3cc78776aec68881668775c46a53f0ee2288", + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt?path=test%2Bdirectory+%2350%2Ftest+file-to%2Bcreate-%231.txt&message=Enough+of+this+foolishness%21&sha=da2d3cc78776aec68881668775c46a53f0ee2288", "method": "DELETE" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5d54ef56-18eb-43d3-9167-bf3bfae69460.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:45 GMT", + "Date": "Tue, 26 Nov 2019 01:09:48 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4688", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4914", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"6d6afdfe857395e134b3708d795d54e9\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"4f74f1bbda160bd00a3c565258eefa4e\"", "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", @@ -30,10 +33,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": "C0F4:34C4:13C51E:28FB7B:5DA0FF88" + "X-GitHub-Request-Id": "EEAB:6915:6C813:82585:5DDC7B5B" } }, - "uuid": "5d54ef56-18eb-43d3-9167-bf3bfae69460", + "uuid": "a5a649cc-8b2b-4c58-ba06-8445261108f8", "persistent": true, - "insertionIndex": 7 + "insertionIndex": 10 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json new file mode 100644 index 0000000000..d95c152c3c --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json @@ -0,0 +1,38 @@ +{ + "id": "47d978e6-2ddd-4190-b4ca-c961fe2eeb35", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", + "request": { + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt", + "method": "GET" + }, + "response": { + "status": 404, + "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/repos/contents/#get-contents\"}", + "headers": { + "Date": "Tue, 26 Nov 2019 01:09:48 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "404 Not Found", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4913", + "X-RateLimit-Reset": "1574734142", + "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": "*", + "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": "EEAB:6915:6C842:825BC:5DDC7B5C" + } + }, + "uuid": "47d978e6-2ddd-4190-b4ca-c961fe2eeb35", + "persistent": true, + "scenarioName": "scenario-2-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt", + "requiredScenarioState": "scenario-2-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt-2", + "insertionIndex": 11 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-3-fa09f0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json similarity index 63% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-3-fa09f0.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json index 141d49597a..e63f5735d6 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-3-fa09f0.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json @@ -1,12 +1,12 @@ { - "id": "fa09f0c6-b78d-4504-b3ab-6050682ab604", - "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt", + "id": "a971220e-d7f0-4919-9963-dbcedf5577e7", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", "request": { - "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt", + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt", "method": "PUT", "bodyPatterns": [ { - "equalToJson": "{\"path\":\"test-file-to-create.txt\",\"message\":\"Creating a file for integration tests.\",\"content\":\"dGhpcyBpcyBhbiBhd2Vzb21lIGZpbGUgSSBjcmVhdGVkCg==\"}", + "equalToJson": "{\"path\":\"test+directory #50/test file-to+create-#1.txt\",\"message\":\"Creating a file for integration tests.\",\"content\":\"dGhpcyBpcyBhbiBhd2Vzb21lIGZpbGUgSSBjcmVhdGVkCg==\"}", "ignoreArrayOrder": true, "ignoreExtraElements": true } @@ -14,18 +14,21 @@ }, "response": { "status": 201, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-fa09f0c6-b78d-4504-b3ab-6050682ab604.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:43 GMT", + "Date": "Tue, 26 Nov 2019 01:09:45 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "201 Created", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4692", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4921", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "\"5a65778879e07c7838638cb58a54f72d\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "\"0bd911688cfe01b4461f4a06e76897e7\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -37,10 +40,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": "C0F4:34C4:13C485:28FA2A:5DA0FF86" + "X-GitHub-Request-Id": "EEAB:6915:6C7D1:82531:5DDC7B58" } }, - "uuid": "fa09f0c6-b78d-4504-b3ab-6050682ab604", + "uuid": "a971220e-d7f0-4919-9963-dbcedf5577e7", "persistent": true, "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-4-67d9bc.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json similarity index 66% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-4-67d9bc.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json index 47dcccc85d..6c8a644618 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-4-67d9bc.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json @@ -1,25 +1,28 @@ { - "id": "67d9bcdb-d0e8-44b0-9077-8530b3b77997", - "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt", + "id": "5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", "request": { - "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", "method": "GET" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-67d9bcdb-d0e8-44b0-9077-8530b3b77997.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:43 GMT", + "Date": "Tue, 26 Nov 2019 01:09:46 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4691", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4920", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], "ETag": "W/\"8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:42 GMT", + "Last-Modified": "Tue, 26 Nov 2019 01:09:45 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", @@ -31,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": "C0F4:34C4:13C4C4:28FAA9:5DA0FF87" + "X-GitHub-Request-Id": "EEAB:6915:6C7E7:82549:5DDC7B59" } }, - "uuid": "67d9bcdb-d0e8-44b0-9077-8530b3b77997", + "uuid": "5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1", "persistent": true, - "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test-file-to-create.txt", + "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt", "requiredScenarioState": "Started", - "newScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test-file-to-create.txt-2", + "newScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt-2", "insertionIndex": 4 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json new file mode 100644 index 0000000000..e079fd0e02 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json @@ -0,0 +1,46 @@ +{ + "id": "4be43bcb-37e3-4c54-8b0a-c190690dc820", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", + "request": { + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt", + "method": "GET" + }, + "response": { + "status": 200, + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json", + "headers": { + "Date": "Tue, 26 Nov 2019 01:09:46 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4919", + "X-RateLimit-Reset": "1574734142", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:45 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": "*", + "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": "EEAB:6915:6C7EA:8254E:5DDC7B5A" + } + }, + "uuid": "4be43bcb-37e3-4c54-8b0a-c190690dc820", + "persistent": true, + "scenarioName": "scenario-2-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt", + "requiredScenarioState": "Started", + "newScenarioState": "scenario-2-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt-2", + "insertionIndex": 5 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json new file mode 100644 index 0000000000..cb82e03be6 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json @@ -0,0 +1,46 @@ +{ + "id": "64a83a7d-a195-4f3b-989e-293e3f23611a", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", + "request": { + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", + "method": "GET" + }, + "response": { + "status": 200, + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json", + "headers": { + "Date": "Tue, 26 Nov 2019 01:09:46 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4917", + "X-RateLimit-Reset": "1574734142", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:45 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": "*", + "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": "EEAB:6915:6C7F4:82559:5DDC7B5A" + } + }, + "uuid": "64a83a7d-a195-4f3b-989e-293e3f23611a", + "persistent": true, + "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt", + "requiredScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt-2", + "newScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt-3", + "insertionIndex": 7 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5-30d070.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json similarity index 61% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5-30d070.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json index 07c37aae53..962440311d 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-5-30d070.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json @@ -1,12 +1,12 @@ { - "id": "30d0709c-ebc9-4631-8f44-bd942c44a711", - "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt", + "id": "04f85e50-583c-48ad-8d45-55368c542148", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", "request": { - "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt", + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt", "method": "PUT", "bodyPatterns": [ { - "equalToJson": "{\"path\":\"test-file-to-create.txt\",\"message\":\"Updated file for integration tests.\",\"sha\":\"8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1\",\"content\":\"dGhpcyBpcyBzb21lIG5ldyBjb250ZW50Cg==\"}", + "equalToJson": "{\"path\":\"test+directory #50/test file-to+create-#1.txt\",\"message\":\"Updated file for integration tests.\",\"sha\":\"8db9c31d79dfb9d0411c7af11b7ec7fabc72c5b1\",\"content\":\"dGhpcyBpcyBzb21lIG5ldyBjb250ZW50Cg==\"}", "ignoreArrayOrder": true, "ignoreExtraElements": true } @@ -14,18 +14,21 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-30d0709c-ebc9-4631-8f44-bd942c44a711.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:44 GMT", + "Date": "Tue, 26 Nov 2019 01:09:47 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4690", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4916", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"8648a7c6196682f3b051a90fffb4f4e3\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"2a8dd77e253917ab99dd7cad259871d3\"", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -37,10 +40,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": "C0F4:34C4:13C4D5:28FACF:5DA0FF87" + "X-GitHub-Request-Id": "EEAB:6915:6C7F7:8255E:5DDC7B5A" } }, - "uuid": "30d0709c-ebc9-4631-8f44-bd942c44a711", + "uuid": "04f85e50-583c-48ad-8d45-55368c542148", "persistent": true, - "insertionIndex": 5 + "insertionIndex": 8 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-6-c2b7d8.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json similarity index 64% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-6-c2b7d8.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json index 34b35eba8f..a445a7e93b 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-6-c2b7d8.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json @@ -1,25 +1,28 @@ { - "id": "c2b7d86b-e154-4f46-8ab0-f253f77f5dda", - "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt", + "id": "1d4297f8-515f-48b0-8f13-99894911d416", + "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt", "request": { - "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test-file-to-create.txt?ref=master", + "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/test%2Bdirectory%20%2350/test%20file-to%2Bcreate-%231.txt?ref=master", "method": "GET" }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_test-file-to-createtxt-c2b7d86b-e154-4f46-8ab0-f253f77f5dda.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:44 GMT", + "Date": "Tue, 26 Nov 2019 01:09:47 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4689", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4915", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], "ETag": "W/\"da2d3cc78776aec68881668775c46a53f0ee2288\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:43 GMT", + "Last-Modified": "Tue, 26 Nov 2019 01:09:46 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", @@ -31,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": "C0F4:34C4:13C50E:28FB46:5DA0FF88" + "X-GitHub-Request-Id": "EEAB:6915:6C80D:8257B:5DDC7B5B" } }, - "uuid": "c2b7d86b-e154-4f46-8ab0-f253f77f5dda", + "uuid": "1d4297f8-515f-48b0-8f13-99894911d416", "persistent": true, - "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test-file-to-create.txt", - "requiredScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test-file-to-create.txt-2", - "insertionIndex": 6 + "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt", + "requiredScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-contents-test+directory #50-test file-to+create-#1.txt-3", + "insertionIndex": 9 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-842cc8.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-842cc8.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json index fc31299988..b969fcf3c6 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-842cc8.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json @@ -1,5 +1,5 @@ { - "id": "842cc871-f338-4cc0-8fb0-db276fb4224a", + "id": "6cfc78af-700f-404c-aef4-81cb448644d9", "name": "user", "request": { "url": "/user", @@ -7,18 +7,21 @@ }, "response": { "status": 200, - "bodyFileName": "user-842cc871-f338-4cc0-8fb0-db276fb4224a.json", + "bodyFileName": "user-6cfc78af-700f-404c-aef4-81cb448644d9.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:35 GMT", + "Date": "Tue, 26 Nov 2019 01:09:44 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4721", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4926", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"42eed4772a65221c408dcbe210034076\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"", "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": "", @@ -31,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": "C0E5:4B0B:18399E:2F2026:5DA0FF7F" + "X-GitHub-Request-Id": "EEAB:6915:6C7A3:824FA:5DDC7B57" } }, - "uuid": "842cc871-f338-4cc0-8fb0-db276fb4224a", + "uuid": "6cfc78af-700f-404c-aef4-81cb448644d9", "persistent": true, "insertionIndex": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-7b176dc1-41fe-4677-ae9d-f420dfa1153f.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json similarity index 99% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-7b176dc1-41fe-4677-ae9d-f420dfa1153f.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json index a2718e2e2d..15b132d251 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-7b176dc1-41fe-4677-ae9d-f420dfa1153f.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json @@ -65,14 +65,14 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", "created_at": "2015-08-15T14:14:57Z", - "updated_at": "2019-10-11T22:17:07Z", - "pushed_at": "2019-10-11T22:17:06Z", + "updated_at": "2019-11-26T01:09:15Z", + "pushed_at": "2019-11-26T01:09:14Z", "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", "homepage": null, - "size": 38, + "size": 45, "stargazers_count": 1, "watchers_count": 1, "language": null, @@ -81,13 +81,13 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 40, + "forks_count": 41, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 40, + "forks": 41, "open_issues": 0, "watchers": 1, "default_branch": "master", @@ -296,17 +296,17 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 59, + "forks_count": 60, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 59, + "forks": 60, "open_issues": 0, "watchers": 0, "default_branch": "master" }, - "network_count": 59, + "network_count": 60, "subscribers_count": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-b4bdb0bb-efdb-4a83-b03e-053ac0e8c56a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-b4bdb0bb-efdb-4a83-b03e-053ac0e8c56a.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-c9f376fa-4819-4dc7-bc79-43cabec4276f.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-34ca1601-0b3c-4808-b51e-b436851e0efd.json similarity index 94% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-c9f376fa-4819-4dc7-bc79-43cabec4276f.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-34ca1601-0b3c-4808-b51e-b436851e0efd.json index 760bd7fb8a..37691dd3c0 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-c9f376fa-4819-4dc7-bc79-43cabec4276f.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-34ca1601-0b3c-4808-b51e-b436851e0efd.json @@ -24,14 +24,14 @@ "email": "bitwiseman@gmail.com", "hireable": null, "bio": "https://twitter.com/bitwiseman", - "public_repos": 168, - "public_gists": 5, - "followers": 138, + "public_repos": 176, + "public_gists": 7, + "followers": 141, "following": 9, "created_at": "2012-07-11T20:38:33Z", "updated_at": "2019-09-24T19:32:29Z", "private_gists": 7, - "total_private_repos": 9, + "total_private_repos": 10, "owned_private_repos": 0, "disk_usage": 33697, "collaborators": 0, diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-0c161f.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-0c161f.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json index 88d932575c..74ee8cf0ee 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-0c161f.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json @@ -1,5 +1,5 @@ { - "id": "0c161f59-1b24-493e-b05a-cea86caa45a9", + "id": "1d1a483f-3df5-43a6-8ce8-63f9772a49f2", "name": "repos_github-api-test-org_ghcontentintegrationtest", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-0c161f59-1b24-493e-b05a-cea86caa45a9.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:40 GMT", + "Date": "Tue, 26 Nov 2019 01:09:39 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4701", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4946", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"7a79bc3c7c98b7f2a0de605eea3ad3f6\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:07 GMT", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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", @@ -31,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": "C0EE:6185:148394:2A3C68:5DA0FF83" + "X-GitHub-Request-Id": "EE98:52E4:1D4D1:21A8E:5DDC7B51" } }, - "uuid": "0c161f59-1b24-493e-b05a-cea86caa45a9", + "uuid": "1d1a483f-3df5-43a6-8ce8-63f9772a49f2", "persistent": true, "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-b4bdb0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-b4bdb0.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json index d85a9bbc67..3d268c85fa 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-b4bdb0.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json @@ -1,5 +1,5 @@ { - "id": "b4bdb0bb-efdb-4a83-b03e-053ac0e8c56a", + "id": "2d908c73-0706-4af1-86d4-005b3b91adba", "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/ghcontent-ro/a-dir-with-3-entries", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-b4bdb0bb-efdb-4a83-b03e-053ac0e8c56a.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:37 GMT", + "Date": "Tue, 26 Nov 2019 01:09:39 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4716", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4945", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], "ETag": "W/\"7cc7cd2aba0de1a3f684338c892c84b7ebe6635b\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:07 GMT", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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", @@ -31,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": "C0E5:4B0B:183A34:2F2135:5DA0FF80" + "X-GitHub-Request-Id": "EE98:52E4:1D4D4:21AA3:5DDC7B53" } }, - "uuid": "b4bdb0bb-efdb-4a83-b03e-053ac0e8c56a", + "uuid": "2d908c73-0706-4af1-86d4-005b3b91adba", "persistent": true, "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-00d46d.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-00d46d.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json index ae505d7fc3..c4757d8850 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-00d46d.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json @@ -1,5 +1,5 @@ { - "id": "00d46d71-d7b4-430e-948c-8a70ecd0e9b3", + "id": "34ca1601-0b3c-4808-b51e-b436851e0efd", "name": "user", "request": { "url": "/user", @@ -7,18 +7,21 @@ }, "response": { "status": 200, - "bodyFileName": "user-00d46d71-d7b4-430e-948c-8a70ecd0e9b3.json", + "bodyFileName": "user-34ca1601-0b3c-4808-b51e-b436851e0efd.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:38 GMT", + "Date": "Tue, 26 Nov 2019 01:09:37 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4713", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4950", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"42eed4772a65221c408dcbe210034076\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"", "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": "", @@ -31,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": "C0EA:0DF0:11FEEA:271644:5DA0FF81" + "X-GitHub-Request-Id": "EE98:52E4:1D4BD:21A8C:5DDC7B51" } }, - "uuid": "00d46d71-d7b4-430e-948c-8a70ecd0e9b3", + "uuid": "34ca1601-0b3c-4808-b51e-b436851e0efd", "persistent": true, "insertionIndex": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json similarity index 99% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json index a2718e2e2d..15b132d251 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-5c51b83e-0d7f-4289-9b1f-fb2a2b15c4ed.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json @@ -65,14 +65,14 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", "created_at": "2015-08-15T14:14:57Z", - "updated_at": "2019-10-11T22:17:07Z", - "pushed_at": "2019-10-11T22:17:06Z", + "updated_at": "2019-11-26T01:09:15Z", + "pushed_at": "2019-11-26T01:09:14Z", "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", "homepage": null, - "size": 38, + "size": 45, "stargazers_count": 1, "watchers_count": 1, "language": null, @@ -81,13 +81,13 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 40, + "forks_count": 41, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 40, + "forks": 41, "open_issues": 0, "watchers": 1, "default_branch": "master", @@ -296,17 +296,17 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 59, + "forks_count": 60, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 59, + "forks": 60, "open_issues": 0, "watchers": 0, "default_branch": "master" }, - "network_count": 59, + "network_count": 60, "subscribers_count": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-29ca1e20-a321-449e-93db-dc5155bb4118.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-29ca1e20-a321-449e-93db-dc5155bb4118.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-00d46d71-d7b4-430e-948c-8a70ecd0e9b3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json similarity index 94% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-00d46d71-d7b4-430e-948c-8a70ecd0e9b3.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json index 760bd7fb8a..37691dd3c0 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-00d46d71-d7b4-430e-948c-8a70ecd0e9b3.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json @@ -24,14 +24,14 @@ "email": "bitwiseman@gmail.com", "hireable": null, "bio": "https://twitter.com/bitwiseman", - "public_repos": 168, - "public_gists": 5, - "followers": 138, + "public_repos": 176, + "public_gists": 7, + "followers": 141, "following": 9, "created_at": "2012-07-11T20:38:33Z", "updated_at": "2019-09-24T19:32:29Z", "private_gists": 7, - "total_private_repos": 9, + "total_private_repos": 10, "owned_private_repos": 0, "disk_usage": 33697, "collaborators": 0, diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-7b176d.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-7b176d.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json index fc626d3292..cdd8b5ffdf 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-7b176d.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json @@ -1,5 +1,5 @@ { - "id": "7b176dc1-41fe-4677-ae9d-f420dfa1153f", + "id": "a5c7d08d-fd5b-4564-ac11-03cf714fae84", "name": "repos_github-api-test-org_ghcontentintegrationtest", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-7b176dc1-41fe-4677-ae9d-f420dfa1153f.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:36 GMT", + "Date": "Tue, 26 Nov 2019 01:09:41 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4717", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4938", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"7a79bc3c7c98b7f2a0de605eea3ad3f6\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:07 GMT", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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", @@ -31,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": "C0E5:4B0B:183A14:2F203B:5DA0FF7F" + "X-GitHub-Request-Id": "EE9E:273E:18D5DB:1D4F42:5DDC7B54" } }, - "uuid": "7b176dc1-41fe-4677-ae9d-f420dfa1153f", + "uuid": "a5c7d08d-fd5b-4564-ac11-03cf714fae84", "persistent": true, "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-29ca1e.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-29ca1e.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json index a434db307b..7cd6c326c1 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-29ca1e.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json @@ -1,5 +1,5 @@ { - "id": "29ca1e20-a321-449e-93db-dc5155bb4118", + "id": "462ae734-fe48-4be5-b432-ddd9912ca0e5", "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/ghcontent-ro/a-dir-with-3-entries?ref=master", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-29ca1e20-a321-449e-93db-dc5155bb4118.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:38 GMT", + "Date": "Tue, 26 Nov 2019 01:09:41 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4708", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4937", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], "ETag": "W/\"7cc7cd2aba0de1a3f684338c892c84b7ebe6635b\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:07 GMT", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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", @@ -31,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": "C0EA:0DF0:11FF0E:27169E:5DA0FF82" + "X-GitHub-Request-Id": "EE9E:273E:18D5FF:1D4FC8:5DDC7B55" } }, - "uuid": "29ca1e20-a321-449e-93db-dc5155bb4118", + "uuid": "462ae734-fe48-4be5-b432-ddd9912ca0e5", "persistent": true, "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-94ede0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-94ede0.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json index 5f512a6ed9..33f60a76e3 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-94ede0.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json @@ -1,5 +1,5 @@ { - "id": "94ede01e-bf08-434a-a769-b1ca13cbbe5c", + "id": "ebccdfec-1cc2-4880-9f10-a0de20895d1a", "name": "user", "request": { "url": "/user", @@ -7,18 +7,21 @@ }, "response": { "status": 200, - "bodyFileName": "user-94ede01e-bf08-434a-a769-b1ca13cbbe5c.json", + "bodyFileName": "user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:39 GMT", + "Date": "Tue, 26 Nov 2019 01:09:40 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4705", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4942", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"42eed4772a65221c408dcbe210034076\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"", "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": "", @@ -31,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": "C0EE:6185:148366:2A3C4C:5DA0FF83" + "X-GitHub-Request-Id": "EE9E:273E:18D56B:1D4F25:5DDC7B54" } }, - "uuid": "94ede01e-bf08-434a-a769-b1ca13cbbe5c", + "uuid": "ebccdfec-1cc2-4880-9f10-a0de20895d1a", "persistent": true, "insertionIndex": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-0c161f59-1b24-493e-b05a-cea86caa45a9.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json similarity index 99% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-0c161f59-1b24-493e-b05a-cea86caa45a9.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json index a2718e2e2d..15b132d251 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-0c161f59-1b24-493e-b05a-cea86caa45a9.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json @@ -65,14 +65,14 @@ "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", "created_at": "2015-08-15T14:14:57Z", - "updated_at": "2019-10-11T22:17:07Z", - "pushed_at": "2019-10-11T22:17:06Z", + "updated_at": "2019-11-26T01:09:15Z", + "pushed_at": "2019-11-26T01:09:14Z", "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", "homepage": null, - "size": 38, + "size": 45, "stargazers_count": 1, "watchers_count": 1, "language": null, @@ -81,13 +81,13 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 40, + "forks_count": 41, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 40, + "forks": 41, "open_issues": 0, "watchers": 1, "default_branch": "master", @@ -296,17 +296,17 @@ "has_downloads": true, "has_wiki": true, "has_pages": false, - "forks_count": 59, + "forks_count": 60, "mirror_url": null, "archived": false, "disabled": false, "open_issues_count": 0, "license": null, - "forks": 59, + "forks": 60, "open_issues": 0, "watchers": 0, "default_branch": "master" }, - "network_count": 59, + "network_count": 60, "subscribers_count": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-09629f63-a530-4e70-86d7-7c38d409c649.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-09629f63-a530-4e70-86d7-7c38d409c649.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-94ede01e-bf08-434a-a769-b1ca13cbbe5c.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-afa831d7-4300-49c9-8451-d76fecb86330.json similarity index 94% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-94ede01e-bf08-434a-a769-b1ca13cbbe5c.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-afa831d7-4300-49c9-8451-d76fecb86330.json index 760bd7fb8a..37691dd3c0 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-94ede01e-bf08-434a-a769-b1ca13cbbe5c.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-afa831d7-4300-49c9-8451-d76fecb86330.json @@ -24,14 +24,14 @@ "email": "bitwiseman@gmail.com", "hireable": null, "bio": "https://twitter.com/bitwiseman", - "public_repos": 168, - "public_gists": 5, - "followers": 138, + "public_repos": 176, + "public_gists": 7, + "followers": 141, "following": 9, "created_at": "2012-07-11T20:38:33Z", "updated_at": "2019-09-24T19:32:29Z", "private_gists": 7, - "total_private_repos": 9, + "total_private_repos": 10, "owned_private_repos": 0, "disk_usage": 33697, "collaborators": 0, diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-4f1ed4.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-4f1ed4.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json index 744c15f42f..87f357029e 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-4f1ed4.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json @@ -1,5 +1,5 @@ { - "id": "4f1ed47c-f261-4520-80d7-16b5952dd0e9", + "id": "1279fb1b-4a2a-493a-b29a-96a060e4d3a5", "name": "repos_github-api-test-org_ghcontentintegrationtest", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-4f1ed47c-f261-4520-80d7-16b5952dd0e9.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:42 GMT", + "Date": "Tue, 26 Nov 2019 01:09:42 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4693", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4930", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"7a79bc3c7c98b7f2a0de605eea3ad3f6\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:07 GMT", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:15 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", @@ -31,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": "C0F4:34C4:13C474:28F9B7:5DA0FF85" + "X-GitHub-Request-Id": "EEA5:25D8:19CAB6:1E5EE4:5DDC7B56" } }, - "uuid": "4f1ed47c-f261-4520-80d7-16b5952dd0e9", + "uuid": "1279fb1b-4a2a-493a-b29a-96a060e4d3a5", "persistent": true, "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-09629f.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-09629f.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json index 5a8fccd58a..9cd86db684 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-09629f.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json @@ -1,5 +1,5 @@ { - "id": "09629f63-a530-4e70-86d7-7c38d409c649", + "id": "a4535a71-fd6d-464c-a1e0-efa719b10411", "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/ghcontent-ro/an-empty-file", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-09629f63-a530-4e70-86d7-7c38d409c649.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:40 GMT", + "Date": "Tue, 26 Nov 2019 01:09:43 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4700", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4929", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], "ETag": "W/\"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:05 GMT", + "Last-Modified": "Tue, 26 Nov 2019 01:09:13 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", @@ -31,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": "C0EE:6185:1483AF:2A3CE5:5DA0FF84" + "X-GitHub-Request-Id": "EEA5:25D8:19CACE:1E5F69:5DDC7B56" } }, - "uuid": "09629f63-a530-4e70-86d7-7c38d409c649", + "uuid": "a4535a71-fd6d-464c-a1e0-efa719b10411", "persistent": true, "insertionIndex": 3 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json new file mode 100644 index 0000000000..22a9dfe164 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json @@ -0,0 +1,43 @@ +{ + "id": "afa831d7-4300-49c9-8451-d76fecb86330", + "name": "user", + "request": { + "url": "/user", + "method": "GET" + }, + "response": { + "status": 200, + "bodyFileName": "user-afa831d7-4300-49c9-8451-d76fecb86330.json", + "headers": { + "Date": "Tue, 26 Nov 2019 01:09:42 GMT", + "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", + "Status": "200 OK", + "X-RateLimit-Limit": "5000", + "X-RateLimit-Remaining": "4934", + "X-RateLimit-Reset": "1574734142", + "Cache-Control": "private, max-age=60, s-maxage=60", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"", + "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", + "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": "EEA5:25D8:19CA50:1E5ECF:5DDC7B55" + } + }, + "uuid": "afa831d7-4300-49c9-8451-d76fecb86330", + "persistent": true, + "insertionIndex": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json new file mode 100644 index 0000000000..16577a96d7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json @@ -0,0 +1,312 @@ +{ + "id": 40763577, + "node_id": "MDEwOlJlcG9zaXRvcnk0MDc2MzU3Nw==", + "name": "GHContentIntegrationTest", + "full_name": "github-api-test-org/GHContentIntegrationTest", + "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/GHContentIntegrationTest", + "description": "Repository used for integration test of github-api", + "fork": true, + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest", + "forks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/forks", + "keys_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/teams", + "hooks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/hooks", + "issue_events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/events{/number}", + "events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/events", + "assignees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/assignees{/user}", + "branches_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/branches{/branch}", + "tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/tags", + "blobs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/statuses/{sha}", + "languages_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/languages", + "stargazers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/stargazers", + "contributors_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contributors", + "subscribers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscribers", + "subscription_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscription", + "commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/{+path}", + "compare_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/merges", + "archive_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/downloads", + "issues_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues{/number}", + "pulls_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/pulls{/number}", + "milestones_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/milestones{/number}", + "notifications_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/labels{/name}", + "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", + "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", + "created_at": "2015-08-15T14:14:57Z", + "updated_at": "2019-11-26T01:09:49Z", + "pushed_at": "2019-11-26T01:09:48Z", + "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", + "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", + "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", + "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", + "homepage": null, + "size": 45, + "stargazers_count": 1, + "watchers_count": 1, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 41, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 41, + "open_issues": 0, + "watchers": 1, + "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": 19653852, + "node_id": "MDEwOlJlcG9zaXRvcnkxOTY1Mzg1Mg==", + "name": "GHContentIntegrationTest", + "full_name": "kohsuke2/GHContentIntegrationTest", + "private": false, + "owner": { + "login": "kohsuke2", + "id": 1329242, + "node_id": "MDQ6VXNlcjEzMjkyNDI=", + "avatar_url": "https://avatars2.githubusercontent.com/u/1329242?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/kohsuke2", + "html_url": "https://github.com/kohsuke2", + "followers_url": "https://api.github.com/users/kohsuke2/followers", + "following_url": "https://api.github.com/users/kohsuke2/following{/other_user}", + "gists_url": "https://api.github.com/users/kohsuke2/gists{/gist_id}", + "starred_url": "https://api.github.com/users/kohsuke2/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/kohsuke2/subscriptions", + "organizations_url": "https://api.github.com/users/kohsuke2/orgs", + "repos_url": "https://api.github.com/users/kohsuke2/repos", + "events_url": "https://api.github.com/users/kohsuke2/events{/privacy}", + "received_events_url": "https://api.github.com/users/kohsuke2/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/kohsuke2/GHContentIntegrationTest", + "description": "Repository used for integration test of github-api", + "fork": true, + "url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest", + "forks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/forks", + "keys_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/teams", + "hooks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/hooks", + "issue_events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/events{/number}", + "events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/events", + "assignees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/assignees{/user}", + "branches_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/branches{/branch}", + "tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/tags", + "blobs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/statuses/{sha}", + "languages_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/languages", + "stargazers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/stargazers", + "contributors_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contributors", + "subscribers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscribers", + "subscription_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscription", + "commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contents/{+path}", + "compare_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/merges", + "archive_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/downloads", + "issues_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues{/number}", + "pulls_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/pulls{/number}", + "milestones_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/milestones{/number}", + "notifications_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/labels{/name}", + "releases_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/releases{/id}", + "deployments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/deployments", + "created_at": "2014-05-10T22:50:30Z", + "updated_at": "2018-11-07T15:36:19Z", + "pushed_at": "2018-11-07T15:36:18Z", + "git_url": "git://github.com/kohsuke2/GHContentIntegrationTest.git", + "ssh_url": "git@github.com:kohsuke2/GHContentIntegrationTest.git", + "clone_url": "https://github.com/kohsuke2/GHContentIntegrationTest.git", + "svn_url": "https://github.com/kohsuke2/GHContentIntegrationTest", + "homepage": null, + "size": 111, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 1, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 1, + "open_issues": 0, + "watchers": 0, + "default_branch": "master" + }, + "source": { + "id": 14779458, + "node_id": "MDEwOlJlcG9zaXRvcnkxNDc3OTQ1OA==", + "name": "github-api-test-1", + "full_name": "farmdawgnation/github-api-test-1", + "private": false, + "owner": { + "login": "farmdawgnation", + "id": 620189, + "node_id": "MDQ6VXNlcjYyMDE4OQ==", + "avatar_url": "https://avatars2.githubusercontent.com/u/620189?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/farmdawgnation", + "html_url": "https://github.com/farmdawgnation", + "followers_url": "https://api.github.com/users/farmdawgnation/followers", + "following_url": "https://api.github.com/users/farmdawgnation/following{/other_user}", + "gists_url": "https://api.github.com/users/farmdawgnation/gists{/gist_id}", + "starred_url": "https://api.github.com/users/farmdawgnation/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/farmdawgnation/subscriptions", + "organizations_url": "https://api.github.com/users/farmdawgnation/orgs", + "repos_url": "https://api.github.com/users/farmdawgnation/repos", + "events_url": "https://api.github.com/users/farmdawgnation/events{/privacy}", + "received_events_url": "https://api.github.com/users/farmdawgnation/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/farmdawgnation/github-api-test-1", + "description": "Repository used for integration test of github-api", + "fork": false, + "url": "https://api.github.com/repos/farmdawgnation/github-api-test-1", + "forks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/forks", + "keys_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/teams", + "hooks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/hooks", + "issue_events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/events{/number}", + "events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/events", + "assignees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/assignees{/user}", + "branches_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/branches{/branch}", + "tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/tags", + "blobs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/statuses/{sha}", + "languages_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/languages", + "stargazers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/stargazers", + "contributors_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contributors", + "subscribers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscribers", + "subscription_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscription", + "commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contents/{+path}", + "compare_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/merges", + "archive_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/downloads", + "issues_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues{/number}", + "pulls_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/pulls{/number}", + "milestones_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/milestones{/number}", + "notifications_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/labels{/name}", + "releases_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/releases{/id}", + "deployments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/deployments", + "created_at": "2013-11-28T14:46:38Z", + "updated_at": "2016-02-05T13:33:23Z", + "pushed_at": "2013-11-28T14:55:36Z", + "git_url": "git://github.com/farmdawgnation/github-api-test-1.git", + "ssh_url": "git@github.com:farmdawgnation/github-api-test-1.git", + "clone_url": "https://github.com/farmdawgnation/github-api-test-1.git", + "svn_url": "https://github.com/farmdawgnation/github-api-test-1", + "homepage": null, + "size": 89, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 60, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 60, + "open_issues": 0, + "watchers": 0, + "default_branch": "master" + }, + "network_count": 60, + "subscribers_count": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json new file mode 100644 index 0000000000..16577a96d7 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json @@ -0,0 +1,312 @@ +{ + "id": 40763577, + "node_id": "MDEwOlJlcG9zaXRvcnk0MDc2MzU3Nw==", + "name": "GHContentIntegrationTest", + "full_name": "github-api-test-org/GHContentIntegrationTest", + "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/GHContentIntegrationTest", + "description": "Repository used for integration test of github-api", + "fork": true, + "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest", + "forks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/forks", + "keys_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/teams", + "hooks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/hooks", + "issue_events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/events{/number}", + "events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/events", + "assignees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/assignees{/user}", + "branches_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/branches{/branch}", + "tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/tags", + "blobs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/statuses/{sha}", + "languages_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/languages", + "stargazers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/stargazers", + "contributors_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contributors", + "subscribers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscribers", + "subscription_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscription", + "commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/{+path}", + "compare_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/merges", + "archive_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/downloads", + "issues_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues{/number}", + "pulls_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/pulls{/number}", + "milestones_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/milestones{/number}", + "notifications_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/labels{/name}", + "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", + "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", + "created_at": "2015-08-15T14:14:57Z", + "updated_at": "2019-11-26T01:09:49Z", + "pushed_at": "2019-11-26T01:09:48Z", + "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", + "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", + "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", + "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", + "homepage": null, + "size": 45, + "stargazers_count": 1, + "watchers_count": 1, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 41, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 41, + "open_issues": 0, + "watchers": 1, + "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": 19653852, + "node_id": "MDEwOlJlcG9zaXRvcnkxOTY1Mzg1Mg==", + "name": "GHContentIntegrationTest", + "full_name": "kohsuke2/GHContentIntegrationTest", + "private": false, + "owner": { + "login": "kohsuke2", + "id": 1329242, + "node_id": "MDQ6VXNlcjEzMjkyNDI=", + "avatar_url": "https://avatars2.githubusercontent.com/u/1329242?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/kohsuke2", + "html_url": "https://github.com/kohsuke2", + "followers_url": "https://api.github.com/users/kohsuke2/followers", + "following_url": "https://api.github.com/users/kohsuke2/following{/other_user}", + "gists_url": "https://api.github.com/users/kohsuke2/gists{/gist_id}", + "starred_url": "https://api.github.com/users/kohsuke2/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/kohsuke2/subscriptions", + "organizations_url": "https://api.github.com/users/kohsuke2/orgs", + "repos_url": "https://api.github.com/users/kohsuke2/repos", + "events_url": "https://api.github.com/users/kohsuke2/events{/privacy}", + "received_events_url": "https://api.github.com/users/kohsuke2/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/kohsuke2/GHContentIntegrationTest", + "description": "Repository used for integration test of github-api", + "fork": true, + "url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest", + "forks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/forks", + "keys_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/teams", + "hooks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/hooks", + "issue_events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/events{/number}", + "events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/events", + "assignees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/assignees{/user}", + "branches_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/branches{/branch}", + "tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/tags", + "blobs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/statuses/{sha}", + "languages_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/languages", + "stargazers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/stargazers", + "contributors_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contributors", + "subscribers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscribers", + "subscription_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscription", + "commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contents/{+path}", + "compare_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/merges", + "archive_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/downloads", + "issues_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues{/number}", + "pulls_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/pulls{/number}", + "milestones_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/milestones{/number}", + "notifications_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/labels{/name}", + "releases_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/releases{/id}", + "deployments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/deployments", + "created_at": "2014-05-10T22:50:30Z", + "updated_at": "2018-11-07T15:36:19Z", + "pushed_at": "2018-11-07T15:36:18Z", + "git_url": "git://github.com/kohsuke2/GHContentIntegrationTest.git", + "ssh_url": "git@github.com:kohsuke2/GHContentIntegrationTest.git", + "clone_url": "https://github.com/kohsuke2/GHContentIntegrationTest.git", + "svn_url": "https://github.com/kohsuke2/GHContentIntegrationTest", + "homepage": null, + "size": 111, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 1, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 1, + "open_issues": 0, + "watchers": 0, + "default_branch": "master" + }, + "source": { + "id": 14779458, + "node_id": "MDEwOlJlcG9zaXRvcnkxNDc3OTQ1OA==", + "name": "github-api-test-1", + "full_name": "farmdawgnation/github-api-test-1", + "private": false, + "owner": { + "login": "farmdawgnation", + "id": 620189, + "node_id": "MDQ6VXNlcjYyMDE4OQ==", + "avatar_url": "https://avatars2.githubusercontent.com/u/620189?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/farmdawgnation", + "html_url": "https://github.com/farmdawgnation", + "followers_url": "https://api.github.com/users/farmdawgnation/followers", + "following_url": "https://api.github.com/users/farmdawgnation/following{/other_user}", + "gists_url": "https://api.github.com/users/farmdawgnation/gists{/gist_id}", + "starred_url": "https://api.github.com/users/farmdawgnation/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/farmdawgnation/subscriptions", + "organizations_url": "https://api.github.com/users/farmdawgnation/orgs", + "repos_url": "https://api.github.com/users/farmdawgnation/repos", + "events_url": "https://api.github.com/users/farmdawgnation/events{/privacy}", + "received_events_url": "https://api.github.com/users/farmdawgnation/received_events", + "type": "User", + "site_admin": false + }, + "html_url": "https://github.com/farmdawgnation/github-api-test-1", + "description": "Repository used for integration test of github-api", + "fork": false, + "url": "https://api.github.com/repos/farmdawgnation/github-api-test-1", + "forks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/forks", + "keys_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/keys{/key_id}", + "collaborators_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/collaborators{/collaborator}", + "teams_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/teams", + "hooks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/hooks", + "issue_events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/events{/number}", + "events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/events", + "assignees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/assignees{/user}", + "branches_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/branches{/branch}", + "tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/tags", + "blobs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/blobs{/sha}", + "git_tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/tags{/sha}", + "git_refs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/refs{/sha}", + "trees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/trees{/sha}", + "statuses_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/statuses/{sha}", + "languages_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/languages", + "stargazers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/stargazers", + "contributors_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contributors", + "subscribers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscribers", + "subscription_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscription", + "commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/commits{/sha}", + "git_commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/commits{/sha}", + "comments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/comments{/number}", + "issue_comment_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/comments{/number}", + "contents_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contents/{+path}", + "compare_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/compare/{base}...{head}", + "merges_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/merges", + "archive_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/{archive_format}{/ref}", + "downloads_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/downloads", + "issues_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues{/number}", + "pulls_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/pulls{/number}", + "milestones_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/milestones{/number}", + "notifications_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/notifications{?since,all,participating}", + "labels_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/labels{/name}", + "releases_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/releases{/id}", + "deployments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/deployments", + "created_at": "2013-11-28T14:46:38Z", + "updated_at": "2016-02-05T13:33:23Z", + "pushed_at": "2013-11-28T14:55:36Z", + "git_url": "git://github.com/farmdawgnation/github-api-test-1.git", + "ssh_url": "git@github.com:farmdawgnation/github-api-test-1.git", + "clone_url": "https://github.com/farmdawgnation/github-api-test-1.git", + "svn_url": "https://github.com/farmdawgnation/github-api-test-1", + "homepage": null, + "size": 89, + "stargazers_count": 0, + "watchers_count": 0, + "language": null, + "has_issues": false, + "has_projects": true, + "has_downloads": true, + "has_wiki": true, + "has_pages": false, + "forks_count": 60, + "mirror_url": null, + "archived": false, + "disabled": false, + "open_issues_count": 0, + "license": null, + "forks": 60, + "open_issues": 0, + "watchers": 0, + "default_branch": "master" + }, + "network_count": 60, + "subscribers_count": 1 +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f.json deleted file mode 100644 index 819dcde4e7..0000000000 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "id": 40763577, - "node_id": "MDEwOlJlcG9zaXRvcnk0MDc2MzU3Nw==", - "name": "GHContentIntegrationTest", - "full_name": "github-api-test-org/GHContentIntegrationTest", - "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/GHContentIntegrationTest", - "description": "Repository used for integration test of github-api", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest", - "forks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", - "created_at": "2015-08-15T14:14:57Z", - "updated_at": "2019-10-11T22:17:44Z", - "pushed_at": "2019-10-11T22:17:45Z", - "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", - "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", - "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", - "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", - "homepage": null, - "size": 38, - "stargazers_count": 1, - "watchers_count": 1, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 40, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": null, - "forks": 40, - "open_issues": 0, - "watchers": 1, - "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": 19653852, - "node_id": "MDEwOlJlcG9zaXRvcnkxOTY1Mzg1Mg==", - "name": "GHContentIntegrationTest", - "full_name": "kohsuke2/GHContentIntegrationTest", - "private": false, - "owner": { - "login": "kohsuke2", - "id": 1329242, - "node_id": "MDQ6VXNlcjEzMjkyNDI=", - "avatar_url": "https://avatars2.githubusercontent.com/u/1329242?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/kohsuke2", - "html_url": "https://github.com/kohsuke2", - "followers_url": "https://api.github.com/users/kohsuke2/followers", - "following_url": "https://api.github.com/users/kohsuke2/following{/other_user}", - "gists_url": "https://api.github.com/users/kohsuke2/gists{/gist_id}", - "starred_url": "https://api.github.com/users/kohsuke2/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/kohsuke2/subscriptions", - "organizations_url": "https://api.github.com/users/kohsuke2/orgs", - "repos_url": "https://api.github.com/users/kohsuke2/repos", - "events_url": "https://api.github.com/users/kohsuke2/events{/privacy}", - "received_events_url": "https://api.github.com/users/kohsuke2/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/kohsuke2/GHContentIntegrationTest", - "description": "Repository used for integration test of github-api", - "fork": true, - "url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest", - "forks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/forks", - "keys_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/teams", - "hooks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/hooks", - "issue_events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/events{/number}", - "events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/events", - "assignees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/assignees{/user}", - "branches_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/branches{/branch}", - "tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/tags", - "blobs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/statuses/{sha}", - "languages_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/languages", - "stargazers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/stargazers", - "contributors_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contributors", - "subscribers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscribers", - "subscription_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscription", - "commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contents/{+path}", - "compare_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/merges", - "archive_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/downloads", - "issues_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues{/number}", - "pulls_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/pulls{/number}", - "milestones_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/milestones{/number}", - "notifications_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/labels{/name}", - "releases_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/releases{/id}", - "deployments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/deployments", - "created_at": "2014-05-10T22:50:30Z", - "updated_at": "2018-11-07T15:36:19Z", - "pushed_at": "2018-11-07T15:36:18Z", - "git_url": "git://github.com/kohsuke2/GHContentIntegrationTest.git", - "ssh_url": "git@github.com:kohsuke2/GHContentIntegrationTest.git", - "clone_url": "https://github.com/kohsuke2/GHContentIntegrationTest.git", - "svn_url": "https://github.com/kohsuke2/GHContentIntegrationTest", - "homepage": null, - "size": 111, - "stargazers_count": 0, - "watchers_count": 0, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 1, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": null, - "forks": 1, - "open_issues": 0, - "watchers": 0, - "default_branch": "master" - }, - "source": { - "id": 14779458, - "node_id": "MDEwOlJlcG9zaXRvcnkxNDc3OTQ1OA==", - "name": "github-api-test-1", - "full_name": "farmdawgnation/github-api-test-1", - "private": false, - "owner": { - "login": "farmdawgnation", - "id": 620189, - "node_id": "MDQ6VXNlcjYyMDE4OQ==", - "avatar_url": "https://avatars2.githubusercontent.com/u/620189?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/farmdawgnation", - "html_url": "https://github.com/farmdawgnation", - "followers_url": "https://api.github.com/users/farmdawgnation/followers", - "following_url": "https://api.github.com/users/farmdawgnation/following{/other_user}", - "gists_url": "https://api.github.com/users/farmdawgnation/gists{/gist_id}", - "starred_url": "https://api.github.com/users/farmdawgnation/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/farmdawgnation/subscriptions", - "organizations_url": "https://api.github.com/users/farmdawgnation/orgs", - "repos_url": "https://api.github.com/users/farmdawgnation/repos", - "events_url": "https://api.github.com/users/farmdawgnation/events{/privacy}", - "received_events_url": "https://api.github.com/users/farmdawgnation/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/farmdawgnation/github-api-test-1", - "description": "Repository used for integration test of github-api", - "fork": false, - "url": "https://api.github.com/repos/farmdawgnation/github-api-test-1", - "forks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/forks", - "keys_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/teams", - "hooks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/hooks", - "issue_events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/events{/number}", - "events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/events", - "assignees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/assignees{/user}", - "branches_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/branches{/branch}", - "tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/tags", - "blobs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/statuses/{sha}", - "languages_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/languages", - "stargazers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/stargazers", - "contributors_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contributors", - "subscribers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscribers", - "subscription_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscription", - "commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contents/{+path}", - "compare_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/merges", - "archive_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/downloads", - "issues_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues{/number}", - "pulls_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/pulls{/number}", - "milestones_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/milestones{/number}", - "notifications_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/labels{/name}", - "releases_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/releases{/id}", - "deployments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/deployments", - "created_at": "2013-11-28T14:46:38Z", - "updated_at": "2016-02-05T13:33:23Z", - "pushed_at": "2013-11-28T14:55:36Z", - "git_url": "git://github.com/farmdawgnation/github-api-test-1.git", - "ssh_url": "git@github.com:farmdawgnation/github-api-test-1.git", - "clone_url": "https://github.com/farmdawgnation/github-api-test-1.git", - "svn_url": "https://github.com/farmdawgnation/github-api-test-1", - "homepage": null, - "size": 89, - "stargazers_count": 0, - "watchers_count": 0, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 59, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": null, - "forks": 59, - "open_issues": 0, - "watchers": 0, - "default_branch": "master" - }, - "network_count": 59, - "subscribers_count": 1 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-fbcbe20f-df3f-4011-9340-bb9be7b2c36e.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-fbcbe20f-df3f-4011-9340-bb9be7b2c36e.json deleted file mode 100644 index 819dcde4e7..0000000000 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-fbcbe20f-df3f-4011-9340-bb9be7b2c36e.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "id": 40763577, - "node_id": "MDEwOlJlcG9zaXRvcnk0MDc2MzU3Nw==", - "name": "GHContentIntegrationTest", - "full_name": "github-api-test-org/GHContentIntegrationTest", - "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/GHContentIntegrationTest", - "description": "Repository used for integration test of github-api", - "fork": true, - "url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest", - "forks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/forks", - "keys_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/teams", - "hooks_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/hooks", - "issue_events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/events{/number}", - "events_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/events", - "assignees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/assignees{/user}", - "branches_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/branches{/branch}", - "tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/tags", - "blobs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/statuses/{sha}", - "languages_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/languages", - "stargazers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/stargazers", - "contributors_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contributors", - "subscribers_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscribers", - "subscription_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/subscription", - "commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/contents/{+path}", - "compare_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/merges", - "archive_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/downloads", - "issues_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/issues{/number}", - "pulls_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/pulls{/number}", - "milestones_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/milestones{/number}", - "notifications_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/labels{/name}", - "releases_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/releases{/id}", - "deployments_url": "https://api.github.com/repos/github-api-test-org/GHContentIntegrationTest/deployments", - "created_at": "2015-08-15T14:14:57Z", - "updated_at": "2019-10-11T22:17:44Z", - "pushed_at": "2019-10-11T22:17:45Z", - "git_url": "git://github.com/github-api-test-org/GHContentIntegrationTest.git", - "ssh_url": "git@github.com:github-api-test-org/GHContentIntegrationTest.git", - "clone_url": "https://github.com/github-api-test-org/GHContentIntegrationTest.git", - "svn_url": "https://github.com/github-api-test-org/GHContentIntegrationTest", - "homepage": null, - "size": 38, - "stargazers_count": 1, - "watchers_count": 1, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 40, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": null, - "forks": 40, - "open_issues": 0, - "watchers": 1, - "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": 19653852, - "node_id": "MDEwOlJlcG9zaXRvcnkxOTY1Mzg1Mg==", - "name": "GHContentIntegrationTest", - "full_name": "kohsuke2/GHContentIntegrationTest", - "private": false, - "owner": { - "login": "kohsuke2", - "id": 1329242, - "node_id": "MDQ6VXNlcjEzMjkyNDI=", - "avatar_url": "https://avatars2.githubusercontent.com/u/1329242?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/kohsuke2", - "html_url": "https://github.com/kohsuke2", - "followers_url": "https://api.github.com/users/kohsuke2/followers", - "following_url": "https://api.github.com/users/kohsuke2/following{/other_user}", - "gists_url": "https://api.github.com/users/kohsuke2/gists{/gist_id}", - "starred_url": "https://api.github.com/users/kohsuke2/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/kohsuke2/subscriptions", - "organizations_url": "https://api.github.com/users/kohsuke2/orgs", - "repos_url": "https://api.github.com/users/kohsuke2/repos", - "events_url": "https://api.github.com/users/kohsuke2/events{/privacy}", - "received_events_url": "https://api.github.com/users/kohsuke2/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/kohsuke2/GHContentIntegrationTest", - "description": "Repository used for integration test of github-api", - "fork": true, - "url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest", - "forks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/forks", - "keys_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/teams", - "hooks_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/hooks", - "issue_events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/events{/number}", - "events_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/events", - "assignees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/assignees{/user}", - "branches_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/branches{/branch}", - "tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/tags", - "blobs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/statuses/{sha}", - "languages_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/languages", - "stargazers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/stargazers", - "contributors_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contributors", - "subscribers_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscribers", - "subscription_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/subscription", - "commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/contents/{+path}", - "compare_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/merges", - "archive_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/downloads", - "issues_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/issues{/number}", - "pulls_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/pulls{/number}", - "milestones_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/milestones{/number}", - "notifications_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/labels{/name}", - "releases_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/releases{/id}", - "deployments_url": "https://api.github.com/repos/kohsuke2/GHContentIntegrationTest/deployments", - "created_at": "2014-05-10T22:50:30Z", - "updated_at": "2018-11-07T15:36:19Z", - "pushed_at": "2018-11-07T15:36:18Z", - "git_url": "git://github.com/kohsuke2/GHContentIntegrationTest.git", - "ssh_url": "git@github.com:kohsuke2/GHContentIntegrationTest.git", - "clone_url": "https://github.com/kohsuke2/GHContentIntegrationTest.git", - "svn_url": "https://github.com/kohsuke2/GHContentIntegrationTest", - "homepage": null, - "size": 111, - "stargazers_count": 0, - "watchers_count": 0, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 1, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": null, - "forks": 1, - "open_issues": 0, - "watchers": 0, - "default_branch": "master" - }, - "source": { - "id": 14779458, - "node_id": "MDEwOlJlcG9zaXRvcnkxNDc3OTQ1OA==", - "name": "github-api-test-1", - "full_name": "farmdawgnation/github-api-test-1", - "private": false, - "owner": { - "login": "farmdawgnation", - "id": 620189, - "node_id": "MDQ6VXNlcjYyMDE4OQ==", - "avatar_url": "https://avatars2.githubusercontent.com/u/620189?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/farmdawgnation", - "html_url": "https://github.com/farmdawgnation", - "followers_url": "https://api.github.com/users/farmdawgnation/followers", - "following_url": "https://api.github.com/users/farmdawgnation/following{/other_user}", - "gists_url": "https://api.github.com/users/farmdawgnation/gists{/gist_id}", - "starred_url": "https://api.github.com/users/farmdawgnation/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/farmdawgnation/subscriptions", - "organizations_url": "https://api.github.com/users/farmdawgnation/orgs", - "repos_url": "https://api.github.com/users/farmdawgnation/repos", - "events_url": "https://api.github.com/users/farmdawgnation/events{/privacy}", - "received_events_url": "https://api.github.com/users/farmdawgnation/received_events", - "type": "User", - "site_admin": false - }, - "html_url": "https://github.com/farmdawgnation/github-api-test-1", - "description": "Repository used for integration test of github-api", - "fork": false, - "url": "https://api.github.com/repos/farmdawgnation/github-api-test-1", - "forks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/forks", - "keys_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/teams", - "hooks_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/hooks", - "issue_events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/events{/number}", - "events_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/events", - "assignees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/assignees{/user}", - "branches_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/branches{/branch}", - "tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/tags", - "blobs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/statuses/{sha}", - "languages_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/languages", - "stargazers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/stargazers", - "contributors_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contributors", - "subscribers_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscribers", - "subscription_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/subscription", - "commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/contents/{+path}", - "compare_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/merges", - "archive_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/downloads", - "issues_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/issues{/number}", - "pulls_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/pulls{/number}", - "milestones_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/milestones{/number}", - "notifications_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/labels{/name}", - "releases_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/releases{/id}", - "deployments_url": "https://api.github.com/repos/farmdawgnation/github-api-test-1/deployments", - "created_at": "2013-11-28T14:46:38Z", - "updated_at": "2016-02-05T13:33:23Z", - "pushed_at": "2013-11-28T14:55:36Z", - "git_url": "git://github.com/farmdawgnation/github-api-test-1.git", - "ssh_url": "git@github.com:farmdawgnation/github-api-test-1.git", - "clone_url": "https://github.com/farmdawgnation/github-api-test-1.git", - "svn_url": "https://github.com/farmdawgnation/github-api-test-1", - "homepage": null, - "size": 89, - "stargazers_count": 0, - "watchers_count": 0, - "language": null, - "has_issues": false, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 59, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 0, - "license": null, - "forks": 59, - "open_issues": 0, - "watchers": 0, - "default_branch": "master" - }, - "network_count": 59, - "subscribers_count": 1 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-cf14dc4b-72ea-4159-bc7a-4d10a2ebb43e.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-cf14dc4b-72ea-4159-bc7a-4d10a2ebb43e.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-59f0edb6-895f-402d-946f-77e7511a9a27.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-59f0edb6-895f-402d-946f-77e7511a9a27.json new file mode 100644 index 0000000000..37691dd3c0 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-59f0edb6-895f-402d-946f-77e7511a9a27.json @@ -0,0 +1,45 @@ +{ + "login": "bitwiseman", + "id": 1958953, + "node_id": "MDQ6VXNlcjE5NTg5NTM=", + "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bitwiseman", + "html_url": "https://github.com/bitwiseman", + "followers_url": "https://api.github.com/users/bitwiseman/followers", + "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", + "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", + "organizations_url": "https://api.github.com/users/bitwiseman/orgs", + "repos_url": "https://api.github.com/users/bitwiseman/repos", + "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", + "received_events_url": "https://api.github.com/users/bitwiseman/received_events", + "type": "User", + "site_admin": false, + "name": "Liam Newman", + "company": "Cloudbees, Inc.", + "blog": "", + "location": "Seattle, WA, USA", + "email": "bitwiseman@gmail.com", + "hireable": null, + "bio": "https://twitter.com/bitwiseman", + "public_repos": 176, + "public_gists": 7, + "followers": 141, + "following": 9, + "created_at": "2012-07-11T20:38:33Z", + "updated_at": "2019-09-24T19:32:29Z", + "private_gists": 7, + "total_private_repos": 10, + "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/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-8aeceae0-b015-47cc-9b83-17411b8d4bbd.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-8aeceae0-b015-47cc-9b83-17411b8d4bbd.json deleted file mode 100644 index 760bd7fb8a..0000000000 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-8aeceae0-b015-47cc-9b83-17411b8d4bbd.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "login": "bitwiseman", - "id": 1958953, - "node_id": "MDQ6VXNlcjE5NTg5NTM=", - "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/bitwiseman", - "html_url": "https://github.com/bitwiseman", - "followers_url": "https://api.github.com/users/bitwiseman/followers", - "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}", - "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}", - "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions", - "organizations_url": "https://api.github.com/users/bitwiseman/orgs", - "repos_url": "https://api.github.com/users/bitwiseman/repos", - "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}", - "received_events_url": "https://api.github.com/users/bitwiseman/received_events", - "type": "User", - "site_admin": false, - "name": "Liam Newman", - "company": "Cloudbees, Inc.", - "blog": "", - "location": "Seattle, WA, USA", - "email": "bitwiseman@gmail.com", - "hireable": null, - "bio": "https://twitter.com/bitwiseman", - "public_repos": 168, - "public_gists": 5, - "followers": 138, - "following": 9, - "created_at": "2012-07-11T20:38:33Z", - "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/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-fbcbe2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-fbcbe2.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json index a1d9141a9d..05e1c8ac22 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-fbcbe2.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json @@ -1,5 +1,5 @@ { - "id": "fbcbe20f-df3f-4011-9340-bb9be7b2c36e", + "id": "788adbe0-455b-4ba5-b05e-f485ea1874a7", "name": "repos_github-api-test-org_ghcontentintegrationtest", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-fbcbe20f-df3f-4011-9340-bb9be7b2c36e.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:46 GMT", + "Date": "Tue, 26 Nov 2019 01:09:50 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4681", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4906", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"81a0a47733535ab0417cce462ddb54d6\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:44 GMT", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"4e6f5ec425012ce415fba01219503e19\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "unknown, github.v3", @@ -31,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": "C0F9:5709:1995AA:2FA20A:5DA0FF8A" + "X-GitHub-Request-Id": "EEB0:9734:178F:1EB8:5DDC7B5D" } }, - "uuid": "fbcbe20f-df3f-4011-9340-bb9be7b2c36e", + "uuid": "788adbe0-455b-4ba5-b05e-f485ea1874a7", "persistent": true, "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest", "requiredScenarioState": "Started", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-a90820.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-a90820.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json index 6643f82624..c966c1af67 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-a90820.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json @@ -1,5 +1,5 @@ { - "id": "a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f", + "id": "54fda8c5-462b-477f-be65-918b40f75fa5", "name": "repos_github-api-test-org_ghcontentintegrationtest", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:47 GMT", + "Date": "Tue, 26 Nov 2019 01:09:51 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4680", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4905", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"81a0a47733535ab0417cce462ddb54d6\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:44 GMT", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"4e6f5ec425012ce415fba01219503e19\"", + "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "unknown, github.v3", @@ -31,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": "C0F9:5709:1995BD:2FA293:5DA0FF8A" + "X-GitHub-Request-Id": "EEB0:9734:179A:1EDE:5DDC7B5E" } }, - "uuid": "a9082058-4cee-4bf3-8d5f-c1b7d7ca1f0f", + "uuid": "54fda8c5-462b-477f-be65-918b40f75fa5", "persistent": true, "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest", "requiredScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-2", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-cf14dc.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json similarity index 74% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-cf14dc.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json index bddc7150ba..8f48026f55 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-cf14dc.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json @@ -1,5 +1,5 @@ { - "id": "cf14dc4b-72ea-4159-bc7a-4d10a2ebb43e", + "id": "3e4aa25e-6949-43de-b9e8-bafb84e4b2a5", "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content", "request": { "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/ghcontent-ro/a-file-with-content", @@ -7,19 +7,22 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-cf14dc4b-72ea-4159-bc7a-4d10a2ebb43e.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:47 GMT", + "Date": "Tue, 26 Nov 2019 01:09:51 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4679", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4904", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], "ETag": "W/\"901fd87750a8e53fe39a219cad50d4f7c80ca272\"", - "Last-Modified": "Fri, 11 Oct 2019 22:17:44 GMT", + "Last-Modified": "Tue, 26 Nov 2019 01:09: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": "", "X-GitHub-Media-Type": "unknown, github.v3", @@ -31,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": "C0F9:5709:1995E5:2FA2CC:5DA0FF8B" + "X-GitHub-Request-Id": "EEB0:9734:17A0:1EEA:5DDC7B5F" } }, - "uuid": "cf14dc4b-72ea-4159-bc7a-4d10a2ebb43e", + "uuid": "3e4aa25e-6949-43de-b9e8-bafb84e4b2a5", "persistent": true, "insertionIndex": 4 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-c9f376.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json similarity index 71% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-c9f376.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json index 1cd6ddcf17..bf4d337635 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-c9f376.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json @@ -1,5 +1,5 @@ { - "id": "c9f376fa-4819-4dc7-bc79-43cabec4276f", + "id": "59f0edb6-895f-402d-946f-77e7511a9a27", "name": "user", "request": { "url": "/user", @@ -7,18 +7,21 @@ }, "response": { "status": 200, - "bodyFileName": "user-c9f376fa-4819-4dc7-bc79-43cabec4276f.json", + "bodyFileName": "user-59f0edb6-895f-402d-946f-77e7511a9a27.json", "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:41 GMT", + "Date": "Tue, 26 Nov 2019 01:09:49 GMT", "Content-Type": "application/json; charset=utf-8", + "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4697", - "X-RateLimit-Reset": "1570835121", + "X-RateLimit-Remaining": "4910", + "X-RateLimit-Reset": "1574734142", "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"42eed4772a65221c408dcbe210034076\"", + "Vary": [ + "Accept, Authorization, Cookie, X-GitHub-OTP", + "Accept-Encoding" + ], + "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"", "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": "", @@ -31,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": "C0F4:34C4:13C437:28F99B:5DA0FF85" + "X-GitHub-Request-Id": "EEB0:9734:1774:1EB2:5DDC7B5D" } }, - "uuid": "c9f376fa-4819-4dc7-bc79-43cabec4276f", + "uuid": "59f0edb6-895f-402d-946f-77e7511a9a27", "persistent": true, "insertionIndex": 1 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-8aecea.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-8aecea.json deleted file mode 100644 index 4dc6bc2737..0000000000 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-8aecea.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "id": "8aeceae0-b015-47cc-9b83-17411b8d4bbd", - "name": "user", - "request": { - "url": "/user", - "method": "GET" - }, - "response": { - "status": 200, - "bodyFileName": "user-8aeceae0-b015-47cc-9b83-17411b8d4bbd.json", - "headers": { - "Server": "GitHub.com", - "Date": "Fri, 11 Oct 2019 22:17:46 GMT", - "Content-Type": "application/json; charset=utf-8", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4685", - "X-RateLimit-Reset": "1570835121", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", - "ETag": "W/\"42eed4772a65221c408dcbe210034076\"", - "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", - "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": "C0F9:5709:199567:2FA1F1:5DA0FF89" - } - }, - "uuid": "8aeceae0-b015-47cc-9b83-17411b8d4bbd", - "persistent": true, - "insertionIndex": 1 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json index 1b0d5a595e..858f3e25d8 100644 --- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json +++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json @@ -2,7 +2,7 @@ "id": "b14df6ec-ff32-4838-8b38-934766abd880", "name": "repos_github-api-test-org_github-api_branches_test_nonexistent", "request": { - "url": "/repos/github-api-test-org/github-api/branches/test%2FNonExistent", + "url": "/repos/github-api-test-org/github-api/branches/test/NonExistent", "method": "GET" }, "response": { diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json index fd3245a1c7..e554ef80f2 100644 --- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json +++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json @@ -2,7 +2,7 @@ "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87", "name": "repos_github-api-test-org_github-api_branches_test_urlencode", "request": { - "url": "/repos/github-api-test-org/github-api/branches/test%2F%23UrlEncode", + "url": "/repos/github-api-test-org/github-api/branches/test/%23UrlEncode", "method": "GET" }, "response": {