Code styling

This commit is contained in:
Dean 2022-04-22 16:36:33 +01:00
parent b9f57eecb3
commit 7a043dcdbd
2 changed files with 32 additions and 27 deletions

View File

@ -39,9 +39,7 @@ filterTests(["smoke", "all"], () => {
}) })
it("Should create a set of datasource screens with the selected access level", () => { it("Should create a set of datasource screens with the selected access level", () => {
cy.createDatasourceScreen("Cypress Tests", "Public") cy.createDatasourceScreen("Cypress Tests", "Public")
}) })
}) })
}) })

View File

@ -307,34 +307,41 @@ Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
}) })
}) })
Cypress.Commands.add("createDatasourceScreen", (datasourceName, accessLevelLabel) => { Cypress.Commands.add(
cy.contains("Design").click() "createDatasourceScreen",
cy.get("[aria-label=AddCircle]").click() (datasourceName, accessLevelLabel) => {
cy.get(".spectrum-Modal").within(() => { cy.contains("Design").click()
cy.get(".item").contains("Autogenerated screens").click() cy.get("[aria-label=AddCircle]").click()
cy.get(".spectrum-Button").contains("Continue").click({ force: true }) cy.get(".spectrum-Modal").within(() => {
cy.wait(500) cy.get(".item").contains("Autogenerated screens").click()
}) cy.get(".spectrum-Button").contains("Continue").click({ force: true })
cy.get(".spectrum-Modal [data-cy='data-source-modal']").within(() => {
cy.get(".data-source-entry").contains(datasourceName).should("exist")
cy.get(".data-source-entry").contains(datasourceName).click({ force: true })
cy.get(".data-source-entry").contains(datasourceName).get(".data-source-check").should("exist")
cy.get(".spectrum-Button").contains("Confirm").click({ force: true })
})
cy.get(".spectrum-Modal").within(() => {
if (accessLevelLabel) {
cy.get(".spectrum-Picker-label").click()
cy.wait(500) cy.wait(500)
cy.contains(accessLevelLabel).click() })
} cy.get(".spectrum-Modal [data-cy='data-source-modal']").within(() => {
cy.get(".spectrum-Button").contains("Done").click({ force: true }) cy.get(".data-source-entry").contains(datasourceName).should("exist")
}) cy.get(".data-source-entry")
.contains(datasourceName)
.click({ force: true })
cy.contains("Design").click() cy.get(".data-source-entry")
}) .contains(datasourceName)
.get(".data-source-check")
.should("exist")
cy.get(".spectrum-Button").contains("Confirm").click({ force: true })
})
cy.get(".spectrum-Modal").within(() => {
if (accessLevelLabel) {
cy.get(".spectrum-Picker-label").click()
cy.wait(500)
cy.contains(accessLevelLabel).click()
}
cy.get(".spectrum-Button").contains("Done").click({ force: true })
})
cy.contains("Design").click()
}
)
Cypress.Commands.add("navigateToAutogeneratedModal", () => { Cypress.Commands.add("navigateToAutogeneratedModal", () => {
// Screen name must already exist within data source // Screen name must already exist within data source