From 69dcfa7a15929563ef846449823f6ec1487890a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Ba=C3=B1ados=20Schwerter?= <banadoss@ualberta.ca>
Date: Tue, 10 Dec 2024 19:25:04 +0000
Subject: [PATCH] Changes to make integration tests pass

---
 cypress/e2e/crkeng/search.spec.js             |   4 +-
 cypress/e2e/crkeng/word-details.spec.js       |   4 +-
 .../dictionary/crkeng_test_db.importjson      | 136 +-----------------
 3 files changed, 5 insertions(+), 139 deletions(-)

diff --git a/cypress/e2e/crkeng/search.spec.js b/cypress/e2e/crkeng/search.spec.js
index de9788805..5c4c375e4 100644
--- a/cypress/e2e/crkeng/search.spec.js
+++ b/cypress/e2e/crkeng/search.spec.js
@@ -87,11 +87,11 @@ context("Searching", () => {
     });
   });
 
-  it("should leave out not normatized content", () => {
+  it("should include content from MD", () => {
     // nipa means "Kill Him" in MD
     cy.visitSearch("nipa")
       .searchResultsContain("sleeps")
-      .and("not.contain", "Kill");
+      .and("contain", "Kill");
   });
 
   describe("When I perform a search, I should see the 'info' icon on corresponding entries", () => {
diff --git a/cypress/e2e/crkeng/word-details.spec.js b/cypress/e2e/crkeng/word-details.spec.js
index e85b4e1e3..bbc819bc8 100644
--- a/cypress/e2e/crkeng/word-details.spec.js
+++ b/cypress/e2e/crkeng/word-details.spec.js
@@ -6,13 +6,13 @@ context("Word details", () => {
       { wc: "VTA", ic: "VTA-1", word: "mowêw" },
       { wc: "VAI", ic: "VAI-1", word: "wâpiw@1" },
       { wc: "VTI", ic: "VTI-3", word: "mîciw" },
-      { wc: "VII", ic: "VII-1n", word: "nîpin" },
+      { wc: "VII", ic: "VII-1n", word: "nîpin@vii" },
       // TODO: pretty sure this should be NAD, but the labels say otherwise:
       { wc: "NDA", ic: "NDA-1", word: "nôhkom" },
       // TODO: pretty sure this should be NID, but the labels say otherwise:
       { wc: "NDI", ic: "NDI-1", word: "mîpit" },
       { wc: "NA", ic: "NA-1", word: "minôs" },
-      { wc: "NI", ic: "NI-2", word: "nipiy" },
+      { wc: "NI", ic: "NI-2", word: "nipiy@1" },
       { wc: "IPC", ic: null, word: "ispîhk" },
     ];
 
diff --git a/src/crkeng/resources/dictionary/crkeng_test_db.importjson b/src/crkeng/resources/dictionary/crkeng_test_db.importjson
index c0e218f73..c2bfe0b70 100644
--- a/src/crkeng/resources/dictionary/crkeng_test_db.importjson
+++ b/src/crkeng/resources/dictionary/crkeng_test_db.importjson
@@ -615,107 +615,6 @@
     ],
     "slug": "awîna@pra"
   },
-  {
-    "head": "ayâw",
-    "linguistInfo": {
-      "inflectional_category": "V",
-      "pos": "V",
-      "rw_domains": ["finance", "have_wealth", "own_possess"],
-      "rw_indices": {
-        "CW": [],
-        "MD": ["6.8.1.1"]
-      },
-      "wn_domains": [],
-      "wordclass": "V"
-    },
-    "paradigm": null,
-    "senses": [
-      {
-        "definition": "He owns (something).",
-        "semanticDefinition": "owns",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "He is there.",
-        "semanticDefinition": "there",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "You can have it.",
-        "semanticDefinition": "can have",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "He is through",
-        "semanticDefinition": "through",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "He is finished.",
-        "semanticDefinition": "finished",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "He can rise now after being bedridden.",
-        "semanticDefinition": "can rise now after being bedridden",
-        "sources": ["MD"]
-      }
-    ],
-    "slug": "ayâw@v"
-  },
-  {
-    "analysis": [[], "ayâw", ["+V", "+TI", "+Imp", "+Imm", "+2Sg"]],
-    "formOf": "ayâw@v",
-    "head": "ayâ",
-    "senses": [
-      {
-        "definition": "Have it.",
-        "semanticDefinition": "Have",
-        "sources": ["MD"]
-      }
-    ]
-  },
-  {
-    "analysis": [["PV/e+"], "ayâw", ["+V", "+TI", "+Cnj", "+3Pl"]],
-    "formOf": "ayâw@v",
-    "head": "ê-ayâcik",
-    "senses": [
-      {
-        "definition": "They own (something).",
-        "semanticDefinition": "own",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "They are there.",
-        "semanticDefinition": "are there",
-        "sources": ["MD"]
-      }
-    ]
-  },
-  {
-    "analysis": [[], "ayâw", ["+V", "+TI", "+Ind", "+2Sg"]],
-    "formOf": "ayâw@v",
-    "head": "kitayân",
-    "senses": [
-      {
-        "definition": "You have it.",
-        "semanticDefinition": "have",
-        "sources": ["MD"]
-      }
-    ]
-  },
-  {
-    "analysis": [[], "ayâw", ["+V", "+TI", "+Ind", "+2Pl"]],
-    "formOf": "ayâw@v",
-    "head": "kitayânâwâw",
-    "senses": [
-      {
-        "definition": "You all have it.",
-        "semanticDefinition": "all have",
-        "sources": ["MD"]
-      }
-    ]
-  },
   {
     "analysis": [[], "ayâw", ["+V", "+AI", "+Ind", "+3Sg"]],
     "head": "ayâw",
@@ -2150,12 +2049,7 @@
       {
         "definition": "s/he sleeps, s/he is asleep",
         "semanticDefinition": "sleeps asleep",
-        "sources": ["CW"]
-      },
-      {
-        "definition": "He sleeps.",
-        "semanticDefinition": "sleeps",
-        "sources": ["MD"]
+        "sources": ["CW", "MD"]
       },
       {
         "definition": "s/he is sleeping",
@@ -2859,34 +2753,6 @@
       }
     ]
   },
-  {
-    "head": "nôhtêpayiw",
-    "linguistInfo": {
-      "inflectional_category": "V",
-      "pos": "V",
-      "rw_domains": ["enough", "quantity"],
-      "rw_indices": {
-        "CW": [],
-        "MD": ["8.1.7"]
-      },
-      "wn_domains": [],
-      "wordclass": "V"
-    },
-    "paradigm": null,
-    "senses": [
-      {
-        "definition": "He ran short of it.",
-        "semanticDefinition": "ran short",
-        "sources": ["MD"]
-      },
-      {
-        "definition": "He is short of it.",
-        "semanticDefinition": "short",
-        "sources": ["MD"]
-      }
-    ],
-    "slug": "nôhtêpayiw@v"
-  },
   {
     "analysis": [[], "nôhtêpaýiw", ["+V", "+AI", "+Ind", "+3Sg"]],
     "head": "nôhtêpayiw",