feat: add fixtures for create-org e2e test updates (#6401)

wdoconnell · web-flow · commit c44344bc10b8 · 2022-12-15T18:50:11.000Z
* e2e test updates for create-org

* chore: save createOrg test changes for second PR
diff --git a/cypress/e2e/cloud/globalHeaderOrgMenuItems.test.ts b/cypress/e2e/cloud/globalHeaderOrgMenuItems.test.ts
@@ -39,7 +39,7 @@ describe('FREE: global header menu items test', () => {
     Cypress.Cookies.preserveOnce('sid')
 
     makeQuartzUseIDPEOrgID(idpeOrgID)
-    getOrgCreationAllowance('createOrgAllowance')
+    getOrgCreationAllowance('createOrg/allowanceFreeFalse')
 
     cy.visit('/')
   })
@@ -78,7 +78,7 @@ describe('PAYG: global header menu items test', () => {
 
   beforeEach(() => {
     makeQuartzUseIDPEOrgID(idpeOrgID, 'pay_as_you_go')
-    getOrgCreationAllowance('createOrgAllowancePAYG')
+    getOrgCreationAllowance('createOrg/allowancePAYGTrue')
 
     cy.visit('/')
   })
@@ -117,7 +117,7 @@ describe('Contract: global header menu items test', () => {
 
   beforeEach(() => {
     makeQuartzUseIDPEOrgID(idpeOrgID, 'contract')
-    getOrgCreationAllowance('createOrgAllowanceContract')
+    getOrgCreationAllowance('createOrg/allowanceContractTrue')
 
     cy.visit('/')
   })
diff --git a/cypress/fixtures/createOrg/allowanceContractFalse.json b/cypress/fixtures/createOrg/allowanceContractFalse.json
@@ -0,0 +1,4 @@
+{
+  "allowed": false,
+  "availableUpgrade": "none"
+}
diff --git a/cypress/fixtures/createOrg/allowanceContractTrue.json b/cypress/fixtures/createOrg/allowanceContractTrue.json
diff --git a/cypress/fixtures/createOrg/allowanceFreeFalse.json b/cypress/fixtures/createOrg/allowanceFreeFalse.json
diff --git a/cypress/fixtures/createOrg/allowanceFreeTrue.json b/cypress/fixtures/createOrg/allowanceFreeTrue.json
@@ -0,0 +1,4 @@
+{
+  "allowed": true,
+  "availableUpgrade": "pay_as_you_go"
+}
diff --git a/cypress/fixtures/createOrg/allowancePAYGFalse.json b/cypress/fixtures/createOrg/allowancePAYGFalse.json
@@ -0,0 +1,4 @@
+{
+  "allowed": false,
+  "availableUpgrade": "contract"
+}
diff --git a/cypress/fixtures/createOrg/allowancePAYGTrue.json b/cypress/fixtures/createOrg/allowancePAYGTrue.json
diff --git a/cypress/fixtures/createOrg/clusters.json b/cypress/fixtures/createOrg/clusters.json
@@ -0,0 +1,74 @@
+[
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 2,
+    "providerId": "AWS",
+    "providerName": "Amazon Web Services",
+    "regionId": "ap-southeast-2",
+    "regionName": "Asia Pacific (Australia)"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 4,
+    "providerId": "AWS",
+    "providerName": "Amazon Web Services",
+    "regionId": "eu-central-1",
+    "regionName": "EU Frankfurt"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 1,
+    "providerId": "AWS",
+    "providerName": "Amazon Web Services",
+    "regionId": "us-east-1",
+    "regionName": "US East (N. Virginia)"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 3,
+    "providerId": "AWS",
+    "providerName": "Amazon Web Services",
+    "regionId": "us-west-2-2",
+    "regionName": "US West (Oregon)"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 1,
+    "providerId": "Azure",
+    "providerName": "Microsoft Azure",
+    "regionId": "eastus",
+    "regionName": "Virginia"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 2,
+    "providerId": "Azure",
+    "providerName": "Microsoft Azure",
+    "regionId": "westeurope",
+    "regionName": "Amsterdam"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 1,
+    "providerId": "GCP",
+    "providerName": "Google Cloud",
+    "regionId": "eu-west1",
+    "regionName": "Belgium"
+  },
+  {
+    "isProviderAvailable": true,
+    "isRegionAvailable": true,
+    "priority": 2,
+    "providerId": "GCP",
+    "providerName": "Google Cloud",
+    "regionId": "us-central1",
+    "regionName": "Iowa"
+  }
+]
diff --git a/cypress/fixtures/createOrg/orgContract.json b/cypress/fixtures/createOrg/orgContract.json
@@ -0,0 +1,11 @@
+{
+  "clusterHost": "https://aws-local.aws.cloud2.influxdata.com",
+  "creationDate": "12/12/2022",
+  "description": "",
+  "id": "213901",
+  "name": "A New Org",
+  "provider": "AWS",
+  "regionCode": "aws-local",
+  "regionName": "aws-local region",
+  "state": "provisioned"
+}
diff --git a/cypress/fixtures/createOrg/orgFree.json b/cypress/fixtures/createOrg/orgFree.json
@@ -0,0 +1,11 @@
+{
+  "clusterHost": "https://aws-local.aws.cloud2.influxdata.com",
+  "creationDate": "12/12/2022",
+  "description": "",
+  "id": "213901",
+  "name": "A New Org",
+  "provider": "GCP",
+  "regionCode": "iowa-local",
+  "regionName": "Iowa",
+  "state": "provisioned"
+}
diff --git a/cypress/fixtures/createOrg/orgPAYG.json b/cypress/fixtures/createOrg/orgPAYG.json
@@ -0,0 +1,11 @@
+{
+  "clusterHost": "https://aws-local.aws.cloud2.influxdata.com",
+  "creationDate": "12/12/2022",
+  "description": "",
+  "id": "213901",
+  "name": "A New Org",
+  "provider": "Azure",
+  "regionCode": "azure-local",
+  "regionName": "azure-local region",
+  "state": "provisioned"
+}
diff --git a/cypress/fixtures/createOrg/orgsBaseState.json b/cypress/fixtures/createOrg/orgsBaseState.json
@@ -0,0 +1,32 @@
+[
+  {
+    "id": "9296169091c64567",
+    "name": "E2E Test Organization",
+    "isDefault": true,
+    "isActive": true,
+    "provider": "AWS",
+    "regionCode": "us-east-1",
+    "regionName": "US East (N. Virginia)",
+    "state": "provisioned"
+  },
+  {
+    "id": "1254a0085d2af2cc",
+    "name": "Pending Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "AWS",
+    "regionCode": "us-east-1-2",
+    "regionName": "US East (N. Virginia) 2",
+    "state": "pending"
+  },
+  {
+    "id": "2f4ed71522a4a0ff",
+    "name": "Suspended Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "westeurope",
+    "regionName": "Amsterdam",
+    "state": "suspended"
+  }
+]
diff --git a/cypress/fixtures/createOrg/orgsUpdatedStateContract.json b/cypress/fixtures/createOrg/orgsUpdatedStateContract.json
@@ -0,0 +1,43 @@
+[
+  {
+    "id": "9296169091c64567",
+    "name": "E2E Test Organization",
+    "isDefault": true,
+    "isActive": true,
+    "provider": "AWS",
+    "regionCode": "us-east-1",
+    "regionName": "US East (N. Virginia)",
+    "state": "provisioned"
+  },
+  {
+    "id": "1254a0085d2af2cc",
+    "name": "Pending Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "AWS",
+    "regionCode": "us-east-1-2",
+    "regionName": "US East (N. Virginia) 2",
+    "state": "pending"
+  },
+  {
+    "id": "2f4ed71522a4a0ff",
+    "name": "Suspended Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "westeurope",
+    "regionName": "Amsterdam",
+    "state": "suspended"
+  },
+  {
+    "clusterHost": "https://aws-local.aws.cloud2.influxdata.com",
+    "creationDate": "12/12/2022",
+    "description": "",
+    "id": "213901",
+    "name": "A New Org",
+    "provider": "AWS",
+    "regionCode": "aws-local",
+    "regionName": "aws-local region",
+    "state": "provisioned"
+  }
+]
diff --git a/cypress/fixtures/createOrg/orgsUpdatedStateFree.json b/cypress/fixtures/createOrg/orgsUpdatedStateFree.json
@@ -0,0 +1,43 @@
+[
+  {
+    "id": "9296169091c64567",
+    "name": "E2E Test Organization",
+    "isDefault": true,
+    "isActive": true,
+    "provider": "AWS",
+    "regionCode": "us-east-1",
+    "regionName": "US East (N. Virginia)",
+    "state": "provisioned"
+  },
+  {
+    "id": "1254a0085d2af2cc",
+    "name": "Pending Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "AWS",
+    "regionCode": "us-east-1-2",
+    "regionName": "US East (N. Virginia) 2",
+    "state": "pending"
+  },
+  {
+    "id": "2f4ed71522a4a0ff",
+    "name": "Suspended Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "westeurope",
+    "regionName": "Amsterdam",
+    "state": "suspended"
+  },
+  {
+    "clusterHost": "https://aws-local.aws.cloud2.influxdata.com",
+    "creationDate": "12/12/2022",
+    "description": "",
+    "id": "213901",
+    "name": "A New Org",
+    "provider": "GCP",
+    "regionCode": "iowa-local",
+    "regionName": "Iowa",
+    "state": "provisioned"
+  }
+]
diff --git a/cypress/fixtures/createOrg/orgsUpdatedStatePAYG.json b/cypress/fixtures/createOrg/orgsUpdatedStatePAYG.json
@@ -0,0 +1,43 @@
+[
+  {
+    "id": "9296169091c64567",
+    "name": "E2E Test Organization",
+    "isDefault": true,
+    "isActive": true,
+    "provider": "AWS",
+    "regionCode": "us-east-1",
+    "regionName": "US East (N. Virginia)",
+    "state": "provisioned"
+  },
+  {
+    "id": "1254a0085d2af2cc",
+    "name": "Pending Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "AWS",
+    "regionCode": "us-east-1-2",
+    "regionName": "US East (N. Virginia) 2",
+    "state": "pending"
+  },
+  {
+    "id": "2f4ed71522a4a0ff",
+    "name": "Suspended Organization",
+    "isDefault": false,
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "westeurope",
+    "regionName": "Amsterdam",
+    "state": "suspended"
+  },
+  {
+    "clusterHost": "https://aws-local.aws.cloud2.influxdata.com",
+    "creationDate": "12/12/2022",
+    "description": "",
+    "id": "213901",
+    "name": "A New Org",
+    "provider": "Azure",
+    "regionCode": "azure-local",
+    "regionName": "azure-local region",
+    "state": "provisioned"
+  }
+]
diff --git a/cypress/fixtures/multiOrgIdentity.json b/cypress/fixtures/multiOrgIdentity.json
@@ -19,6 +19,7 @@
     "name": "Influx",
     "type": "free",
     "accountCreatedAt": "Tue Jun 01 2022 08:49:14 GMT-0400 (Eastern Daylight Time)",
-    "billing_provider": "zuora"
+    "billing_provider": "zuora",
+    "isUpgradeable": true
   }
 }
diff --git a/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/CreateOrgInput.tsx b/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/CreateOrgInput.tsx
@@ -42,12 +42,13 @@ export const CreateOrgInput: FC<Props> = ({
       >
         <Form.HelpText text="You may want to create separate organizations for each team, server region, or dev environment." />
         <Input
-          size={ComponentSize.Medium}
           onChange={handleInputChange}
-          value={orgName}
+          placeholder="Dev Team, US Eastern Region, Staging"
           required={true}
           status={showError ? ComponentStatus.Error : ComponentStatus.Default}
-          placeholder="Dev Team, US Eastern Region, Staging"
+          size={ComponentSize.Medium}
+          testID="create-org-overlay--createorg-input"
+          value={orgName}
         />
       </Form.Element>
       {!showError && (
diff --git a/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/CreateOrganizationOverlay.tsx b/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/CreateOrganizationOverlay.tsx
@@ -361,7 +361,7 @@ export const CreateOrganizationOverlay: FC = () => {
         />
         <Button
           text="Create Organization"
-          testID="create-org-form-submit"
+          testID="create-org-form--submit"
           color={ComponentColor.Primary}
           status={createOrgButtonStatus}
           onClick={handleCreateOrg}
diff --git a/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/ProviderCards.tsx b/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/ProviderCards.tsx
@@ -55,6 +55,7 @@ export const ProviderCards: FC<Props> = ({
           direction={FlexDirection.Column}
           stretchToFitWidth={true}
           className="create-org-overlay--provider-box"
+          testID={`create-org-overlay--${currentProvider}`}
         >
           <div className="create-org-overlay--provider-box-logo">
             {providerLogosLarge[currentProvider]}
@@ -75,6 +76,7 @@ export const ProviderCards: FC<Props> = ({
               onClick={handleSelectProvider}
               label={providerName}
               selected={providerId === currentProvider}
+              testID={`create-org-overlay--select-${providerId}-card`}
             >
               {providerLogosSmall[providerId]}
             </SelectableCard>
diff --git a/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/RegionDropdown.tsx b/src/identity/components/GlobalHeader/GlobalHeaderDropdown/CreateOrganization/RegionDropdown.tsx
@@ -33,7 +33,7 @@ export const RegionDropdown: FC<Props> = ({
   )
 
   const menu = (onCollapse: () => void) => (
-    <Dropdown.Menu onCollapse={onCollapse}>
+    <Dropdown.Menu onCollapse={onCollapse} testID="region-list-dropdown">
       {regions.map((cluster: Cluster) => (
         <Dropdown.Item
           key={cluster.regionId}
diff --git a/src/identity/components/MarketoAccountUpgradeOverlay.tsx b/src/identity/components/MarketoAccountUpgradeOverlay.tsx
@@ -245,6 +245,7 @@ export const MarketoAccountUpgradeOverlay: FC = () => {
           name="Upgrade Account Comments"
           onChange={handleComment}
           placeholder="Please provide any comments for our sales team"
+          testID="marketo-account-upgrade-form--userinput"
           type={InputType.Text}
           value={formComment}
         ></Input>
diff --git a/src/identity/components/OrganizationListTab/OrgBannerPanel.tsx b/src/identity/components/OrganizationListTab/OrgBannerPanel.tsx
@@ -49,7 +49,10 @@ export const OrgBannerPanel: FC<OrgAllowance> = ({
         hideMobileIcon={true}
         icon={IconFont.Info_New}
       >
-        <FlexBox className="account-settings-page-org-tab--upgrade-banner-text">
+        <FlexBox
+          className="account-settings-page-org-tab--upgrade-banner-text"
+          testID="account-settings-page-org-tab--upgrade-banner-text"
+        >
           <>You've reached the organization quota for this account. &nbsp;</>
           <a
             onClick={handleUpgradeAccount}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "allowed": false,
 +  "availableUpgrade": "none"
 +}