From bf4a13287d5e7c137a11228ef485acf2afe8a719 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Oct 2025 12:16:22 +0000
Subject: [PATCH 1/3] fix(deps): update dependency vuetify to v3.10.5
---
package.json | 2 +-
yarn.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 00ed3ac41..385c36b6b 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
"vue-router": "4.5.1",
"vue-the-mask": "0.11.1",
"vue3-apexcharts": "1.8.0",
- "vuetify": "3.9.7",
+ "vuetify": "3.10.5",
"vuex": "4.1.0"
},
"devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 296e368ea..beec9cb6e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4614,7 +4614,7 @@ __metadata:
vue-router: "npm:4.5.1"
vue-the-mask: "npm:0.11.1"
vue3-apexcharts: "npm:1.8.0"
- vuetify: "npm:3.9.7"
+ vuetify: "npm:3.10.5"
vuex: "npm:4.1.0"
peerDependenciesMeta:
react:
@@ -11861,9 +11861,9 @@ __metadata:
languageName: node
linkType: hard
-"vuetify@npm:3.9.7":
- version: 3.9.7
- resolution: "vuetify@npm:3.9.7"
+"vuetify@npm:3.10.5":
+ version: 3.10.5
+ resolution: "vuetify@npm:3.10.5"
peerDependencies:
typescript: ">=4.7"
vite-plugin-vuetify: ">=2.1.0"
@@ -11876,7 +11876,7 @@ __metadata:
optional: true
webpack-plugin-vuetify:
optional: true
- checksum: 10c0/56d18b31c8c7791a7e4b9c7ca0969dbe3badb2b7c3b70b8b0fdab2617b3c814cb66b306aab23dee89a7ac6afaf12f7b3af05d455e64c2324b6d99e02adceaaf9
+ checksum: 10c0/90ed62befd9815e2b54f75e069457ff42f4005bebbc911763be71a6fc30cfab84d676ae5e5811012617fec6e410406df2f0bca623d14d5e3a351a367f22d0a06
languageName: node
linkType: hard
From caae8ce398e050c77e6a87d5719594c36794328a Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Wed, 15 Oct 2025 15:33:52 +0100
Subject: [PATCH 2/3] Paritally revert "Fix tests"
This partially reverts commit 11cc1c9cd544978275ee3b1fef5065952fe89975.
(New version of Vuetify has undone some of these changes)
---
tests/e2e/specs/analysis.cy.js | 10 +++++-----
tests/e2e/specs/table.cy.js | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/e2e/specs/analysis.cy.js b/tests/e2e/specs/analysis.cy.js
index f1b3de733..de671b7fe 100644
--- a/tests/e2e/specs/analysis.cy.js
+++ b/tests/e2e/specs/analysis.cy.js
@@ -46,10 +46,10 @@ describe('Analysis view', () => {
.should('be.empty')
cy
.get('input#c-analysis-filter-task-platforms')
- .should('have.value', 'All')
+ .should('have.value', '-1')
cy
.get('input#c-analysis-filter-task-timings')
- .should('have.value', 'Total times')
+ .should('have.value', 'totalTimes')
})
it('Should filter by task name', () => {
@@ -507,7 +507,7 @@ describe('Filters and Options save state', () => {
cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
.as('itemsPerPage')
.find('input')
- .should('not.have.value', 'All')
+ .should('not.have.value', -1)
.get('@itemsPerPage')
.click()
.get('[role="listbox"] .v-list-item')
@@ -516,7 +516,7 @@ describe('Filters and Options save state', () => {
// Wait for menu to close
.should('not.exist')
.get('@itemsPerPage').find('input')
- .should('have.value', 'All')
+ .should('have.value', -1)
// Navigate away
cy.visit('/#/')
.get('.c-dashboard')
@@ -525,7 +525,7 @@ describe('Filters and Options save state', () => {
cy.get('@platformCol')
.should('have.class', sortedClass)
cy.get('@itemsPerPage').find('input')
- .should('have.value', 'All')
+ .should('have.value', -1)
})
it('remembers box and whisker sorting options when switching between workflows', () => {
diff --git a/tests/e2e/specs/table.cy.js b/tests/e2e/specs/table.cy.js
index e7ec1a60d..26df1dee7 100644
--- a/tests/e2e/specs/table.cy.js
+++ b/tests/e2e/specs/table.cy.js
@@ -223,7 +223,7 @@ describe('State saving', () => {
cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
.as('itemsPerPage')
.find('input')
- .should('not.have.value', 'All')
+ .should('not.have.value', -1)
.get('@itemsPerPage')
.click()
.get('[role="listbox"] .v-list-item')
@@ -232,7 +232,7 @@ describe('State saving', () => {
// Wait for menu to close
.should('not.exist')
.get('@itemsPerPage').find('input')
- .should('have.value', 'All')
+ .should('have.value', -1)
// Navigate away
cy.visit('/#/')
.get('.c-dashboard')
@@ -241,7 +241,7 @@ describe('State saving', () => {
cy.get('@platformCol')
.should('have.class', sortedClass)
cy.get('@itemsPerPage').find('input')
- .should('have.value', 'All')
+ .should('have.value', -1)
})
describe('Flow nums', () => {
From 9fc82f7f3114857ffa6cb068bf11d7b0f84a705c Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Wed, 15 Oct 2025 15:39:15 +0100
Subject: [PATCH 3/3] Fix tests
---
src/components/cylc/analysis/TimeSeries.vue | 1 +
tests/e2e/specs/analysis.cy.js | 26 ++++++++++-----------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/cylc/analysis/TimeSeries.vue b/src/components/cylc/analysis/TimeSeries.vue
index 7830d70ef..500588244 100644
--- a/src/components/cylc/analysis/TimeSeries.vue
+++ b/src/components/cylc/analysis/TimeSeries.vue
@@ -31,6 +31,7 @@ along with this program. If not, see .
v-model="displayedTasks"
label="Select tasks"
ref="selectTasks"
+ data-cy="time-series-task-select"
>
diff --git a/tests/e2e/specs/analysis.cy.js b/tests/e2e/specs/analysis.cy.js
index de671b7fe..192842765 100644
--- a/tests/e2e/specs/analysis.cy.js
+++ b/tests/e2e/specs/analysis.cy.js
@@ -280,7 +280,7 @@ describe('Analysis view', () => {
// There should be three tasks in the drop down list when loaded
// Plus 2 entries for Select and Deselect all
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.its('length')
@@ -312,7 +312,7 @@ describe('Analysis view', () => {
it('Should select tasks from the autocomplete drop down list', () => {
// Add waiting task and check only two cycles visible on both graphs
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('waiting')
@@ -322,7 +322,7 @@ describe('Analysis view', () => {
.should('have.length', 4)
// Add eventually_succeeded task and check three cycles visible
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('eventually')
@@ -332,7 +332,7 @@ describe('Analysis view', () => {
.should('have.length', 6)
// Remove selected tasks and check no cycle points are visible
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('waiting')
@@ -348,7 +348,7 @@ describe('Analysis view', () => {
it('Should search for and add/remove tasks', () => {
// Before searching, the options to add/remove all tasks should exist
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('succeeded')
@@ -360,26 +360,26 @@ describe('Analysis view', () => {
.should('exist')
// Select all tasks that contain succeeded
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.type('succeeded')
.get('.v-card-actions')
.contains('Select all')
.click()
// Check the correct tasks have been added
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.find('.v-chip')
.its('length')
.should('eq', 2)
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains(/^succeeded$/)
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains('eventually_succeeded')
// Remove all tasks that contain eventually
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.find('input')
.clear()
.type('eventually')
@@ -388,10 +388,10 @@ describe('Analysis view', () => {
.click()
// Check only succeeded task is selected
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains(/^succeeded$/)
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains('eventually_succeeded')
.should('not.exist')
@@ -400,7 +400,7 @@ describe('Analysis view', () => {
it('Should show origin, when selected', () => {
// Add waiting task and check y-axis doesn't start at origin
cy
- .get('.d-flex > .v-autocomplete')
+ .get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('waiting')