OCLOMRS-1031:Your Organizations Sources shows user-owned sources (#738)

* OCLOMRS-1031:Your Organizations Sources shows user-owned sources * fixes for failing test * Use contains instead of equal to avoid the test error Co-authored-by: hadijahkyampeire <hadijah315@gmail.com>
openmrs · Sep 8, 2021 · 036bcde · 036bcde
1 parent ae39faa
commit 036bcde
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/cypress/support/step_definitions/dictionary/createVersion/createVersion.ts b/cypress/support/step_definitions/dictionary/createVersion/createVersion.ts
@@ -55,10 +55,7 @@ When(/the user selects the "(.+)" menu list item/, menuItem =>
 Then("the subscription url should be copied", () => {
   cy.window().then(win => {
     win.navigator.clipboard.readText().then(text => {
-      assert.equal(
-        text,
-        `/users/${getUser()}/collections/${getDictionaryId()}/${getVersionId()}`
-      );
+      expect(text).to.contain(`/users/${getUser()}/collections/${getDictionaryId()}/${getVersionId()}/`)
     });
   });
 });
diff --git a/src/apps/dictionaries/api.ts b/src/apps/dictionaries/api.ts
@@ -22,6 +22,7 @@ const api = {
           params: {
             limit,
             page,
+            verbose: true,
             q: buildPartialSearchQuery(q),
             customValidationSchema: CUSTOM_VALIDATION_SCHEMA,
             timestamp: new Date().getTime() // work around seemingly unhelpful caching
@@ -37,6 +38,7 @@ const api = {
           params: {
             limit,
             page,
+            verbose: true,
             q: buildPartialSearchQuery(q),
             customValidationSchema: CUSTOM_VALIDATION_SCHEMA,
             timestamp: new Date().getTime() // work around seemingly unhelpful caching

diff --git a/src/apps/sources/__test__/api.test.ts b/src/apps/sources/__test__/api.test.ts
@@ -18,13 +18,21 @@ describe("api", () => {
     const q: string = "";
     const limit: number = 20;
     const page: number = 1;
-    const response = await api.sources.retrieve.private(url, q, limit, page);
+    const verbose: boolean = true;
+    const response = await api.sources.retrieve.private(
+      url,
+      q,
+      limit,
+      page,
+      verbose
+    );
 
     expect(authenticatedInstance.get).toHaveBeenCalledWith(url, {
       params: {
         limit: 20,
         page: 1,
         q: "",
+        verbose: true,
         timestamp: expect.anything()
       }
     });
@@ -36,13 +44,21 @@ describe("api", () => {
     const q: string = "";
     const limit: number = 20;
     const page: number = 1;
-    const response = await api.sources.retrieve.public(url, q, limit, page);
+    const verbose: boolean = true;
+    const response = await api.sources.retrieve.public(
+      url,
+      q,
+      limit,
+      page,
+      verbose
+    );
 
     expect(unAuthenticatedInstance.get).toHaveBeenCalledWith(url, {
       params: {
         limit: 20,
         page: 1,
         q: "",
+        verbose: true,
         timestamp: expect.anything()
       }
     });

diff --git a/src/apps/sources/api.ts b/src/apps/sources/api.ts
@@ -17,20 +17,34 @@ const api = {
     authenticatedInstance.put(sourceUrl, data),
   sources: {
     retrieve: {
-      private: (sourcesUrl: string, q: string = "", limit = 20, page = 1) =>
+      private: (
+        sourcesUrl: string,
+        q: string = "",
+        limit = 20,
+        page = 1,
+        verbose = true
+      ) =>
         authenticatedInstance.get(sourcesUrl, {
           params: {
             limit,
             page,
+            verbose: true,
             q: buildPartialSearchQuery(q),
             timestamp: new Date().getTime() // work around seemingly unhelpful caching
           }
         }),
-      public: (sourcesUrl: string, q: string = "", limit = 20, page = 1) =>
+      public: (
+        sourcesUrl: string,
+        q: string = "",
+        limit = 20,
+        page = 1,
+        verbose = true
+      ) =>
         unAuthenticatedInstance.get(sourcesUrl, {
           params: {
             limit,
             page,
+            verbose: true,
             q: buildPartialSearchQuery(q),
             timestamp: new Date().getTime() // work around seemingly unhelpful caching
           }