Skip to content

Commit

Permalink
Merge pull request #1336 from ProcessMaker/update_vue_form_elements
Browse files Browse the repository at this point in the history
Update vue form elements
  • Loading branch information
caleeli authored Feb 17, 2023
2 parents dd18af6 + 95d5004 commit 201a269
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 120 deletions.
117 changes: 22 additions & 95 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@cypress/code-coverage": "^3.8.1",
"@fortawesome/fontawesome-free": "^5.6.1",
"@panter/vue-i18next": "^0.15.2",
"@processmaker/vue-form-elements": "0.42.0",
"@processmaker/vue-form-elements": "0.43.0",
"@processmaker/vue-multiselect": "^2.2.0",
"@vue/cli-plugin-babel": "^3.6.0",
"@vue/cli-plugin-e2e-cypress": "^4.0.3",
Expand Down Expand Up @@ -88,7 +88,7 @@
},
"peerDependencies": {
"@panter/vue-i18next": "^0.15.0",
"@processmaker/vue-form-elements": "0.42.0",
"@processmaker/vue-form-elements": "0.43.0",
"i18next": "^15.0.8",
"vue": "^2.6.12",
"vuex": "^3.1.1"
Expand Down
26 changes: 3 additions & 23 deletions tests/e2e/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,29 +180,9 @@ Cypress.Commands.add('pickYesterday', { prevSubject: true }, (subject) => {
});

Cypress.Commands.add("pickTomorrow", { prevSubject: true }, (subject) => {
// Click the input element to open the calendar
cy.get(subject).find("input").click();

// Find the "today" element and get its index
cy.get(subject)
.find(".day.today")
.should("exist")
.invoke("index")
.then((index) => {
// If today is the last day of the week, select the first day of the next week
if (index === 6) {
cy.get(subject)
.find(".day.today")
.parent()
.next()
.find(".day")
.first()
.click();
} else {
// Otherwise, select the next day
cy.get(subject).find(".day.today").next().click();
}
});
const tomorrow = moment().add(1, "days").format('YYYY-M-D');
cy.get(subject).find('input').click();
cy.get(subject).find(`[data-id="${tomorrow}"]`).click();
});

Cypress.Commands.add('pickTodayWithTime', { prevSubject: true }, (subject, hour, minute, period='AM') => {
Expand Down

0 comments on commit 201a269

Please sign in to comment.