From 450261abbfce832ab1a4142c3b972d47652b8826 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Sat, 31 Aug 2019 19:52:50 -0700 Subject: [PATCH] Move scenario to json files --- .../java/org/kohsuke/github/GistTest.java | 26 ------------ .../__files/body-gists-9903708-unstarred.json | 1 - .../mapping-gists-9903708-star-O6pK0.json | 37 ++++++++++++++++ .../mapping-gists-9903708-star-RRWgS.json | 39 +++++++++++++++++ .../mapping-gists-9903708-star-WbOVn.json | 42 +++++++++++++++++++ ...mapping-gists-9903708-star-unstarred.json} | 4 +- 6 files changed, 121 insertions(+), 28 deletions(-) delete mode 100644 src/test/resources/org/kohsuke/github/GistTest/api/__files/body-gists-9903708-unstarred.json create mode 100644 src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-O6pK0.json create mode 100644 src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-RRWgS.json create mode 100644 src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-WbOVn.json rename src/test/resources/org/kohsuke/github/GistTest/api/mappings/{mapping-gists-9903708-unstarred.json => mapping-gists-9903708-star-unstarred.json} (93%) diff --git a/src/test/java/org/kohsuke/github/GistTest.java b/src/test/java/org/kohsuke/github/GistTest.java index 35a2e6d56..d46f07129 100644 --- a/src/test/java/org/kohsuke/github/GistTest.java +++ b/src/test/java/org/kohsuke/github/GistTest.java @@ -38,32 +38,6 @@ public class GistTest extends AbstractGitHubApiWireMockTest { @Test public void starTest() throws Exception { - - githubApi.stubFor( - put(urlEqualTo("/gists/9903708/star")) - .inScenario("Star Test") - .whenScenarioStateIs(Scenario.STARTED) - .willReturn( - noContent()) - .willSetStateTo("Starred")); - - githubApi.stubFor( - get(urlEqualTo("/gists/9903708/star")) - .inScenario("Star Test") - .whenScenarioStateIs("Starred") - .willReturn( - noContent()) - .willSetStateTo("Starred")); - - githubApi.stubFor( - delete(urlEqualTo("/gists/9903708/star")) - .inScenario("Star Test") - .whenScenarioStateIs("Starred") - .willReturn( - noContent()) - .willSetStateTo("UnStarred")); - - GHGist gist = gitHub.getGist("9903708"); assertEquals("rtyler",gist.getOwner().getLogin()); diff --git a/src/test/resources/org/kohsuke/github/GistTest/api/__files/body-gists-9903708-unstarred.json b/src/test/resources/org/kohsuke/github/GistTest/api/__files/body-gists-9903708-unstarred.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/src/test/resources/org/kohsuke/github/GistTest/api/__files/body-gists-9903708-unstarred.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-O6pK0.json b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-O6pK0.json new file mode 100644 index 000000000..7df345682 --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-O6pK0.json @@ -0,0 +1,37 @@ +{ + "id" : "1c70c95a-e70e-3157-b42e-421eaca2c55e", + "scenarioName": "Star Test", + "requiredScenarioState": "Gist Starred", + "newScenarioState": "Started", + "request" : { + "url" : "/gists/9903708/star", + "method" : "DELETE" + }, + "response" : { + "status" : 204, + "body" : "", + "headers" : { + "Date" : "Sun, 01 Sep 2019 02:41:15 GMT", + "Content-Type" : "application/octet-stream", + "Server" : "GitHub.com", + "Status" : "204 No Content", + "X-RateLimit-Limit" : "5000", + "X-RateLimit-Remaining" : "4997", + "X-RateLimit-Reset" : "1567308919", + "X-OAuth-Scopes" : "gist, notifications, repo", + "X-Accepted-OAuth-Scopes" : "", + "X-GitHub-Media-Type" : "unknown, github.v3", + "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", + "Access-Control-Allow-Origin" : "*", + "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options" : "deny", + "X-Content-Type-Options" : "nosniff", + "X-XSS-Protection" : "1; mode=block", + "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy" : "default-src 'none'", + "Vary" : "Accept-Encoding", + "X-GitHub-Request-Id" : "E77B:467A:1A705CB:1F4E173:5D6B2FCB" + } + }, + "uuid" : "1c70c95a-e70e-3157-b42e-421eaca2c55e" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-RRWgS.json b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-RRWgS.json new file mode 100644 index 000000000..a57e7469a --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-RRWgS.json @@ -0,0 +1,39 @@ +{ + "id" : "2973a1c9-ee7a-3b76-bdc9-fa3130166690", + "scenarioName": "Star Test", + "requiredScenarioState": "Gist Starred", + "request" : { + "url" : "/gists/9903708/star", + "method" : "GET" + }, + "response" : { + "status" : 204, + "body" : "", + "headers" : { + "Date" : "Sun, 01 Sep 2019 02:41:15 GMT", + "Content-Type" : "application/octet-stream", + "Server" : "GitHub.com", + "Status" : "204 No Content", + "X-RateLimit-Limit" : "5000", + "X-RateLimit-Remaining" : "4998", + "X-RateLimit-Reset" : "1567308919", + "Cache-Control" : "private, max-age=60, s-maxage=60", + "Vary" : [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ], + "ETag" : "\"edb05f57c2fc5ae1ea30b0bb50a09f48\"", + "Last-Modified" : "Sun, 01 Sep 2019 02:35:19 GMT", + "X-OAuth-Scopes" : "gist, notifications, repo", + "X-Accepted-OAuth-Scopes" : "", + "X-GitHub-Media-Type" : "unknown, github.v3", + "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", + "Access-Control-Allow-Origin" : "*", + "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options" : "deny", + "X-Content-Type-Options" : "nosniff", + "X-XSS-Protection" : "1; mode=block", + "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy" : "default-src 'none'", + "X-GitHub-Request-Id" : "E77B:467A:1A705C3:1F4E16D:5D6B2FCB" + } + }, + "uuid" : "2973a1c9-ee7a-3b76-bdc9-fa3130166690" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-WbOVn.json b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-WbOVn.json new file mode 100644 index 000000000..0aae5687a --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-WbOVn.json @@ -0,0 +1,42 @@ +{ + "id" : "725fe929-9ea9-355d-bfe9-89f8bf7a9bb2", + "scenarioName": "Star Test", + "requiredScenarioState": "Started", + "newScenarioState": "Gist Starred", + "request" : { + "url" : "/gists/9903708/star", + "method" : "PUT", + "bodyPatterns" : [ { + "equalToJson" : "{}", + "ignoreArrayOrder" : true, + "ignoreExtraElements" : true + } ] + }, + "response" : { + "status" : 204, + "body" : "", + "headers" : { + "Date" : "Sun, 01 Sep 2019 02:35:19 GMT", + "Content-Type" : "application/octet-stream", + "Server" : "GitHub.com", + "Status" : "204 No Content", + "X-RateLimit-Limit" : "5000", + "X-RateLimit-Remaining" : "4999", + "X-RateLimit-Reset" : "1567308919", + "X-OAuth-Scopes" : "gist, notifications, repo", + "X-Accepted-OAuth-Scopes" : "", + "X-GitHub-Media-Type" : "unknown, github.v3", + "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type", + "Access-Control-Allow-Origin" : "*", + "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload", + "X-Frame-Options" : "deny", + "X-Content-Type-Options" : "nosniff", + "X-XSS-Protection" : "1; mode=block", + "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin", + "Content-Security-Policy" : "default-src 'none'", + "Vary" : "Accept-Encoding", + "X-GitHub-Request-Id" : "E74D:9A51:1AEB246:1F93AB5:5D6B2E67" + } + }, + "uuid" : "725fe929-9ea9-355d-bfe9-89f8bf7a9bb2" +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-unstarred.json b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-unstarred.json similarity index 93% rename from src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-unstarred.json rename to src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-unstarred.json index d1df0c78f..b74e39b33 100644 --- a/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-unstarred.json +++ b/src/test/resources/org/kohsuke/github/GistTest/api/mappings/mapping-gists-9903708-star-unstarred.json @@ -1,12 +1,14 @@ { "id" : "ffac033c-525e-3a55-993c-14b629e4ceaf", + "scenarioName": "Star Test", + "requiredScenarioState": "Started", "request" : { "url" : "/gists/9903708/star", "method" : "GET" }, "response" : { "status" : 404, - "bodyFileName" : "body-gists-9903708-unstarred.json", + "body" : "{}", "headers" : { "Date" : "Sat, 31 Aug 2019 07:00:18 GMT", "Content-Type" : "application/json; charset=utf-8",