Skip to content

Commit 94dd964

Browse files
committed
Make IssueServices compatible and move tests to new package
1 parent 7cd5f3f commit 94dd964

File tree

8 files changed

+16
-11
lines changed

8 files changed

+16
-11
lines changed

src/main/scala/com/codacy/client/bitbucket/v1/service/IssueServices.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ package com.codacy.client.bitbucket.v1.service
22

33
import com.codacy.client.bitbucket.v1.Issue
44
import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
5+
import play.api.libs.json._
6+
import play.api.libs.ws.JsonBodyWritables._
57

68
class IssueServices(client: BitbucketClient) {
79

810
def createIssue(author: String, repo: String, title: String, body: String): RequestResponse[Issue] = {
911

1012
val url = s"https://api.bitbucket.org/1.0/repositories/$author/$repo/issues"
1113

12-
val values = Map("title" -> Seq(title), "content" -> Seq(body))
14+
val values = Json.obj("title" -> JsString(title), "content" -> JsString(body))
1315

1416
client.postForm(Request(url, classOf[Issue]), values)
1517
}

src/main/scala/com/codacy/client/bitbucket/v1/service/PullRequestServices.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.codacy.client.bitbucket.v1.service
22

3+
import com.codacy.client.bitbucket.v1.{PullRequestComment, SimplePullRequestComment}
34
import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
45
import com.codacy.client.util.CommitHelper
5-
import com.codacy.client.bitbucket.v1.{PullRequest, PullRequestComment, SimpleCommit, SimplePullRequestComment, PullRequestReviewers}
66
import play.api.libs.json._
77

88
class PullRequestServices(client: BitbucketClient) {

src/main/scala/com/codacy/client/bitbucket/v1/service/RepositoryServices.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.codacy.client.bitbucket.v1.service
22

3+
import com.codacy.client.bitbucket.v1.{SimpleRepository, SshKey}
34
import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
4-
import com.codacy.client.bitbucket.v1.{Repository, SimpleRepository, SshKey}
55
import play.api.libs.json.Json
66

77
class RepositoryServices(client: BitbucketClient) {

src/test/scala/BuildStatusSpecs.scala renamed to src/test/scala/com/codacy/client/bitbucket/v1/BuildStatusSpecs.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import com.codacy.client.bitbucket.v1.BuildStatus
1+
package com.codacy.client.bitbucket.v1
2+
23
import org.scalatest.{Matchers, _}
34
import play.api.libs.json.Json
45

src/test/scala/CommitSpecs.scala renamed to src/test/scala/com/codacy/client/bitbucket/v1/CommitSpecs.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import com.codacy.client.bitbucket.v1.{Commit, SimpleCommit}
1+
package com.codacy.client.bitbucket.v1
2+
23
import org.scalatest.{Matchers, _}
34
import play.api.libs.json.Json
45

src/test/scala/IssueSpecs.scala renamed to src/test/scala/com/codacy/client/bitbucket/v1/IssueSpecs.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import com.codacy.client.bitbucket.v1.Issue
1+
package com.codacy.client.bitbucket.v1
2+
23
import org.scalatest.{Matchers, _}
34
import play.api.libs.json.Json
45

src/test/scala/PullRequestSpecs.scala renamed to src/test/scala/com/codacy/client/bitbucket/v1/PullRequestSpecs.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import org.scalatest._
2-
import org.scalatest.Matchers
1+
package com.codacy.client.bitbucket.v1
2+
3+
import org.scalatest.{Matchers, _}
34
import play.api.libs.json.Json
4-
import com.codacy.client.bitbucket.v1.{Email, PullRequest}
5-
import com.codacy.client.bitbucket.v1.PullRequest._
65

76
class PullRequestSpecs extends FlatSpec with Matchers {
87

src/test/scala/RepositorySpecs.scala renamed to src/test/scala/com/codacy/client/bitbucket/v1/RepositorySpecs.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import com.codacy.client.bitbucket.v1.{Repository, SimpleRepository}
1+
package com.codacy.client.bitbucket.v1
2+
23
import org.scalatest.{Matchers, _}
34
import play.api.libs.json.Json
45

0 commit comments

Comments
 (0)