From 7a043dcdbda55b23a349b14e49fadc88696d87d2 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 22 Apr 2022 16:36:33 +0100
Subject: [PATCH] Code styling

---
 .../cypress/integration/createScreen.js       |  2 -
 packages/builder/cypress/support/commands.js  | 57 +++++++++++--------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/builder/cypress/integration/createScreen.js b/packages/builder/cypress/integration/createScreen.js
index f83de22df8..f30dcfd330 100644
--- a/packages/builder/cypress/integration/createScreen.js
+++ b/packages/builder/cypress/integration/createScreen.js
@@ -39,9 +39,7 @@ filterTests(["smoke", "all"], () => {
     })
 
     it("Should create a set of datasource screens with the selected access level", () => {
-      
       cy.createDatasourceScreen("Cypress Tests", "Public")
-
     })
   })
 })
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 1966957edb..7fb64e6f5d 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -307,34 +307,41 @@ Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
   })
 })
 
-Cypress.Commands.add("createDatasourceScreen", (datasourceName, accessLevelLabel) => {
-  cy.contains("Design").click()
-  cy.get("[aria-label=AddCircle]").click()
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get(".item").contains("Autogenerated screens").click()
-    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-    cy.wait(500)
-  })
-  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()
+Cypress.Commands.add(
+  "createDatasourceScreen",
+  (datasourceName, accessLevelLabel) => {
+    cy.contains("Design").click()
+    cy.get("[aria-label=AddCircle]").click()
+    cy.get(".spectrum-Modal").within(() => {
+      cy.get(".item").contains("Autogenerated screens").click()
+      cy.get(".spectrum-Button").contains("Continue").click({ force: true })
       cy.wait(500)
-      cy.contains(accessLevelLabel).click()
-    }
-    cy.get(".spectrum-Button").contains("Done").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.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", () => {
   // Screen name must already exist within data source