test fixes I

Author: mtraina

test/controllers/AuthControllerSpec.scala

@@ -7,6 +7,7 @@ import org.mockito.BDDMockito._
 import org.scalatest.mock.MockitoSugar
 import org.scalatestplus.play._
 import persistence.UserRepository
+import play.api.libs.json.Json
 import play.api.mvc._
 import play.api.test.Helpers._
 import play.api.test._
@@ -16,30 +17,38 @@ class AuthControllerSpec extends PlaySpec with MockitoSugar with Results {
   val authController = new AuthController(userRepository)
 
   "An auth controller" should {
-    // TODO: no mocking: for using "with session" we need a running application
-//    "authenticate with valid credentials" in {
-//      val user = "user"
-//      val pass = "pass"
-//      given(userRepository.login(user, pass)) willReturn true
-//      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> authHeaderValue(s"$user:$pass"))
-//      val result = authController.authenticate()(request)
-//      status(result) mustBe OK
-//      val bodyText: String = contentAsString(result)
-//      bodyText mustBe "logged"
-//    }
 
     "not authenticate with not matching credentials" in {
+      // given
       val user = "user"
       val pass = "pass"
+      given(userRepository.login(user, pass)) willReturn None
       val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> authHeaderValue(s"$user:$pass"))
+
+      // when
       val result = authController.authenticate()(request)
+
+      // then
       status(result) mustBe UNAUTHORIZED
     }
 
-    "not authenticate with not valid authentication header" in {
+    "authenticate with matching credentials" in {
+      // given
       val user = "user"
       val pass = "pass"
-      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> s"$user:$pass")
+      given(userRepository.login(user, pass)) willReturn Some("token")
+      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> authHeaderValue(s"$user:$pass"))
+
+      // when
+      val result = authController.authenticate()(request)
+
+      // then
+      status(result) mustBe OK
+      contentAsJson(result) mustBe Json.obj("token" -> "token")
+    }
+
+    "not authenticate with not valid authentication header" in {
+      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> "user:pass")
       val result = authController.authenticate()(request)
       status(result) mustBe UNAUTHORIZED
     }
@@ -54,22 +63,15 @@ class AuthControllerSpec extends PlaySpec with MockitoSugar with Results {
     }
 
     "return an empty user from non encoded credentials" in {
-      val user = "user"
-      val pass = "pass"
-      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> s"$user:$pass")
-
+      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> "user:pass")
       authController.credentials(request) mustBe None
     }
 
     "return an empty user from invalid encoded credentials" in {
-      val user = "user"
-      val pass = "pass"
-      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> authHeaderValue(s"$user:$pass:test"))
-
+      val request = FakeRequest(POST, "/auth").withHeaders("Authorization" -> authHeaderValue("user:pass:test"))
       authController.credentials(request) mustBe None
     }
   }
 
   def authHeaderValue(credentials: String) = "Basic " + Base64.getEncoder.encodeToString(credentials.getBytes)
-
 }

test/persistence/UserRepositorySpec.scala

@@ -28,8 +28,7 @@ class UserRepositorySpec extends PlaySpecification with EmbeddedMongo {
       val userRepository = app.injector.instanceOf[UserRepository]
 
       // then
-      val result = userRepository.login("user", "pass")
-      result must beTrue
+      userRepository.login("user", "pass").isDefined must beTrue
     }
   }
 }

test/services/WordServiceImplSpec.scala

@@ -29,11 +29,4 @@ class WordServiceImplSpec extends FlatSpec with Matchers with MockitoSugar {
     val resp = wordService.saveWord(f)
     resp.value.get.get.json shouldBe json
   }
-
-  it should "adapt the retrieved text" in {
-    wordService.adaptText("abc") shouldBe "abc"
-    wordService.adaptText("abc ") shouldBe "abc"
-    wordService.adaptText("ab cd ") shouldBe "ab cd"
-  }
-
 }