xpath to ids

Author: CedricProfessionnel

cypress/integration/aws-test/export-aws.spec.js

@@ -1,10 +1,10 @@
-import enterCredentialsCognitoS3 from "../utils/credentials-test/enter-credentials-cognito-s3"
-import enterCredentialsUser from "../utils/credentials-test/enter-credentials-user"
 import commandSetLanguage from "../utils/cypress-command/set-language"
+import commandCredentialsAws from "../utils/cypress-command/credentials-aws"
 import goToImportPage from "../utils/go-to-import-page"
 import removeAWSFile from "../utils/remove-cypress-file-in-aws"
 
 commandSetLanguage()
+commandCredentialsAws()
 
 if (Cypress.env().AWS_IDENTITY_POOL_ID)
   describe("aws test", () => {
@@ -13,8 +13,7 @@ if (Cypress.env().AWS_IDENTITY_POOL_ID)
       cy.visit(`http://localhost:6001`)
       cy.wait(400)
       cy.setLanguage()
-      enterCredentialsCognitoS3()
-      enterCredentialsUser()
+      cy.createCredentialsAws()
       goToImportPage()
     })
 

cypress/integration/utils/credentials-test/enter-credentials-cognito-s3.js

@@ -1,4 +1,3 @@
-require("cypress-xpath")
 const enterCredentialsCognitoS3 = () => {
   cy.get('input[placeholder="XX-XXXX-X:XXXXXXXX-XXXX-1234-abcd-1234567890ab"]')
     .focus()
@@ -25,64 +24,24 @@ const enterCredentialsCognitoS3 = () => {
     .focus()
     .type(Cypress.env().COGNITO_USER_PASS_LENGTH)
   if (Cypress.env().COGNITO_USER_PASS_REQUIRE_LOWERCASE === "TRUE") {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[8]/div[3]/div/button[1]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireLowercaseYes"]').click().focus().blur()
   } else {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[8]/div[3]/div/button[2]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireLowercaseNo"]').click().focus().blur()
   }
   if (Cypress.env().COGNITO_USER_PASS_REQUIRE_UPPERCASE === "TRUE") {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[9]/div[3]/div/button[1]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireUppercaseYes"]').click().focus().blur()
   } else {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[9]/div[3]/div/button[2]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireUppercaseNo"]').click().focus().blur()
   }
   if (Cypress.env().COGNITO_USER_PASS_REQUIRE_NUMBER === "TRUE") {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[10]/div[3]/div/button[1]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireNumberYes"]').click().focus().blur()
   } else {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[10]/div[3]/div/button[2]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireNumberNo"]').click().focus().blur()
   }
   if (Cypress.env().COGNITO_USER_PASS_REQUIRE_SYMBOL === "TRUE") {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[11]/div[3]/div/button[1]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireSymbolYes"]').click().focus().blur()
   } else {
-    cy.xpath(
-      "./html/body/div[3]/div[3]/div/div[2]/div/div[2]/div[11]/div[3]/div/button[2]/span[1]/span/span[1]/input"
-    )
-      .click()
-      .focus()
-      .blur()
+    cy.get('input[id="RequireSymbolNo"]').click().focus().blur()
   }
 }
 

package.json

@@ -69,12 +69,10 @@
     "cypress-image-snapshot": "^3.1.1",
     "cypress-terminal-report": "^2.4.0",
     "electron": "^11.2.3",
-    "cypress-xpath": "^1.6.1",
     "electron-builder": "^22.8.0",
     "electron-builder-notarize": "^1.2.0",
     "eslint-plugin-cypress": "^2.11.2",
     "gh-pages": "^2.1.1",
-    "material-survey": "^1.0.40",
     "parcel": "^1.12.4",
     "prettier": "^2.2.1",
     "react": "^16.8.6",
@@ -110,6 +108,7 @@
     "jac-format": "^1.1.3",
     "js-md5": "^0.7.3",
     "mime-types": "^2.1.28",
+    "material-survey": "^1.0.41",
     "moment": "^2.24.0",
     "nan": "^2.14.1",
     "posthog-js": "^1.0.4",

src/components/AddAuthFromTemplateDialog/index.js

@@ -104,24 +104,28 @@ const forms = {
         title: "Require a lowercase letter in password",
         type: "boolean",
         isRequired: true,
+        id: "RequireLowercase",
       },
       {
         name: "auth.cognito.password.requireUppercase",
         title: "Require a uppercase letter in password",
         type: "boolean",
         isRequired: true,
+        id: "RequireUppercase",
       },
       {
         name: "auth.cognito.password.requireNumbers",
         title: "Require a number in password",
         type: "boolean",
         isRequired: true,
+        id: "RequireNumber",
       },
       {
         name: "auth.cognito.password.requireSymbols",
         title: "Require a symbol in password",
         type: "boolean",
         isRequired: true,
+        id: "RequireSymbol",
       },
     ],
   },

yarn.lock

@@ -14240,7 +14240,7 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-material-survey@^1.0.34, material-survey@^1.0.40:
+material-survey@^1.0.34:
   version "1.0.40"
   resolved "https://registry.yarnpkg.com/material-survey/-/material-survey-1.0.40.tgz#35c650826fe94d69a6c40e08a120abb51a40d03c"
   integrity sha512-im5elNvoetmsRaafw/92YAyBXalQKXAjBwJDnJiwV23z6GBZ4dcjdMrUkIGXxZRsFrdy2/yrap0haB6mfNUzSg==
@@ -14251,6 +14251,17 @@ material-survey@^1.0.34, material-survey@^1.0.40:
     react-select "^3.0.8"
     surveyjs-expression-eval "^1.0.2"
 
+material-survey@^1.0.41:
+  version "1.0.41"
+  resolved "https://registry.yarnpkg.com/material-survey/-/material-survey-1.0.41.tgz#6e9db6601aa991bda1175ea2e47b3692be925bd9"
+  integrity sha512-WlfMw2twMpZ9THevzPMaDsiTMrzA2SRK8ferhobRL1XHqwtG9MlMHpLzRxe2df54vJUMTk98JFASOO3sTNkCmg==
+  dependencies:
+    k-choice-sort "^1.0.9"
+    lodash "^4.17.11"
+    react-dropzone "^8.0.1"
+    react-select "^3.0.8"
+    surveyjs-expression-eval "^1.0.2"
+
 md5-hex@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"