Skip to content

Commit 0e8432f

Browse files
Merge pull request #2332 from cylc/renovate/vuetify-3.x
fix(deps): update dependency vuetify to v3.10.5
2 parents b0facda + 9fc82f7 commit 0e8432f

File tree

5 files changed

+28
-27
lines changed

5 files changed

+28
-27
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"vue-router": "4.5.1",
5151
"vue-the-mask": "0.11.1",
5252
"vue3-apexcharts": "1.8.0",
53-
"vuetify": "3.9.7",
53+
"vuetify": "3.10.5",
5454
"vuex": "4.1.0"
5555
},
5656
"devDependencies": {

src/components/cylc/analysis/TimeSeries.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3131
v-model="displayedTasks"
3232
label="Select tasks"
3333
ref="selectTasks"
34+
data-cy="time-series-task-select"
3435
>
3536
<template v-slot:prepend-item>
3637
<v-select-actions>

tests/e2e/specs/analysis.cy.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ describe('Analysis view', () => {
4646
.should('be.empty')
4747
cy
4848
.get('input#c-analysis-filter-task-platforms')
49-
.should('have.value', 'All')
49+
.should('have.value', '-1')
5050
cy
5151
.get('input#c-analysis-filter-task-timings')
52-
.should('have.value', 'Total times')
52+
.should('have.value', 'totalTimes')
5353
})
5454

5555
it('Should filter by task name', () => {
@@ -280,7 +280,7 @@ describe('Analysis view', () => {
280280
// There should be three tasks in the drop down list when loaded
281281
// Plus 2 entries for Select and Deselect all
282282
cy
283-
.get('.d-flex > .v-autocomplete')
283+
.get('[data-cy=time-series-task-select]')
284284
.click()
285285
.get('.v-list-item')
286286
.its('length')
@@ -312,7 +312,7 @@ describe('Analysis view', () => {
312312
it('Should select tasks from the autocomplete drop down list', () => {
313313
// Add waiting task and check only two cycles visible on both graphs
314314
cy
315-
.get('.d-flex > .v-autocomplete')
315+
.get('[data-cy=time-series-task-select]')
316316
.click()
317317
.get('.v-list-item')
318318
.contains('waiting')
@@ -322,7 +322,7 @@ describe('Analysis view', () => {
322322
.should('have.length', 4)
323323
// Add eventually_succeeded task and check three cycles visible
324324
cy
325-
.get('.d-flex > .v-autocomplete')
325+
.get('[data-cy=time-series-task-select]')
326326
.click()
327327
.get('.v-list-item')
328328
.contains('eventually')
@@ -332,7 +332,7 @@ describe('Analysis view', () => {
332332
.should('have.length', 6)
333333
// Remove selected tasks and check no cycle points are visible
334334
cy
335-
.get('.d-flex > .v-autocomplete')
335+
.get('[data-cy=time-series-task-select]')
336336
.click()
337337
.get('.v-list-item')
338338
.contains('waiting')
@@ -348,7 +348,7 @@ describe('Analysis view', () => {
348348
it('Should search for and add/remove tasks', () => {
349349
// Before searching, the options to add/remove all tasks should exist
350350
cy
351-
.get('.d-flex > .v-autocomplete')
351+
.get('[data-cy=time-series-task-select]')
352352
.click()
353353
.get('.v-list-item')
354354
.contains('succeeded')
@@ -360,26 +360,26 @@ describe('Analysis view', () => {
360360
.should('exist')
361361
// Select all tasks that contain succeeded
362362
cy
363-
.get('.d-flex > .v-autocomplete')
363+
.get('[data-cy=time-series-task-select]')
364364
.type('succeeded')
365365
.get('.v-card-actions')
366366
.contains('Select all')
367367
.click()
368368
// Check the correct tasks have been added
369369
cy
370-
.get('.d-flex > .v-autocomplete')
370+
.get('[data-cy=time-series-task-select]')
371371
.find('.v-chip')
372372
.its('length')
373373
.should('eq', 2)
374-
.get('.d-flex > .v-autocomplete')
374+
.get('[data-cy=time-series-task-select]')
375375
.find('.v-chip')
376376
.contains(/^succeeded$/)
377-
.get('.d-flex > .v-autocomplete')
377+
.get('[data-cy=time-series-task-select]')
378378
.find('.v-chip')
379379
.contains('eventually_succeeded')
380380
// Remove all tasks that contain eventually
381381
cy
382-
.get('.d-flex > .v-autocomplete')
382+
.get('[data-cy=time-series-task-select]')
383383
.find('input')
384384
.clear()
385385
.type('eventually')
@@ -388,10 +388,10 @@ describe('Analysis view', () => {
388388
.click()
389389
// Check only succeeded task is selected
390390
cy
391-
.get('.d-flex > .v-autocomplete')
391+
.get('[data-cy=time-series-task-select]')
392392
.find('.v-chip')
393393
.contains(/^succeeded$/)
394-
.get('.d-flex > .v-autocomplete')
394+
.get('[data-cy=time-series-task-select]')
395395
.find('.v-chip')
396396
.contains('eventually_succeeded')
397397
.should('not.exist')
@@ -400,7 +400,7 @@ describe('Analysis view', () => {
400400
it('Should show origin, when selected', () => {
401401
// Add waiting task and check y-axis doesn't start at origin
402402
cy
403-
.get('.d-flex > .v-autocomplete')
403+
.get('[data-cy=time-series-task-select]')
404404
.click()
405405
.get('.v-list-item')
406406
.contains('waiting')
@@ -507,7 +507,7 @@ describe('Filters and Options save state', () => {
507507
cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
508508
.as('itemsPerPage')
509509
.find('input')
510-
.should('not.have.value', 'All')
510+
.should('not.have.value', -1)
511511
.get('@itemsPerPage')
512512
.click()
513513
.get('[role="listbox"] .v-list-item')
@@ -516,7 +516,7 @@ describe('Filters and Options save state', () => {
516516
// Wait for menu to close
517517
.should('not.exist')
518518
.get('@itemsPerPage').find('input')
519-
.should('have.value', 'All')
519+
.should('have.value', -1)
520520
// Navigate away
521521
cy.visit('/#/')
522522
.get('.c-dashboard')
@@ -525,7 +525,7 @@ describe('Filters and Options save state', () => {
525525
cy.get('@platformCol')
526526
.should('have.class', sortedClass)
527527
cy.get('@itemsPerPage').find('input')
528-
.should('have.value', 'All')
528+
.should('have.value', -1)
529529
})
530530

531531
it('remembers box and whisker sorting options when switching between workflows', () => {

tests/e2e/specs/table.cy.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ describe('State saving', () => {
223223
cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
224224
.as('itemsPerPage')
225225
.find('input')
226-
.should('not.have.value', 'All')
226+
.should('not.have.value', -1)
227227
.get('@itemsPerPage')
228228
.click()
229229
.get('[role="listbox"] .v-list-item')
@@ -232,7 +232,7 @@ describe('State saving', () => {
232232
// Wait for menu to close
233233
.should('not.exist')
234234
.get('@itemsPerPage').find('input')
235-
.should('have.value', 'All')
235+
.should('have.value', -1)
236236
// Navigate away
237237
cy.visit('/#/')
238238
.get('.c-dashboard')
@@ -241,7 +241,7 @@ describe('State saving', () => {
241241
cy.get('@platformCol')
242242
.should('have.class', sortedClass)
243243
cy.get('@itemsPerPage').find('input')
244-
.should('have.value', 'All')
244+
.should('have.value', -1)
245245
})
246246

247247
describe('Flow nums', () => {

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,7 +4614,7 @@ __metadata:
46144614
vue-router: "npm:4.5.1"
46154615
vue-the-mask: "npm:0.11.1"
46164616
vue3-apexcharts: "npm:1.8.0"
4617-
vuetify: "npm:3.9.7"
4617+
vuetify: "npm:3.10.5"
46184618
vuex: "npm:4.1.0"
46194619
peerDependenciesMeta:
46204620
react:
@@ -11861,9 +11861,9 @@ __metadata:
1186111861
languageName: node
1186211862
linkType: hard
1186311863

11864-
"vuetify@npm:3.9.7":
11865-
version: 3.9.7
11866-
resolution: "vuetify@npm:3.9.7"
11864+
"vuetify@npm:3.10.5":
11865+
version: 3.10.5
11866+
resolution: "vuetify@npm:3.10.5"
1186711867
peerDependencies:
1186811868
typescript: ">=4.7"
1186911869
vite-plugin-vuetify: ">=2.1.0"
@@ -11876,7 +11876,7 @@ __metadata:
1187611876
optional: true
1187711877
webpack-plugin-vuetify:
1187811878
optional: true
11879-
checksum: 10c0/56d18b31c8c7791a7e4b9c7ca0969dbe3badb2b7c3b70b8b0fdab2617b3c814cb66b306aab23dee89a7ac6afaf12f7b3af05d455e64c2324b6d99e02adceaaf9
11879+
checksum: 10c0/90ed62befd9815e2b54f75e069457ff42f4005bebbc911763be71a6fc30cfab84d676ae5e5811012617fec6e410406df2f0bca623d14d5e3a351a367f22d0a06
1188011880
languageName: node
1188111881
linkType: hard
1188211882

0 commit comments

Comments
 (0)