[Bug#642] Update tests.

Author: ledsoft

src/component/term/__tests__/CreateTerm.test.tsx

@@ -13,7 +13,11 @@ import { langString } from "../../../model/MultilingualString";
 import Constants from "../../../util/Constants";
 import { intlFunctions } from "../../../__tests__/environment/IntlUtil";
 
-jest.mock("../../../util/Routing");
+jest.mock("../../../util/Routing", () => ({
+  default: jest.fn(),
+  namespaceQueryParam: jest.requireActual("../../../util/Routing")
+    .namespaceQueryParam,
+}));
 
 describe("CreateTerm", () => {
   const namespace = "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/";
@@ -59,6 +63,8 @@ describe("CreateTerm", () => {
       isExact: true,
       url: "http://localhost:3000/" + location.pathname,
     };
+    Routing.transitionTo = jest.fn();
+    Routing.reload = jest.fn();
   });
 
   it("invokes on create on create call", () => {
@@ -107,7 +113,9 @@ describe("CreateTerm", () => {
         "test-term"
       );
       expect((call[1].query as Map<string, string>).get("namespace")).toEqual(
-        "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        encodeURIComponent(
+          "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        )
       );
     });
   });
@@ -135,7 +143,9 @@ describe("CreateTerm", () => {
         "test-vocabulary"
       );
       expect((call[1].query as Map<string, string>).get("namespace")).toEqual(
-        "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        encodeURIComponent(
+          "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        )
       );
     });
   });

src/component/term/__tests__/TermLink.test.tsx

@@ -54,7 +54,9 @@ describe("TermLink", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      `/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${vocNamespace}`
+      `/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${encodeURIComponent(
+        vocNamespace
+      )}`
     );
   });
 
@@ -93,7 +95,9 @@ describe("TermLink", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      `/public/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${vocNamespace}`
+      `/public/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${encodeURIComponent(
+        vocNamespace
+      )}`
     );
   });
 

src/component/vocabulary/__tests__/VocabularyLink.test.tsx

@@ -31,7 +31,10 @@ describe("Vocabulary Link links to correct internal asset", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      "/vocabularies/" + fragment + "?namespace=" + namespace
+      "/vocabularies/" +
+        fragment +
+        "?namespace=" +
+        encodeURIComponent(namespace)
     );
   });
 
@@ -43,7 +46,10 @@ describe("Vocabulary Link links to correct internal asset", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      "/public/vocabularies/" + fragment + "?namespace=" + namespace
+      "/public/vocabularies/" +
+        fragment +
+        "?namespace=" +
+        encodeURIComponent(namespace)
     );
   });
 });

src/util/__tests__/Routing.test.ts

@@ -35,12 +35,12 @@ describe("Routing", () => {
       const name = "test-vocabulary";
       const namespace = "http://onto.fel.cvut.cz/ontologies/termit/vocabulary/";
       const path = Routing.getTransitionPath(Routes.vocabularies, {
-        query: new Map([["namespace", namespace]]),
+        query: new Map([["namespace", encodeURIComponent(namespace)]]),
       });
       const expectedPath =
         Routes.vocabularies.path.replace(":name", name) +
         "?namespace=" +
-        namespace;
+        encodeURIComponent(namespace);
       expect(path).toEqual(expectedPath);
     });
   });
@@ -58,14 +58,14 @@ describe("Routing", () => {
     const iri = namespace + label;
 
     it("transitions to vocabulary summary for a vocabulary", () => {
-      const vocabulary = new Vocabulary({ iri, label });
+      const vocabulary = new Vocabulary({ iri, label: langString(label) });
       TermItStore.getState().user = Generator.generateUser();
 
       RoutingInstance.transitionToAsset(vocabulary);
       expect(historyMock.push).toHaveBeenCalledWith(
         Routing.getTransitionPath(Routes.vocabularySummary, {
           params: new Map([["name", label]]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -87,7 +87,7 @@ describe("Routing", () => {
             ["name", label],
             ["timestamp", timestamp],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -105,7 +105,7 @@ describe("Routing", () => {
             ["name", label],
             ["termName", termName],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -129,7 +129,7 @@ describe("Routing", () => {
             ["termName", termName],
             ["timestamp", timestamp],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -142,12 +142,12 @@ describe("Routing", () => {
 
     it("transitions to public vocabulary summary for a vocabulary", () => {
       TermItStore.getState().user = EMPTY_USER;
-      const vocabulary = new Vocabulary({ iri, label });
+      const vocabulary = new Vocabulary({ iri, label: langString(label) });
       RoutingInstance.transitionToPublicAsset(vocabulary);
       expect(historyMock.push).toHaveBeenCalledWith(
         Routing.getTransitionPath(Routes.publicVocabularySummary, {
           params: new Map([["name", label]]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -164,7 +164,7 @@ describe("Routing", () => {
             ["name", label],
             ["termName", term.label[Constants.DEFAULT_LANGUAGE]],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });