From 04b553cdecaf7e1c0a8ebcd593b766b6ae3e9660 Mon Sep 17 00:00:00 2001
From: Marco Ferrer <marco.ferrer@offerup.com>
Date: Fri, 2 Oct 2020 17:12:10 -0400
Subject: [PATCH] update deployment status checks

---
 src/test/java/org/kohsuke/github/AppTest.java | 21 ++++++++++++++++---
 ...est-org_github-api-test_deployments-3.json |  4 +++-
 ...est-org_github-api-test_deployments-4.json |  4 +++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java
index 3f86cf735..916920731 100755
--- a/src/test/java/org/kohsuke/github/AppTest.java
+++ b/src/test/java/org/kohsuke/github/AppTest.java
@@ -175,11 +175,16 @@ public class AppTest extends AbstractGitHubWireMockTest {
                 .create();
         assertNotNull(deployment.getCreator());
         assertNotNull(deployment.getId());
-        List<GHDeployment> deployments = repository.listDeployments(null, "master", null, "unittest").toList();
+        List<GHDeployment> deployments = repository
+            .listDeployments(null, "master", null, "unittest")
+            .toList();
         assertNotNull(deployments);
         assertFalse(Iterables.isEmpty(deployments));
         GHDeployment unitTestDeployment = deployments.get(0);
         assertEquals("unittest", unitTestDeployment.getEnvironment());
+        assertEquals("unittest", unitTestDeployment.getOriginalEnvironment());
+        assertEquals(false, unitTestDeployment.isProductionEnvironment());
+        assertEquals(true, unitTestDeployment.isTransientEnvironment());
         assertEquals("master", unitTestDeployment.getRef());
     }
 
@@ -191,14 +196,24 @@ public class AppTest extends AbstractGitHubWireMockTest {
                 .description("question")
                 .payload("{\"user\":\"atmos\",\"room_id\":123456}")
                 .create();
-        GHDeploymentStatus ghDeploymentStatus = deployment.createStatus(GHDeploymentState.SUCCESS)
+        GHDeploymentStatus ghDeploymentStatus = deployment.createStatus(GHDeploymentState.QUEUED)
                 .description("success")
                 .targetUrl("http://www.github.com")
+                .logUrl("http://www.github.com/logurl")
+                .environmentUrl("http://www.github.com/envurl")
+                .environment("new-ci-env")
                 .create();
         Iterable<GHDeploymentStatus> deploymentStatuses = deployment.listStatuses();
         assertNotNull(deploymentStatuses);
         assertEquals(1, Iterables.size(deploymentStatuses));
-        assertEquals(ghDeploymentStatus.getId(), Iterables.get(deploymentStatuses, 0).getId());
+        GHDeploymentStatus actualStatus = Iterables.get(deploymentStatuses, 0);
+        assertEquals(ghDeploymentStatus.getId(), actualStatus.getId());
+        assertEquals(ghDeploymentStatus.getState(), actualStatus.getState());
+        assertEquals(ghDeploymentStatus.getLogUrl(), actualStatus.getLogUrl());
+        // Target url was deprecated and replaced with log url. The gh api will
+        // prefer the log url value and return it in target field
+        assertEquals(ghDeploymentStatus.getTargetUrl(), actualStatus.getLogUrl());
+
     }
 
     @Test
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-3.json
index 0ec3d09ab..d656c99ea 100644
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-3.json
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-3.json
@@ -32,5 +32,7 @@
   "created_at": "2019-10-03T18:57:57Z",
   "updated_at": "2019-10-03T18:57:57Z",
   "statuses_url": "http://localhost:62379/repos/hub4j-test-org/github-api-test/deployments/173089055/statuses",
-  "repository_url": "http://localhost:62379/repos/hub4j-test-org/github-api-test"
+  "repository_url": "http://localhost:62379/repos/hub4j-test-org/github-api-test",
+  "transient_environment": true,
+  "production_environment": false
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-4.json
index 434f073fd..91f8bbbe2 100644
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-4.json
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_hub4j-test-org_github-api-test_deployments-4.json
@@ -33,6 +33,8 @@
     "created_at": "2019-10-03T18:57:57Z",
     "updated_at": "2019-10-03T18:57:57Z",
     "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/deployments/173089055/statuses",
-    "repository_url": "https://api.github.com/repos/hub4j-test-org/github-api-test"
+    "repository_url": "https://api.github.com/repos/hub4j-test-org/github-api-test",
+    "transient_environment": true,
+    "production_environment": false
   }
 ]
\ No newline at end of file