From 5692fca1e5f2e2175529f1d7d51c580c2637d0c3 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 15 Nov 2022 17:59:31 +0000
Subject: [PATCH 1/3] Skipping Screen Tests

There are 4 tests in this file
- Skipped create and delete screen tests (covered by API)
- Update URL test remains (will eventually be covered via E2E with QA Wolf)
- Create and filter screens by access level test remains (This is due for API coverage within another ticket)
---
 packages/builder/cypress/integration/createScreen.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/cypress/integration/createScreen.spec.js b/packages/builder/cypress/integration/createScreen.spec.js
index a516e279f4..c4b237279d 100644
--- a/packages/builder/cypress/integration/createScreen.spec.js
+++ b/packages/builder/cypress/integration/createScreen.spec.js
@@ -9,7 +9,7 @@ filterTests(["smoke", "all"], () => {
       cy.navigateToFrontend()
     })
 
-    it("Should successfully create a screen", () => {
+    it.skip("Should successfully create a screen", () => {
       cy.createScreen("test")
       cy.get(interact.BODY).within(() => {
         cy.contains("/test").should("exist")
@@ -23,7 +23,7 @@ filterTests(["smoke", "all"], () => {
       })
     })
 
-    it("should delete all screens then create first screen via button", () => {
+    it.skip("should delete all screens then create first screen via button", () => {
       cy.deleteAllScreens()
       
       cy.contains("Create first screen").click()

From 0a5839a82bb5156ba1a1e5eb98ae0b34f755cb64 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 16 Nov 2022 11:29:59 +0000
Subject: [PATCH 2/3] Skipping createApp Tests & createAutomation Test Fix

Skipping createApp tests covered via API Automation.
Also updated the createAutomation test to fix an issue with the nightly build
---
 packages/builder/cypress/integration/createApp.spec.js      | 6 +++---
 .../builder/cypress/integration/createAutomation.spec.js    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js
index 179741e21a..d37b0806c4 100644
--- a/packages/builder/cypress/integration/createApp.spec.js
+++ b/packages/builder/cypress/integration/createApp.spec.js
@@ -10,7 +10,7 @@ filterTests(['smoke', 'all'], () => {
     })
 
     if (!(Cypress.env("TEST_ENV"))) {
-      it("should show the new user UI/UX", () => {
+      it.skip("should show the new user UI/UX", () => {
         cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/create`, { timeout: 5000 }) //added /portal/apps/create
         cy.wait(1000)
         cy.get(interact.CREATE_APP_BUTTON, { timeout: 10000 }).contains('Start from scratch').should("exist")
@@ -83,7 +83,7 @@ filterTests(['smoke', 'all'], () => {
       })
     })
 
-    it("should create the first application from scratch", () => {
+    it.skip("should create the first application from scratch", () => {
       const appName = "Cypress Tests"
       cy.createApp(appName, false)
 
@@ -93,7 +93,7 @@ filterTests(['smoke', 'all'], () => {
       cy.deleteApp(appName)
     })
 
-    it("should create the first application from scratch with a default name", () => {
+    it.skip("should create the first application from scratch with a default name", () => {
       cy.updateUserInformation("", "")
       cy.createApp("", false)
       cy.applicationInAppTable("My app")
diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js
index 005f00cca6..8c16f4bd22 100644
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ b/packages/builder/cypress/integration/createAutomation.spec.js
@@ -24,7 +24,7 @@ filterTests(['smoke', 'all'], () => {
       cy.wait(500)
       cy.contains("dog").click()
       // Create action
-      cy.get('[aria-label="AddCircle"]', { timeout: 2000 }).eq(1).click()
+      cy.get('[aria-label="AddCircle"]', { timeout: 2000 }).click()
       cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
         cy.wait(1000)
         cy.contains("Create Row").trigger('mouseover').click().click()

From 32a12eff00112579ed2f08016179da029fcf1d76 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 16 Nov 2022 11:33:30 +0000
Subject: [PATCH 3/3] Skip revertApp Cypress Spec File

We have API Automation coverage for reverting applications
---
 packages/builder/cypress/integration/revertApp.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/integration/revertApp.spec.js b/packages/builder/cypress/integration/revertApp.spec.js
index 0fb58e89e9..2cd806b02c 100644
--- a/packages/builder/cypress/integration/revertApp.spec.js
+++ b/packages/builder/cypress/integration/revertApp.spec.js
@@ -2,7 +2,7 @@ import filterTests from "../support/filterTests"
 const interact = require('../support/interact')
 
 filterTests(['smoke', 'all'], () => {
-    context("Revert apps", () => {
+    xcontext("Revert apps", () => {
         before(() => {
         cy.login()
         cy.createTestApp()