Add more tests for the move API

test/Test/API/Prelude.hs

@@ -5,6 +5,7 @@ module Test.API.Prelude
   , newPrivateFolderForUser
   , newPublicFolderForUser
   , newFolderForUser
+  , addFolderForUser
   , getRootPublicFolderIdForUser
   , getRootPrivateFolderIdForUser
   , myUserNodeId
@@ -16,11 +17,13 @@ import Data.Aeson qualified as JSON
 import Data.Text qualified as T
 import Gargantext.API.Errors
 import Gargantext.Core.Types.Individu
-import Gargantext.Core.Types (NodeId, NodeType(..))
+import Gargantext.Core.Types (NodeId, NodeType(..), ParentId)
 import Gargantext.Core.Worker.Env ()  -- instance HasNodeError
 import Gargantext.Database.Action.User
 import Gargantext.Database.Admin.Types.Hyperdata.Corpus
+import Gargantext.Database.Prelude
 import Gargantext.Database.Query.Table.Node
+import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Query.Table.Node.User (getUserByName)
 import Gargantext.Database.Query.Tree.Root
 import Gargantext.Database.Schema.Node (_node_id)
@@ -41,11 +44,28 @@ newCorpusForUser env uname = flip runReaderT env $ runTestMonad $ do
   (corpusId:_) <- mk (Just corpusName) (Nothing :: Maybe HyperdataCorpus) parentId uid
   pure corpusId
 
+-- | Creates a new folder for the input user, nested under the given 'ParentId', if given.
+newFolderForUser' :: HasNodeError err
+                  => User
+                  -> T.Text
+                  -> ParentId
+                  -> DBCmd err NodeId
+newFolderForUser' ur folderName parentId = do
+  uid      <- getUserId ur
+  insertNode NodeFolder (Just folderName) Nothing parentId uid
+
+addFolderForUser :: TestEnv
+                 -> User
+                 -> T.Text
+                 -> ParentId
+                 -> IO NodeId
+addFolderForUser env ur folderName parentId = flip runReaderT env $ runTestMonad $ do
+  newFolderForUser' ur folderName parentId
+
 newFolderForUser :: TestEnv -> T.Text -> T.Text -> IO NodeId
 newFolderForUser env uname folderName = flip runReaderT env $ runTestMonad $ do
-  uid      <- getUserId (UserName uname)
   parentId <- getRootId (UserName uname)
-  insertNode NodeFolder (Just folderName) Nothing parentId uid
+  newFolderForUser' (UserName uname) folderName parentId
 
 -- | Generate a 'Node' where we can append more data into, a bit reminiscent to the
 -- \"Private\" root node we use in the real Gargantext.

test/Test/API/Private/Move.hs

@@ -29,6 +29,20 @@ tests = sequential $ aroundAll withTestDBAndPort $ do
       -- Let's create the Alice user.
       void $ createAliceAndBob _sctx_env
 
+    describe "Moving a node" $ do
+
+      describe "private to private moves" $ do
+
+        it "should allow moving one folder into another" $ \(SpecContext testEnv serverPort app _) -> do
+          withApplication app $ do
+            withValidLogin serverPort "alice" (GargPassword "alice") $ \clientEnv token -> liftIO $ do
+              aliceRoot <- getRootPrivateFolderIdForUser testEnv (UserName "alice")
+              child1    <- addFolderForUser testEnv (UserName "alice") "child1" aliceRoot
+              child2    <- addFolderForUser testEnv (UserName "alice") "child2" aliceRoot
+              -- Test that moving child1 into child2 works.
+              res <- checkEither $ runClientM (move_node token (SourceId child2) (TargetId child1)) clientEnv
+              res `shouldBe` [child2]
+
     describe "Publishing a Corpus" $ do
 
       it "should forbid moving a corpus node into another user Public folder" $ \(SpecContext testEnv serverPort app _) -> do