Adjust quota meter jest test

galaxyproject · May 31, 2024 · 5fc1c66 · 5fc1c66
1 parent ed05a38
commit 5fc1c66
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/client/src/components/Masthead/QuotaMeter.test.ts b/client/src/components/Masthead/QuotaMeter.test.ts
@@ -3,17 +3,25 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
-import { mockFetcher } from "@/api/schema/__mocks__";
 import { useUserStore } from "@/stores/userStore";
 
 import QuotaMeter from "./QuotaMeter.vue";
 
 jest.mock("@/api/schema");
 
+let configValues = { enable_quotas: true };
+
+jest.mock("@/composables/config", () => ({
+    useConfig: jest.fn(() => ({
+        config: { value: { ...configValues } },
+        isConfigLoaded: true,
+    })),
+}));
+
 const localVue = getLocalVue();
 
 async function createQuotaMeterWrapper(config: any, userData: any) {
-    mockFetcher.path("/api/configuration").method("get").mock({ data: config });
+    configValues = { ...config };
     const pinia = createTestingPinia();
     const userStore = useUserStore();
     userStore.currentUser = { ...userStore.currentUser, ...userData };
@@ -66,7 +74,6 @@ describe("QuotaMeter.vue", () => {
             const user = { total_disk_usage: 7168 };
             const config = { enable_quotas: false };
             const wrapper = await createQuotaMeterWrapper(config, user);
-            console.log(wrapper.html());
             expect(wrapper.find("span").text()).toBe("Using 7 KB");
         }
         {

diff --git a/client/src/components/Masthead/QuotaMeter.vue b/client/src/components/Masthead/QuotaMeter.vue
@@ -44,8 +44,8 @@ const variant = computed(() => {
             <BProgress :max="100">
                 <BProgressBar aria-label="Quota usage" :value="usage" :variant="variant" />
             </BProgress>
-            <span v-if="hasQuota">{{ "Usage " + usage.toFixed(0) }}%</span>
-            <span v-else>{{ "Usage " + totalUsageString }}</span>
+            <span v-if="hasQuota">{{ "Using " + usage.toFixed(0) }}%</span>
+            <span v-else>{{ "Using " + totalUsageString }}</span>
         </BLink>
     </div>
 </template>