@bigbinary/neeto-commons-frontend 2.0.109 → 2.0.111

package/cypress-utils.js

@@ -1081,31 +1081,37 @@ var memberUtils = {
   clickOnColumnIcon: clickOnColumnIcon
 };
 
-var updateSubdomainIfExists = function updateSubdomainIfExists(appName, subdomainName) {
+var extractSubdomainFromError = function extractSubdomainFromError(inputString) {
+  var regex = /cypresstest[a-zA-Z0-9-]+/g;
+  var matches = inputString.match(regex);
+  return matches[1];
+};
+var updateSubdomainIfExists = function updateSubdomainIfExists(appName) {
   cy.ifExist(signUpSelectors.subdomainError, function () {
-    var lastDigit = Number(subdomainName.charAt(subdomainName.length - 1));
-    var newOrganizationName = subdomainName.slice(0, -1) + (lastDigit + 1);
-    cy.intercept({
-      url: requestApis.subdomainAvailability,
-      times: 1
-    }).as("subdomainRequest");
-    cy.clearAndType(signUpSelectors.subdomainNameTextField, newOrganizationName);
-    cy.wait("@subdomainRequest");
-    cy.ifNotExist(signUpSelectors.subdomainError, function () {
-      cy.task("updateGlobalState", {
-        key: "subdomainName",
-        value: newOrganizationName
-      });
-      cy.task("updateGlobalState", {
-        key: "businessName",
-        value: newOrganizationName
+    cy.get(signUpSelectors.subdomainError).invoke("text").then(function (text) {
+      cy.intercept({
+        url: requestApis.subdomainAvailability,
+        times: 1
+      }).as("subdomainRequest");
+      var newOrganizationName = extractSubdomainFromError(text);
+      cy.clearAndType(signUpSelectors.subdomainNameTextField, newOrganizationName);
+      cy.wait("@subdomainRequest");
+      cy.ifNotExist(signUpSelectors.subdomainError, function () {
+        cy.task("updateGlobalState", {
+          key: "subdomainName",
+          value: newOrganizationName
+        });
+        cy.task("updateGlobalState", {
+          key: "businessName",
+          value: newOrganizationName
+        });
+        var newBaseUrl = "https://".concat(newOrganizationName, ".").concat(appName, ".").concat(env.tld);
+        Cypress.config("baseUrl", newBaseUrl);
+        cy.clearAndType(signUpSelectors.organizationNameTextField, newOrganizationName);
       });
-      var newBaseUrl = "https://".concat(newOrganizationName, ".").concat(appName, ".").concat(env.tld);
-      Cypress.config("baseUrl", newBaseUrl);
-      cy.clearAndType(signUpSelectors.organizationNameTextField, newOrganizationName);
     });
     cy.ifExist(signUpSelectors.subdomainError, function () {
-      return updateSubdomainIfExists(appName, newOrganizationName);
+      return updateSubdomainIfExists(appName);
     });
   });
 };
@@ -1121,7 +1127,7 @@ var createOrganization = function createOrganization(_ref) {
   var appNameInLowerCase = appName.toLowerCase();
   var isNeetoAuth = appNameInLowerCase === "neetoauth";
   if (isNeetoAuth) cy.visit("https://app.neetoauth.".concat(env.tld, "/signups/new"));else {
-    var startingUrl = "https://www.neeto.com/".concat(appNameInLowerCase).concat(env.isProduction ? "" : "?env=staging");
+    var startingUrl = "https://www.neeto.com/".concat(appNameInLowerCase).concat(env.isStaging ? "?env=staging" : "");
     cy.visit(startingUrl);
     cy.get(signUpSelectors.tryFreeButton).invoke("removeAttr", "target").click();
   }
@@ -1150,7 +1156,7 @@ var createOrganization = function createOrganization(_ref) {
   cy.clearAndType(signUpSelectors.organizationNameTextField, businessName);
   cy.clearAndType(signUpSelectors.subdomainNameTextField, subdomainName);
   cy.wait("@subdomainRequest");
-  updateSubdomainIfExists(appNameInLowerCase, subdomainName);
+  updateSubdomainIfExists(appNameInLowerCase);
   cy.intercept({
     url: requestApis.signUp,
     times: 1