Merge remote-tracking branch 'origin/360-dev-tsv-test' into dev

test/Test/API/UpdateList.hs

@@ -189,7 +189,7 @@ tests = sequential $ aroundAll withTestDBAndPort $ do
     describe "POST /api/v1.0/lists/:id/csv/add/form/async (CSV)" $ do
 
       it "parses CSV via ngramsListFromCSVData" $ \((_testEnv, _port), _app) -> do
-        simpleNgrams <- liftIO (TIO.readFile =<< getDataFileName "test-data/ngrams/simple.csv")
+        simpleNgrams <- liftIO (TIO.readFile =<< getDataFileName "test-data/ngrams/simple.tsv")
         ngramsListFromTSVData simpleNgrams `shouldBe`
           Right (Map.fromList [ (NgramsTerms, Versioned 0 $ Map.fromList [
                                   (NgramsTerm "abelian group", NgramsRepoElement 1 MapTerm Nothing Nothing (MSet mempty))
@@ -202,12 +202,12 @@ tests = sequential $ aroundAll withTestDBAndPort $ do
           withValidLogin port "alice" (GargPassword "alice") $ \token -> do
             ([listId] :: [NodeId]) <- protectedJSON token "POST" (mkUrl port ("/node/" <> build cId)) [aesonQQ|{"pn_typename":"NodeList","pn_name":"Testing"}|]
             -- Upload the CSV doc
-            simpleNgrams <- liftIO (TIO.readFile =<< getDataFileName "test-data/ngrams/simple.csv")
+            simpleNgrams <- liftIO (TIO.readFile =<< getDataFileName "test-data/ngrams/simple.tsv")
             let tsvFileFormData = [ (T.pack "_wtf_data", simpleNgrams)
-                                  , ("_wtf_filetype", "CSV")
-                                  , ("_wtf_name", "simple.csv")
+                                  , ("_wtf_filetype", "TSV")
+                                  , ("_wtf_name", "simple.tsv")
                                   ]
-            let url         = "/lists/"  <> fromString (show $ _NodeId listId) <> "/csv/add/form/async"
+            let url         = "/lists/"  <> fromString (show $ _NodeId listId) <> "/tsv/add/form/async"
             let mkPollUrl j = "/corpus/" <> fromString (show $ _NodeId listId) <> "/add/form/async/" +|_jph_id j|+ "/poll?limit=1"
             (j :: JobPollHandle) <- postJSONUrlEncoded token (mkUrl port url) (urlEncodeFormStable $ toForm tsvFileFormData)
             j' <- pollUntilFinished token port mkPollUrl j