Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCHR-4098: Misc BackstopJS fixes and improvements #2818

Merged
merged 4 commits into from
Aug 8, 2018
Merged

PCHR-4098: Misc BackstopJS fixes and improvements #2818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
035317f
PCHR-4098: Fix angular urls
Aug 3, 2018
d3bd8a8
PCHR-4098: Update selector for edit my details button
Aug 3, 2018
4cdd46a
PCHR-4098: Use backstopjs beta
Aug 7, 2018
4a6639e
PCHR-4098: Use standard 3.5.2 version
Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion uk.co.compucorp.civicrm.hrcore/backstop_data/page-objects/ssp-my-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = class SSPMyDetails extends SSP {
*
*/
async showEditMyDetailsPopup () {
await this.puppet.click('[href="/my_details/nojs/view"]');
await this.puppet.click('[href="/edit-my-personal-details/js/view"]');
await this.puppet.waitFor('.modal-civihr-custom__section', { visible: true });
}
};
8 changes: 4 additions & 4 deletions uk.co.compucorp.civicrm.hrcore/backstop_data/scenarios/la-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
"scenarios": [
{
"label": "L&A / Dashboard / Calendar",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#/calendar",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#!/calendar",
"onReadyScript": "leave-absence-dashboard/leave-calendar/leave-calendar.js"
},
{
"label": "L&A / Dashboard / Leave Requests",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#/requests",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#!/requests",
"onReadyScript": "leave-absence-dashboard/leave-requests/leave-requests.js"
},
{
"label": "L&A / Dashboard / Leave Requests / Show Filters",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#/requests",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#!/requests",
"onReadyScript": "leave-absence-dashboard/leave-requests/leave-requests-with-filters.js"
},
{
"label": "L&A / Dashboard / Leave Balances",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#/leave-balances",
"url": "{{siteUrl}}/civicrm/leaveandabsences/dashboard#!/leave-balances",
"onReadyScript": "leave-absence-dashboard/leave-balances/leave-balances.js"
}
]
Expand Down
28 changes: 14 additions & 14 deletions uk.co.compucorp.civicrm.hrcore/backstop_data/scenarios/ssp-la-manager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,85 +2,85 @@
"scenarios": [
{
"label": "SSP / Manager Leave / Current month",
"url": "{{siteUrl}}/manager-leave#/manager-leave/calendar",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/calendar",
"onReadyScript": "ssp/manager-leave/calendar-current-month-visible.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Legend expanded",
"url": "{{siteUrl}}/manager-leave#/manager-leave/calendar",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/calendar",
"onReadyScript": "ssp/manager-leave/calendar-legend-expanded.js",
"user": "civihr_manager",
"requireSameDimensions": false
},
{
"label": "SSP / Manager Leave / Show all contacts",
"url": "{{siteUrl}}/manager-leave#/manager-leave/calendar",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/calendar",
"onReadyScript": "ssp/manager-leave/calendar-all-contacts.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Show actions",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/leave-requests-show-actions.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Show without filters",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/leave-requests-without-filters.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Show with filters",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/leave-requests-with-filters.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Show staff edit toil request",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/modal-toil-edit.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Show staff edit sickness request",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/modal-sick-edit.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Apply leave on behalf of staff",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/modal-leave-on-behalf-of-staff.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Apply sickness on behalf of staff",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/modal-sick-on-behalf-of-staff.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Apply toil on behalf of staff",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/modal-toil-on-behalf-of-staff.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave / Leave Balances",
"url": "{{siteUrl}}/manager-leave#/manager-leave/leave-balances",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/leave-balances",
"onReadyScript": "ssp/manager-leave/leave-balances.js",
"user": "civihr_manager"
},
{
"label": "SSP / Manager Leave (as admin) / Leave Requests",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/leave-requests-as-admin.js"
},
{
"label": "SSP / Manager Leave (as admin) / Leave Requests / All Requests",
"url": "{{siteUrl}}/manager-leave#/manager-leave/requests",
"url": "{{siteUrl}}/manager-leave#!/manager-leave/requests",
"onReadyScript": "ssp/manager-leave/leave-requests-as-admin-all-requests.js"
}
]
Expand Down
14 changes: 7 additions & 7 deletions uk.co.compucorp.civicrm.hrcore/backstop_data/scenarios/ssp-la-my-leave.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,43 @@
"scenarios": [
{
"label": "SSP / My Leave / Report",
"url": "{{siteUrl}}/my-leave#/my-leave/report",
"url": "{{siteUrl}}/my-leave#!/my-leave/report",
"onReadyScript": "ssp/my-leave/report.js",
"user": "civihr_staff"
},
{
"label": "SSP / My Leave / Report / Modal / Show comments",
"url": "{{siteUrl}}/my-leave#/my-leave/report",
"url": "{{siteUrl}}/my-leave#!/my-leave/report",
"onReadyScript": "ssp/my-leave/report-pending-show-comments.js",
"user": "civihr_staff"
},
{
"label": "SSP / My Leave / Report / Modal / Show absence in hours",
"url": "{{siteUrl}}/my-leave#/my-leave/report",
"url": "{{siteUrl}}/my-leave#!/my-leave/report",
"onReadyScript": "ssp/my-leave/report-show-absence-in-hours.js",
"user": "civihr_staff"
},
{
"label": "SSP / My Leave / Report / Modal / Show deductions fields",
"url": "{{siteUrl}}/my-leave#/my-leave/report",
"url": "{{siteUrl}}/my-leave#!/my-leave/report",
"onReadyScript": "ssp/my-leave/modal-show-deduction-fields.js",
"user": "civihr_staff"
},
{
"label": "SSP / My Leave / Report / Modal / Show deductions fields expanded",
"url": "{{siteUrl}}/my-leave#/my-leave/report",
"url": "{{siteUrl}}/my-leave#!/my-leave/report",
"onReadyScript": "ssp/my-leave/modal-show-deduction-fields-expanded.js",
"user": "civihr_staff"
},
{
"label": "SSP / My Leave / Calendar / Current Month",
"url": "{{siteUrl}}/my-leave#/my-leave/calendar",
"url": "{{siteUrl}}/my-leave#!/my-leave/calendar",
"onReadyScript": "ssp/my-leave/calendar-current-month-visible.js",
"user": "civihr_staff"
},
{
"label": "SSP / My Leave / Calendar / Tooltip",
"url": "{{siteUrl}}/my-leave#/my-leave/calendar",
"url": "{{siteUrl}}/my-leave#!/my-leave/calendar",
"onReadyScript": "ssp/my-leave/calendar-tooltip.js",
"user": "civihr_staff"
}
Expand Down
2 changes: 1 addition & 1 deletion uk.co.compucorp.civicrm.hrcore/backstop_data/scenarios/ta-calendar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"scenarios": [
{
"label": "T&A / Calendar",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/calendar"
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/calendar"
}
]
}
14 changes: 7 additions & 7 deletions uk.co.compucorp.civicrm.hrcore/backstop_data/scenarios/ta-documents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@
"scenarios": [
{
"label": "T&A / Documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/show.js"
},
{
"label": "T&A / Documents / Advanced Filters",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/advanced-filters.js"
},
{
"label": "T&A / Documents / Document / Add",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/document/add.js"
},
{
"label": "T&A / Documents / Document / Show All Fields",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/document/show-all-fields.js"
},
{
"label": "T&A / Documents / Document / Select Type",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/document/select-type.js"
},
{
"label": "T&A / Documents / Document / Select Assignee",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/document/select-assignee.js"
},
{
"label": "T&A / Documents / Document / Pick Due Date",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/documents",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/documents",
"onReadyScript": "documents/document/pick-due-date.js"
}
]
Expand Down
40 changes: 20 additions & 20 deletions uk.co.compucorp.civicrm.hrcore/backstop_data/scenarios/ta-tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,102 +2,102 @@
"scenarios": [
{
"label": "T&A / Tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/task.js"
},
{
"label": "T&A / Tasks / Advanced Filters",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/advanced-filters.js"
},
{
"label": "T&A / Tasks / Select Dates",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/select-dates.js"
},
{
"label": "T&A / Tasks / Assignment / Add",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/assignment/add.js"
},
{
"label": "T&A / Tasks / Assignment / Select Type",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/assignment/select-type.js"
},
{
"label": "T&A / Tasks / Assignment / Add Task",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/assignment/add-task.js"
},
{
"label": "T&A / Tasks / Assignment / Add Document",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/assignment/add-document.js"
},
{
"label": "T&A / Tasks / Assignment / Pick Date",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/assignment/pick-date.js"
},
{
"label": "T&A / Tasks / Task / In Place Edit / Due Date",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/editable-date.js"
},
{
"label": "T&A / Tasks / Task / In Place Edit / Subject",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/editable-subject.js"
},
{
"label": "T&A / Tasks / Task / In Place Edit / Target",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/editable-target.js"
},
{
"label": "T&A / Tasks / Task / In Place Edit / Assigned To",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/editable-assigned.js"
},
{
"label": "T&A / Tasks / Task / Add",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/add.js"
},
{
"label": "T&A / Tasks / Task / Pick Date",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/pick-date.js"
},
{
"label": "T&A / Tasks / Task / Select Assignee",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/select-assignee.js"
},
{
"label": "T&A / Tasks / Task / Select Type",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/select-type.js"
},
{
"label": "T&A / Tasks / Task / Show All Fields",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/show-all-fields.js"
},
{
"label": "T&A / Tasks / Task / Show More",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/show-more.js"
},
{
"label": "T&A / Tasks / Task / Actions",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/actions.js"
},
{
"label": "T&A / Tasks / Task / Open",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#/tasks",
"url": "{{siteUrl}}/civicrm/tasksassignments/dashboard#!/tasks",
"onReadyScript": "tasks/task/open.js"
}
]
Expand Down
Loading