Resolves conflicts after master merging

47degrees · May 12, 2016 · ebfec71 · ebfec71
1 parent 7287a9e
commit ebfec71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/test/scala/com.fortysevendeg.github4s/integration/GHAuthSpec.scala b/src/test/scala/com.fortysevendeg.github4s/integration/GHAuthSpec.scala
@@ -3,7 +3,6 @@ package com.fortysevendeg.github4s.integration
 import cats.Id
 import cats.scalatest.{XorMatchers, XorValues}
 import com.fortysevendeg.github4s.Github._
-import com.fortysevendeg.github4s.GithubResponses._
 import com.fortysevendeg.github4s.free.interpreters.IdInterpreters._
 import com.fortysevendeg.github4s.{Github, TestUtils}
 import org.scalatest._
@@ -19,7 +18,7 @@ class GHAuthSpec extends FlatSpec with Matchers with XorMatchers with XorValues
     val response = Github().auth.authorizeUrl(validClientId, validRedirectUri, validScopes).exec[Id]
     response shouldBe right
     response.value.value.url.contains(validRedirectUri) shouldBe true
-    response.value.statusCode shouldBe statusCodeOK
+    response.value.statusCode shouldBe okStatusCode
   }
 
   "Auth >> GetAccessToken" should "return error on Left for invalid code value" in {

diff --git a/src/test/scala/com.fortysevendeg.github4s/integration/GHReposSpec.scala b/src/test/scala/com.fortysevendeg.github4s/integration/GHReposSpec.scala
@@ -15,7 +15,7 @@ class GHReposSpec extends FlatSpec with Matchers with XorMatchers with XorValues
 
     val response = Github(accessToken).repos.get(validRepoOwner, validRepoName).exec[Id]
     response shouldBe right
-    response.value.entity.name shouldBe validRepoName
+    response.value.value.name shouldBe validRepoName
     response.value.statusCode shouldBe okStatusCode
   }
 
@@ -27,7 +27,7 @@ class GHReposSpec extends FlatSpec with Matchers with XorMatchers with XorValues
   "Repos >> ListCommits" should "return the expected list of commits for valid data" in {
     val response = Github(accessToken).repos.listCommits(validRepoOwner, validRepoName).exec[Id]
     response shouldBe right
-    response.value.entity.nonEmpty shouldBe true
+    response.value.value.nonEmpty shouldBe true
     response.value.statusCode shouldBe okStatusCode
   }
 

diff --git a/src/test/scala/com.fortysevendeg.github4s/integration/GHUsersSpec.scala b/src/test/scala/com.fortysevendeg.github4s/integration/GHUsersSpec.scala
@@ -15,7 +15,7 @@ class GHUsersSpec extends FlatSpec with Matchers with XorMatchers with XorValues
     val response = Github(accessToken).users.get(validUsername).exec[Id]
     response shouldBe right
     response.value.value.login shouldBe validUsername
-    response.value.statusCode shouldBe statusCodeOK
+    response.value.statusCode shouldBe okStatusCode
   }
 
   it should "return error on Left for invalid username" in {
@@ -32,14 +32,14 @@ class GHUsersSpec extends FlatSpec with Matchers with XorMatchers with XorValues
     val response = Github(accessToken).users.getUsers(validSinceInt).exec[Id]
     response shouldBe right
     response.value.value.nonEmpty shouldBe true
-    response.value.statusCode shouldBe statusCodeOK
+    response.value.statusCode shouldBe okStatusCode
   }
 
   it should "return error on Left when a invalid since value is provided" in {
     val response = Github(accessToken).users.getUsers(invalidSinceInt).exec[Id]
     response shouldBe right
     response.value.value.nonEmpty shouldBe true
-    response.value.statusCode shouldBe statusCodeOK
+    response.value.statusCode shouldBe okStatusCode
   }
 
 }