Update WebhookOpSpec

Author: shunjikonishi

src/test/scala/IssueOpSpec.scala

@@ -25,21 +25,8 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
   var nTime: DateTime = DateTime.now
   val tRepo = "test-repo2"
 
-  override def beforeAll() {
-    val userMilestones = Await.result(api.listMilestones(user, userRepo, MilestoneListOption(state=MilestoneState.all)), TIMEOUT)
-    userMilestones.foreach { m =>
-      Await.result(api.removeMilestone(user, userRepo, m.number), TIMEOUT)
-    }
-
-    val nInput = new MilestoneInput(Some("test milestone"))
-    val nInput2 = new MilestoneInput(Some("test milestone 2"))
-
-    Await.result(api.createMilestone(user, userRepo, nInput), TIMEOUT)
-    Await.result(api.createMilestone(user, userRepo, nInput2), TIMEOUT)
-  }
-
   describe("createIssue(owner, repo, input)") {
-    val input = IssueInput(Some("test issue"), Some("testing"), Some(user), Some(1), Seq("question"))
+    val input = IssueInput(Some("test issue"), Some("testing"), Some(user), None, Seq("question"))
 
     it("should create issue for user's own repo.") {
       val result = Await.result(api.createIssue(user, userRepo, input), TIMEOUT)
@@ -55,7 +42,6 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
       assert(result.state == "open")
       assert(result.locked == false)
       assert(result.assignee.get.login == user)
-      assert(result.milestone.get.number == 1)
       assert(result.comments == 0)
       assert(result.created_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
       assert(result.updated_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
@@ -179,13 +165,12 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
   }
 
   describe("editIssue(owner, repo, number, input)") {
-    val input = IssueInput(Some("test issue edited"), Some("testing again"), Some(user), Some(2), Seq("question", "bug"), Some(IssueState.closed))
+    val input = IssueInput(Some("test issue edited"), Some("testing again"), Some(user), None, Seq("question", "bug"), Some(IssueState.closed))
 
     it("should edit the issue in user's own repo.") {
       val result = Await.result(api.editIssue(user, userRepo, nUser, input), TIMEOUT)
       assert(result.title == "test issue edited")
       assert(result.body.get == "testing again")
-      assert(result.milestone.get.number == 2)
       assert(result.labels.head.name == "bug")
       assert(result.state == "closed")
       assert(result.updated_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)

src/test/scala/WebhookOpSpec.scala

@@ -16,21 +16,21 @@ class WebhookOpSpec extends FunSpec with Constants with BeforeAndAfter {
 
   describe("listWebhooks(owner, repo)") {
     it("should succeed with valid owner, repo.") {
-      val result = Await.result(api.listWebhooks(organization, repo), TIMEOUT)
-      assert(result.length > 0)
+      val result = Await.result(api.listWebhooks(user, userRepo), TIMEOUT)
+      assert(result.length >= 0)
     }
   }
 
   describe("createWebhook(owner, repo, input)") {
-    it("should succeed with valid organization, repo, and inputs.") {
+    it("should succeed with valid user, repo, and inputs.") {
       val config = WebhookConfig(targetURL)
       val input = WebhookCreateInput("web", config, events=Seq("*"))
-      val res = Await.result(api.createWebhook(organization, repo, input), TIMEOUT)
+      val res = Await.result(api.createWebhook(user, userRepo, input), TIMEOUT)
       showResponse(res)
       nID = res.id
-      assert(res.url == "https://api.github.com/repos/" + organization + "/" + repo + "/hooks/" + nID)
-      assert(res.test_url == "https://api.github.com/repos/" + organization + "/" + repo + "/hooks/" + nID + "/test")
-      assert(res.ping_url == "https://api.github.com/repos/" + organization + "/" + repo + "/hooks/" + nID + "/pings")
+      assert(res.url == "https://api.github.com/repos/" + user + "/" + userRepo + "/hooks/" + nID)
+      assert(res.test_url == "https://api.github.com/repos/" + user + "/" + userRepo + "/hooks/" + nID + "/test")
+      assert(res.ping_url == "https://api.github.com/repos/" + user + "/" + userRepo + "/hooks/" + nID + "/pings")
       assert(res.name == "web")
       assert(res.events == Seq("*"))
       assert(res.active == true)
@@ -42,8 +42,8 @@ class WebhookOpSpec extends FunSpec with Constants with BeforeAndAfter {
   }
 
   describe("getWebhook(owner, repo, id)") {
-    it("should succeed with valid organization, repo and id.") {
-      Await.result(api.getWebhook(organization, repo, nID), TIMEOUT).map { res =>
+    it("should succeed with valid user, repo and id.") {
+      Await.result(api.getWebhook(user, userRepo, nID), TIMEOUT).map { res =>
         assert(res.id == nID)
       }
     }
@@ -52,49 +52,49 @@ class WebhookOpSpec extends FunSpec with Constants with BeforeAndAfter {
   describe("updateWebhook(owner, repo, id, input)") {
     it("should succeed updating by rewriting events.") {
       val input = WebhookUpdateInput(events=Some(Seq("create", "pull_request")))
-      val res = Await.result(api.updateWebhook(organization, repo, nID, input), TIMEOUT)
+      val res = Await.result(api.updateWebhook(user, userRepo, nID, input), TIMEOUT)
       assert(res.events == Seq("create", "pull_request"))
     }
 
     it("should succeed updating by using add_events.") {
       val input = WebhookUpdateInput(add_events=Some(Seq("push")))
-      val res = Await.result(api.updateWebhook(organization, repo, nID, input), TIMEOUT)
+      val res = Await.result(api.updateWebhook(user, userRepo, nID, input), TIMEOUT)
       assert(res.config.url == Some(targetURL))
       assert(res.events == Seq("create", "pull_request", "push"))
     }
 
     it("should succeed updating by using remove_events.") {
       val input = WebhookUpdateInput(remove_events=Some(Seq("pull_request")))
-      val res = Await.result(api.updateWebhook(organization, repo, nID, input), TIMEOUT)
+      val res = Await.result(api.updateWebhook(user, userRepo, nID, input), TIMEOUT)
       assert(res.config.url == Some(targetURL))
       assert(res.events == Seq("create", "push"))
     }
 
     it("should succeed updating by rewriting config.") {
       val config = WebhookConfig(targetURL)
       val input = WebhookUpdateInput(Some(config))
-      val res = Await.result(api.updateWebhook(organization, repo, nID, input), TIMEOUT)
+      val res = Await.result(api.updateWebhook(user, userRepo, nID, input), TIMEOUT)
       assert(res.config.url == Some(targetURL))
     }
   }
 
   describe("testWebhook(owner, repo, id)") {
     it("should succeed with valid inputs.") {
-      val result = Await.result(api.testWebhook(organization, repo, nID), TIMEOUT)
+      val result = Await.result(api.testWebhook(user, userRepo, nID), TIMEOUT)
       assert(result == true)
     }
   }
 
   describe("pingWebhook(owner, repo, id)") {
     it("should succeed with valid inputs.") {
-      val result = Await.result(api.pingWebhook(organization, repo, nID), TIMEOUT)
+      val result = Await.result(api.pingWebhook(user, userRepo, nID), TIMEOUT)
       assert(result == true)
     }
   }
 
   describe("removeWebhook(owner, repo, id)") {
     it("should succeed with valid inputs.") {
-      val result = Await.result(api.removeWebhook(organization, repo, nID), TIMEOUT)
+      val result = Await.result(api.removeWebhook(user, userRepo, nID), TIMEOUT)
       assert(result == true)
     }
   }

test.md

@@ -2,7 +2,8 @@
 This readme documents the changes to the tests.
 
 ## Initial Setup
-1. Please export username and repository that exists under your name.
+1. Create new repo for test on your GitHub account
+1. Export username and repository that exists under your name.
 2. If you have no yet exported your Github token, create one [here](https://github.com/settings/tokens) and export it.
 
 ``` bash