Merge pull request #479 from CedricProfessionnel/credentialsTest

CedricProfessionnel · web-flow · commit 0c5ddb99266a · 2021-03-18T14:22:28.000-04:00
Credentials test (Feature Aws Part)
diff --git a/cypress/integration/aws-test/credentials.spec.js b/cypress/integration/aws-test/credentials.spec.js
@@ -0,0 +1,27 @@
+import enterCredentialsCognitoS3 from "../utils/credentials-test/enter-credentials-cognito-s3"
+import enterCredentialsUser from "../utils/credentials-test/enter-credentials-user"
+import commandLocalStorage from "../utils/cypress-command/local-storage"
+import commandSetLanguage from "../utils/cypress-command/set-language"
+commandLocalStorage()
+commandSetLanguage()
+
+Cypress.config("defaultCommandTimeout", 3000)
+if (Cypress.env().AWS_IDENTITY_POOL_ID)
+  describe("Credentials test", () => {
+    before("Prepare tests", () => {
+      cy.log("should be able to join the web site")
+      cy.visit(`http://localhost:6001`)
+      cy.setLanguage("en")
+    })
+
+    beforeEach("Restore local storage", () => {
+      cy.restoreLocalStorage()
+    })
+
+    enterCredentialsCognitoS3()
+    enterCredentialsUser()
+
+    afterEach("Save local storage", () => {
+      cy.saveLocalStorage()
+    })
+  })
diff --git a/cypress/integration/aws-test/export-aws.spec.js b/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()
     })
 
diff --git a/cypress/integration/utils/credentials-test/enter-credentials-cognito-s3.js b/cypress/integration/utils/credentials-test/enter-credentials-cognito-s3.js
@@ -1,57 +1,58 @@
 const enterCredentialsCognitoS3 = () => {
-  var credentials = Cypress.env()
   cy.get('input[placeholder="XX-XXXX-X:XXXXXXXX-XXXX-1234-abcd-1234567890ab"]')
     .focus()
-    .type(credentials.AWS_IDENTITY_POOL_ID)
+    .type(Cypress.env().AWS_IDENTITY_POOL_ID)
   cy.get('input[placeholder="XX-XXXX-X"]')
     .first()
     .focus()
-    .type(credentials.AWS_AUTH_REGION)
+    .type(Cypress.env().AWS_AUTH_REGION)
   cy.get('input[placeholder="XX-XXXX-X_12ab34cd9"]')
     .focus()
-    .type(credentials.AWS_USER_POOL_ID)
+    .type(Cypress.env().AWS_USER_POOL_ID)
   cy.get('input[placeholder="26-char alphanumeric string"]')
     .focus()
-    .type(credentials.AWS_USER_POOL_WEB_CLIENT_ID)
+    .type(Cypress.env().AWS_USER_POOL_WEB_CLIENT_ID)
   cy.get('input[placeholder="Name of the bucket"]')
     .focus()
-    .type(credentials.AWS_STORAGE_BUCKET)
+    .type(Cypress.env().AWS_STORAGE_BUCKET)
   cy.get('input[placeholder="XX-XXXX-X"]')
     .last()
     .focus()
-    .type(credentials.AWS_STORAGE_REGION)
+    .type(Cypress.env().AWS_STORAGE_REGION)
   cy.get('input[class="MuiInputBase-input MuiInput-input"]')
     .last()
     .focus()
-    .type(credentials.COGNITO_USER_PASS_LENGTH)
-  if (credentials.COGNITO_USER_PASS_REQUIRE_LOWERCASE == "TRUE") {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(0).click()
+    .type(Cypress.env().COGNITO_USER_PASS_LENGTH)
+  if (Cypress.env().COGNITO_USER_PASS_REQUIRE_LOWERCASE === "TRUE") {
+    cy.get('input[id="RequireLowercaseYes"]').click().focus().blur()
   } else {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(1).click()
+    cy.get('input[id="RequireLowercaseNo"]').click().focus().blur()
   }
-  if (credentials.COGNITO_USER_PASS_REQUIRE_UPPERCASE == "TRUE") {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(2).click()
+  if (Cypress.env().COGNITO_USER_PASS_REQUIRE_UPPERCASE === "TRUE") {
+    cy.get('input[id="RequireUppercaseYes"]').click().focus().blur()
   } else {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(3).click()
+    cy.get('input[id="RequireUppercaseNo"]').click().focus().blur()
   }
-  if (credentials.COGNITO_USER_PASS_REQUIRE_NUMBER == "TRUE") {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(4).click()
+  if (Cypress.env().COGNITO_USER_PASS_REQUIRE_NUMBER === "TRUE") {
+    cy.get('input[id="RequireNumberYes"]').click().focus().blur()
   } else {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(5).click()
+    cy.get('input[id="RequireNumberNo"]').click().focus().blur()
   }
-  if (credentials.COGNITO_USER_PASS_REQUIRE_SYMBOL == "TRUE") {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(6).click()
+  if (Cypress.env().COGNITO_USER_PASS_REQUIRE_SYMBOL === "TRUE") {
+    cy.get('input[id="RequireSymbolYes"]').click().focus().blur()
   } else {
-    cy.get('input[class="PrivateSwitchBase-input-65"]').eq(7).click()
+    cy.get('input[id="RequireSymbolNo"]').click().focus().blur()
   }
 }
 
 const test = () => {
-  cy.log("should be able to set s3 config")
-  cy.contains("Add Authentification").click()
-  cy.contains("AWS - Cognito").click()
-  enterCredentialsCognitoS3()
-  cy.contains("Complete").click()
+  it("Enter credentials cognito-s3", () => {
+    cy.log("should be able to set s3 config")
+    cy.contains("Add Authentification").click()
+    cy.contains("AWS - Cognito").click()
+    enterCredentialsCognitoS3()
+    cy.contains("Complete").click()
+  })
 }
 
 export default test
diff --git a/cypress/integration/utils/credentials-test/enter-credentials-user.js b/cypress/integration/utils/credentials-test/enter-credentials-user.js
@@ -1,14 +1,14 @@
 const enterCredentialsUser = () => {
-  var credentials = Cypress.env()
-  cy.get('input[id="username"]').focus().type(credentials.COGNITO_USER_NAME)
-  cy.get('input[id="password"]').focus().type(credentials.COGNITO_USER_PASS)
+  cy.get('input[id="username"]').focus().type(Cypress.env().COGNITO_USER_NAME)
+  cy.get('input[id="password"]').focus().type(Cypress.env().COGNITO_USER_PASS)
 }
 const test = () => {
-  cy.log("should be able to set user cognito config")
-  cy.contains("Cognito").click()
-  enterCredentialsUser()
-  cy.get(
-    'button[class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-70 MuiButton-containedPrimary MuiButton-fullWidth"]'
-  ).click()
+  it("Enter credentials user cognito", () => {
+    cy.log("should be able to set user cognito config")
+    cy.contains("Cognito").click()
+    enterCredentialsUser()
+    cy.get("button[id='sign-in']").click()
+    cy.get("button[id='sign-in']", { timeout: 30000 }).should("not.exist")
+  })
 }
 export default test
diff --git a/package.json b/package.json
@@ -73,7 +73,6 @@
     "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",
@@ -109,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",
diff --git a/src/components/AddAuthFromTemplateDialog/index.js b/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",
       },
     ],
   },
diff --git a/src/components/LoginDrawer/SignIn.js b/src/components/LoginDrawer/SignIn.js
@@ -134,6 +134,7 @@ export default ({ onRequireCompleteSignUp }) => {
           variant="contained"
           color="primary"
           className={classes.submit}
+          id="sign-in"
         >
           {t("sign-in")}
         </Button>
diff --git a/yarn.lock b/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"

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ export default ({ onRequireCompleteSignUp }) => {`
`134`	`134`	`variant="contained"`
`135`	`135`	`color="primary"`
`136`	`136`	`className={classes.submit}`
	`137`	`+ id="sign-in"`
`137`	`138`	`>`
`138`	`139`	`{t("sign-in")}`
`139`	`140`	`</Button>`