Merge branch 'main' into dev

cypress/integration/crkeng/paradigm.spec.js

@@ -12,26 +12,35 @@ describe("I want to search for a Cree word and see its inflectional paradigm", (
       inflections: ["niwâpin", "kiwâpin", "ê-wâpiyit"],
     },
     {
-      pos: "VTI",
+      pos: "VAI",
       lemma: "mîcisow",
       inflections: ["nimîcison", "kimîcison", "ê-mîcisoyit"],
     },
+    {
+      pos: "VTI",
+      lemma: "mîciw",
+      inflections: ["nimîcin", "mîciwak", "ê-mîciniwahk"],
+    },
     { pos: "VII", lemma: "nîpin", inflections: ["nîpin", "ê-nîpihk"] },
-    { pos: "NAD", lemma: "nôhkom", inflections: ["kôhkom", "ohkoma"] },
-    { pos: "NID", lemma: "mîpit", inflections: ["nîpit", "kîpit", "wîpit"] },
+    { pos: "NDA", lemma: "nôhkom", inflections: ["kôhkom", "ohkoma"] },
+    { pos: "NDI", lemma: "mîpit", inflections: ["nîpit", "kîpit", "wîpit"] },
     { pos: "NA", lemma: "minôs", inflections: ["minôsak", "minôsa"] },
     {
       pos: "NI",
       lemma: "nipiy",
-      inflections: ["nipîhk", "ninipiy", "kinipiy"],
+      inflections: ["nipîhk", "ninipîm", "kinipîm"],
     },
   ];
 
   // Create test cases for each word above
   for (let { pos, lemma, inflections } of testCases) {
     it(`should display the paradigm for a word belonging to the ${pos} word class`, () => {
       cy.visitSearch(lemma);
-      cy.get("[data-cy=search-results]").contains("a", lemma).click();
+      cy.get("[data-cy=search-results]")
+        .contains(pos)
+        .closest("[data-cy=search-result]")
+        .contains("a", lemma)
+        .click();
 
       cy.get("[data-cy=paradigm]").as("paradigm");
 

cypress/integration/crkeng/search.spec.js

@@ -259,7 +259,7 @@ context("Searching", () => {
     it("should show auto-translations with auto:y", function () {
       // NB: need to make sure this wordform is added **explicitly** in the
       // `ensuretestdb` management commands:
-      cy.visitSearch("auto:y niminôsak");
+      cy.visitSearch("auto:y niminôsimak");
       cy.get("[data-cy=search-result]")
         .contains("my cats")
         .get(".cite-dict")

src/CreeDictionary/tests/test_fst_regressions.py

@@ -16,7 +16,9 @@
             # See: https://github.com/UAlbertaALTLab/morphodict/issues/897
             "ê-pim-nêhiyawêyahk",
             RichAnalysis(
-                (("PV/e+", "PV/pimi+"), "nêhiýawêw", ("+V", "+AI", "+Cnj", "+12Pl"))
+                (("PV/e+", "PV/pimi+"), "nêhiyawêw", ("+V", "+AI", "+Cnj", "+12Pl"))
+                # PV/e+PV/pimi+nêhiýawêw+V+AI+Cnj+12Pl
+                # ê-pim-nêhiýawêyahk
             ),
         ),
         (

src/crkeng/app/integration_tests/test_paradigm_manager.py

@@ -51,7 +51,7 @@ def test_generates_personal_pronoun_paradigm(paradigm_manager) -> None:
         ("NDA", "nôhkom", ["nôhkom", "kôhkom", "ohkoma"]),
         ("NDI", "mîpit", ["mîpit", "nîpit", "kîpit", "wîpit"]),
         ("NA", "minôs", ["minôs", "minôsak", "minôsa"]),
-        ("NI", "nipiy", ["nipiy", "nipîhk", "ninipiy", "kinipiy"]),
+        ("NI", "nipiy", ["nipiy", "nipîhk", "ninipîm", "kinipîm"]),
     ],
 )
 def test_paradigm(paradigm_manager, name, lemma, examples: list[str]):