From d10db80a61fa1d1d2b041ac22aeeeafdf70e5658 Mon Sep 17 00:00:00 2001
From: Eugene Zadyra <untrance@gmail.com>
Date: Wed, 6 Jun 2018 00:18:14 +0200
Subject: [PATCH] Fixed flaky tests

---
 .../scala/com/lbs/server/actor/AuthSpec.scala  | 17 ++++++++++++++++-
 .../scala/com/lbs/server/actor/Mocks.scala     | 18 ------------------
 2 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 server/src/test/scala/com/lbs/server/actor/Mocks.scala

diff --git a/server/src/test/scala/com/lbs/server/actor/AuthSpec.scala b/server/src/test/scala/com/lbs/server/actor/AuthSpec.scala
index 1ab54da..b9498cd 100644
--- a/server/src/test/scala/com/lbs/server/actor/AuthSpec.scala
+++ b/server/src/test/scala/com/lbs/server/actor/AuthSpec.scala
@@ -1,18 +1,27 @@
 package com.lbs.server.actor
 
+import akka.actor.ActorRef
+import akka.testkit.TestProbe
 import com.lbs.bot.model.{Command, Message, MessageSource, TelegramMessageSourceSystem}
 import com.lbs.server.actor.Chat.Init
 import com.lbs.server.actor.Login.{ForwardCommand, LoggedIn, UserId}
 import com.lbs.server.service.DataService
 import org.mockito.Mockito._
 
-class AuthSpec extends AkkaTestKit with Mocks {
+class AuthSpec extends AkkaTestKit {
 
   "An Auth actor " when {
+
     val source = MessageSource(TelegramMessageSourceSystem, "1")
     val userId = UserId(1L, source)
 
     "user is unauthorized" must {
+      val unauthorizedHelpActor = TestProbe()
+      val loginActor = TestProbe()
+      val chatActor = TestProbe()
+      val unauthorizedHelpFactory: MessageSource => ActorRef = _ => unauthorizedHelpActor.ref
+      val loginActorFactory: (MessageSource, ActorRef) => ActorRef = (_, _) => loginActor.ref
+      val chatActorFactory: UserId => ActorRef = _ => chatActor.ref
       val dataService = mock(classOf[DataService])
       val auth = system.actorOf(Auth.props(source, dataService, unauthorizedHelpFactory, loginActorFactory, chatActorFactory))
 
@@ -63,6 +72,12 @@ class AuthSpec extends AkkaTestKit with Mocks {
     }
 
     "user is authorized" must {
+      val unauthorizedHelpActor = TestProbe()
+      val loginActor = TestProbe()
+      val chatActor = TestProbe()
+      val unauthorizedHelpFactory: MessageSource => ActorRef = _ => unauthorizedHelpActor.ref
+      val loginActorFactory: (MessageSource, ActorRef) => ActorRef = (_, _) => loginActor.ref
+      val chatActorFactory: UserId => ActorRef = _ => chatActor.ref
       val dataService = mock(classOf[DataService])
       val auth = system.actorOf(Auth.props(source, dataService, unauthorizedHelpFactory, loginActorFactory, chatActorFactory))
 
diff --git a/server/src/test/scala/com/lbs/server/actor/Mocks.scala b/server/src/test/scala/com/lbs/server/actor/Mocks.scala
deleted file mode 100644
index d644c4c..0000000
--- a/server/src/test/scala/com/lbs/server/actor/Mocks.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.lbs.server.actor
-
-import akka.actor.{ActorRef, ActorSystem}
-import akka.testkit.TestProbe
-import com.lbs.bot.model.MessageSource
-import com.lbs.server.actor.Login.UserId
-
-trait Mocks {
-
-  protected implicit val system: ActorSystem
-
-  protected val unauthorizedHelpActor = TestProbe()
-  protected val loginActor = TestProbe()
-  protected val chatActor = TestProbe()
-  protected val unauthorizedHelpFactory: MessageSource => ActorRef = _ => unauthorizedHelpActor.ref
-  protected val loginActorFactory: (MessageSource, ActorRef) => ActorRef = (_, _) => loginActor.ref
-  protected val chatActorFactory: UserId => ActorRef = _ => chatActor.ref
-}