From f0b781ac6328c26ad8d226d34fb0c40c63443178 Mon Sep 17 00:00:00 2001
From: balajisoundar <balaji@appsmith.com>
Date: Tue, 16 Nov 2021 15:53:05 +0530
Subject: [PATCH] test: Fix super user signup form cypress test (#8947)

---
 app/client/cypress/setup-test.sh    | 36 ------------------------
 app/client/cypress/support/index.js | 43 +++++++++++++++--------------
 2 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/app/client/cypress/setup-test.sh b/app/client/cypress/setup-test.sh
index 47d47f2ff4..54de05c482 100755
--- a/app/client/cypress/setup-test.sh
+++ b/app/client/cypress/setup-test.sh
@@ -78,42 +78,6 @@ if [ "$status_code" -eq "502" ]; then
   exit 1
 fi
 
-# Create the test user
-curl -k --request POST -v 'https://dev.appsmith.com/api/v1/users' \
---header 'Content-Type: application/json' \
---data-raw '{
-	"name" : "'"$CYPRESS_USERNAME"'",
-	"email" : "'"$CYPRESS_USERNAME"'",
-	"source" : "FORM",
-	"state" : "ACTIVATED",
-	"isEnabled" : "true",
-	"password": "'"$CYPRESS_PASSWORD"'"
-}'
-
-#Create another testUser1
-curl -k --request POST -v 'https://dev.appsmith.com/api/v1/users' \
---header 'Content-Type: application/json' \
---data-raw '{
-	"name" : "'"$CYPRESS_TESTUSERNAME1"'",
-	"email" : "'"$CYPRESS_TESTUSERNAME1"'",
-	"source" : "FORM",
-	"state" : "ACTIVATED",
-	"isEnabled" : "true",
-	"password": "'"$CYPRESS_TESTPASSWORD1"'"
-}'
-
-#Create another testUser2
-curl -k --request POST -v 'https://dev.appsmith.com/api/v1/users' \
---header 'Content-Type: application/json' \
---data-raw '{
-	"name" : "'"$CYPRESS_TESTUSERNAME2"'",
-	"email" : "'"$CYPRESS_TESTUSERNAME2"'",
-	"source" : "FORM",
-	"state" : "ACTIVATED",
-	"isEnabled" : "true",
-	"password": "'"$CYPRESS_TESTPASSWORD2"'"
-}'
-
 # DEBUG=cypress:* $(npm bin)/cypress version
 # sed -i -e "s|api_url:.*$|api_url: $CYPRESS_URL|g" /github/home/.cache/Cypress/4.1.0/Cypress/resources/app/packages/server/config/app.yml
 # cat /github/home/.cache/Cypress/4.1.0/Cypress/resources/app/packages/server/config/app.yml
diff --git a/app/client/cypress/support/index.js b/app/client/cypress/support/index.js
index 1c34550adb..7b6ccde828 100644
--- a/app/client/cypress/support/index.js
+++ b/app/client/cypress/support/index.js
@@ -38,30 +38,33 @@ before(function() {
     window.indexedDB.deleteDatabase("Appsmith");
   });
 
-  //Temporary commented out to fix loginFromApi command
-  // cy.visit("/setup/welcome");
-  // cy.wait("@getUser");
-  // cy.url().then((url) => {
-  //   if (url.indexOf("setup/welcome") > -1) {
-  //     cy.createSuperUser();
-  //     cy.LogOut();
-  //   }
-  // });
+  cy.visit("/setup/welcome");
+  cy.wait("@getUser");
+  cy.url().then((url) => {
+    if (url.indexOf("setup/welcome") > -1) {
+      cy.createSuperUser();
+      cy.LogOut();
+      cy.SignupFromAPI(
+        Cypress.env("TESTUSERNAME1"),
+        Cypress.env("TESTPASSWORD1"),
+      );
+      cy.LogOut();
+      cy.SignupFromAPI(
+        Cypress.env("TESTUSERNAME2"),
+        Cypress.env("TESTPASSWORD2"),
+      );
+      cy.LogOut();
+    }
+  });
+});
 
-  // cy.SignupFromAPI(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
-  // cy.SignupFromAPI(Cypress.env("TESTUSERNAME2"), Cypress.env("TESTPASSWORD2"));
-  // cy.LogOut();
-  // initLocalstorage();
-  // Cypress.Cookies.preserveOnce("SESSION");
+before(function() {
+  Cypress.Cookies.preserveOnce("SESSION", "remember_token");
   const username = Cypress.env("USERNAME");
   const password = Cypress.env("PASSWORD");
   cy.LoginFromAPI(username, password);
   cy.visit("/applications");
-  cy.wait("@applications").should(
-    "have.nested.property",
-    "response.body.responseMeta.status",
-    200,
-  );
+  cy.wait("@applications");
 
   cy.generateUUID().then((id) => {
     appId = id;
@@ -76,7 +79,7 @@ before(function() {
 
 beforeEach(function() {
   initLocalstorage();
-  Cypress.Cookies.preserveOnce("SESSION");
+  Cypress.Cookies.preserveOnce("SESSION", "remember_token");
   cy.startServerAndRoutes();
 });