Attachment 148851 Details for Bug 32807 – Bug 32807: Fix cypress tests

[patch] Bug 32807: Fix cypress tests

Bug-32807-Fix-cypress-tests.patch (text/plain), 5.55 KB, created by Jonathan Druart on 2023-03-29 07:40:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-03-29 07:40:20 UTC

Size: 5.55 KB

patch

obsolete

>From a07470eda0d87ab22db41db66185b52ad8c503f5 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 29 Mar 2023 09:38:50 +0200
>Subject: [PATCH] Bug 32807: Fix cypress tests
>
>Cypress tests were failing, not sure I understand why exactly as I don't
>recreate the failure when using the interface. We could simplify the if
>logic anyway.
>---
> .../prog/js/vue/components/ERM/AgreementsList.vue           | 6 +++---
> .../js/vue/components/ERM/EHoldingsLocalPackagesList.vue    | 6 +++---
> .../prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue | 6 +++---
> .../prog/js/vue/components/ERM/LicensesList.vue             | 6 +++---
> 4 files changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
>index 51e63a9eb0a..b8d9f49ec55 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
>@@ -1,6 +1,6 @@
> <template>
>     <div v-if="!initialized">{{ $__("Loading") }}</div>
>-    <div v-else-if="agreement_count" id="agreements_list">
>+    <div v-else id="agreements_list">
>         <Toolbar v-if="before_route_entered" />
>         <fieldset v-if="agreement_count > 0" class="filters">
>             <label for="expired_filter">{{ $__("Filter by expired") }}:</label>
>@@ -35,7 +35,7 @@
>         <div v-if="agreement_count > 0" class="page-section">
>             <table :id="table_id"></table>
>         </div>
>-        <div v-else-if="initialized" class="dialog message">
>+        <div v-else class="dialog message">
>             {{ $__("There are no agreements defined") }}
>         </div>
>     </div>
>@@ -75,7 +75,7 @@ export default {
>     data: function () {
>         return {
>             fp_config: flatpickr_defaults,
>-            agreement_count: null,
>+            agreement_count: 0,
>             initialized: false,
>             filters: {
>                 by_expired: this.$route.query.by_expired || false,
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
>index 51967120c38..ba9a0c93df0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
>@@ -1,7 +1,7 @@
> <template>
>     <div>
>         <div v-if="!initialized">{{ $__("Loading") }}</div>
>-        <div v-else-if="package_count" id="packages_list">
>+        <div v-else id="packages_list">
>             <Toolbar />
>             <div
>                 v-if="package_count > 0"
>@@ -10,7 +10,7 @@
>             >
>                 <table :id="table_id"></table>
>             </div>
>-            <div v-else-if="initialized" class="dialog message">
>+            <div v-else class="dialog message">
>                 {{ $__("There are no packages defined") }}
>             </div>
>         </div>
>@@ -48,7 +48,7 @@ export default {
>     },
>     data: function () {
>         return {
>-            package_count: null,
>+            package_count: 0,
>             initialized: false,
>             filters: {
>                 package_name: this.$route.query.package_name || "",
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
>index 598d54b4341..e81d8cafc53 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
>@@ -1,7 +1,7 @@
> <template>
>     <div>
>         <div v-if="!initialized">{{ $__("Loading") }}</div>
>-        <div v-else-if="title_count" id="titles_list">
>+        <div v-else id="titles_list">
>             <Toolbar />
>             <div
>                 v-if="title_count > 0"
>@@ -10,7 +10,7 @@
>             >
>                 <table :id="table_id"></table>
>             </div>
>-            <div v-else-if="initialized" class="dialog message">
>+            <div v-else class="dialog message">
>                 {{ $__("There are no titles defined") }}
>             </div>
>         </div>
>@@ -46,7 +46,7 @@ export default {
>     },
>     data: function () {
>         return {
>-            title_count: null,
>+            title_count: 0,
>             initialized: false,
>             filters: {
>                 publication_title: this.$route.query.publication_title || "",
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
>index 1ff7243a544..4ddf9fed817 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
>@@ -1,11 +1,11 @@
> <template>
>     <div v-if="!initialized">{{ $__("Loading") }}</div>
>-    <div v-else-if="license_count" id="licenses_list">
>+    <div v-else id="licenses_list">
>         <Toolbar />
>         <div v-if="license_count > 0" class="page-section">
>             <table :id="table_id"></table>
>         </div>
>-        <div v-else-if="initialized" class="dialog message">
>+        <div v-else class="dialog message">
>             {{ $__("There are no licenses defined") }}
>         </div>
>     </div>
>@@ -42,7 +42,7 @@ export default {
>     },
>     data: function () {
>         return {
>-            license_count: null,
>+            license_count: 0,
>             initialized: false,
>         }
>     },
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 32807: 147111 | 147115 | 148654 | 148851 | 148894