Skip to content

Commit

Permalink
refactor: migrate form components to @dhis2/ui (#856)
Browse files Browse the repository at this point in the history
  • Loading branch information
mediremi authored Feb 17, 2022
1 parent 8b323c3 commit ced1121
Show file tree
Hide file tree
Showing 215 changed files with 7,002 additions and 8,286 deletions.

Large diffs are not rendered by default.

389 changes: 201 additions & 188 deletions cypress/fixtures/network/38/static_resources.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions cypress/fixtures/network/38/summary.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"count": 654,
"totalResponseSize": 950710,
"duplicates": 506,
"count": 662,
"totalResponseSize": 770760,
"duplicates": 514,
"nonDeterministicResponses": 55,
"apiVersion": "38",
"fixtureFiles": [
Expand Down
285 changes: 112 additions & 173 deletions cypress/fixtures/network/38/the_app_has_a_main_navigation.json

Large diffs are not rendered by default.

326 changes: 131 additions & 195 deletions cypress/fixtures/network/38/the_user_group_list_can_be_searched.json

Large diffs are not rendered by default.

492 changes: 257 additions & 235 deletions cypress/fixtures/network/38/the_user_list_can_be_searched.json

Large diffs are not rendered by default.

291 changes: 114 additions & 177 deletions cypress/fixtures/network/38/the_user_role_list_can_be_searched.json

Large diffs are not rendered by default.

287 changes: 113 additions & 174 deletions cypress/fixtures/network/38/user_groups_can_be_listed.json

Large diffs are not rendered by default.

273 changes: 106 additions & 167 deletions cypress/fixtures/network/38/user_roles_can_be_listed.json

Large diffs are not rendered by default.

283 changes: 111 additions & 172 deletions cypress/fixtures/network/38/users_can_be_listed.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cypress/integration/user-group/search-groups/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ Given('the user-manager filtered the list', () => {
When('the user-manager edits one of the displayed user groups', () => {
cy.getWithDataTest('{context-menu-button}').first().click()
cy.getWithDataTest('{dhis2-uicore-menu}').contains('Edit').click()
cy.findByRole('heading', { name: /^Update User Group:/ }).should('exist')
cy.findByRole('heading', { name: 'Edit group' }).should('exist')
})

When('returns to the list view without saving', () => {
cy.findByRole('button', { name: 'Cancel' }).click()
cy.findByRole('button', { name: 'Cancel without saving' }).click()
cy.findByRole('heading', { name: 'User Group Management' }).should('exist')
})

Expand Down
6 changes: 2 additions & 4 deletions cypress/integration/user-role/search-roles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ Given('the user-manager filtered the list', () => {
When('the user-manager edits one of the displayed user roles', () => {
cy.getWithDataTest('{context-menu-button}').first().click()
cy.getWithDataTest('{dhis2-uicore-menu}').contains('Edit').click()
cy.findByRole('heading', { name: /^Update User Authority Group:/ }).should(
'exist'
)
cy.findByRole('heading', { name: 'Edit role' }).should('exist')
})

When('returns to the list view without saving', () => {
cy.findByRole('button', { name: 'Cancel' }).click()
cy.findByRole('button', { name: 'Cancel without saving' }).click()
cy.findByRole('heading', { name: 'User Role Management' }).should('exist')
})

Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/user/search-users/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ When('the user-manager edits one of the displayed users', () => {
.click()
cy.getWithDataTest('{dhis2-uicore-menu}').should('be.visible')
cy.getWithDataTest('{dhis2-uicore-menu}').contains('Edit').click()
cy.findByRole('heading', { name: /^Update User:/ }).should('exist')
cy.findByRole('heading', { name: 'Edit user' }).should('exist')
})

When('returns to the list view without saving', () => {
cy.findByRole('button', { name: 'Cancel' }).click()
cy.findByRole('button', { name: 'Cancel without saving' }).click()
cy.findByRole('heading', { name: 'User Management' }).should('exist')
})

Expand Down
Loading

0 comments on commit ced1121

Please sign in to comment.