[tests] fix last merge issues

test/Test/API/Private.hs

@@ -23,7 +23,7 @@ import Test.API.Private.Move  qualified as Move
 import Test.API.Private.Share qualified as Share
 import Test.API.Private.Table qualified as Table
 import Test.API.Routes (mkUrl, get_node, get_tree)
-import Test.API.Setup (withTestDBAndPort, dbEnvSetup, SpecContext (..))
+import Test.API.Setup (createAliceAndBob, withTestDBAndPort, dbEnvSetup, SpecContext (..))
 import Test.Hspec
 import Test.Hspec.Wai hiding (pendingWith)
 import Test.Hspec.Wai.Internal (withApplication)
@@ -38,11 +38,6 @@ nodeTests = sequential $ aroundAll withTestDBAndPort $ beforeAllWith dbEnvSetup
     manager <- runIO $ newManager defaultManagerSettings
     let unauthenticatedClientEnv port = mkClientEnv manager (baseUrl { baseUrlPort = port })
 
-    it "setup DB triggers" $ \SpecContext{..} -> do
-      setupEnvironment _sctx_env
-      -- Let's create the Alice user.
-      void $ createAliceAndBob _sctx_env
-
     describe "GET /api/v1.0/user" $ do
 
       -- FIXME(adn): unclear if this is useful at all. Doesn't do permission checking.

test/drivers/hspec/Main.hs

@@ -4,19 +4,8 @@ module Main where
 
 import Control.Monad
 import Data.Text (isInfixOf)
-<<<<<<< HEAD
 import Data.Text qualified as T
 import Gargantext.Prelude hiding (isInfixOf)
-||||||| 0bbbba60
-import Gargantext.Core.Notifications.CentralExchange qualified as CE
-import Gargantext.Core.Notifications.Dispatcher qualified as D
-import Gargantext.Core.Notifications.Dispatcher.Types qualified as DT
-import Gargantext.Core.Config.Types (NotificationsConfig(..))
-=======
-import Gargantext.Core.Notifications.CentralExchange qualified as CE
-import Gargantext.Core.Notifications.Dispatcher qualified as D
-import Gargantext.Core.Config.Types (NotificationsConfig(..))
->>>>>>> dev
 import Shelly hiding (FilePath)
 import System.IO
 import System.Process