fix test errors, dataset as part of Product yaml, positive assertion …

…for request access button

e2e/cypress/fixtures/tthidden-jwt.yml

@@ -67,12 +67,13 @@ record_publish_date: '2021-05-27'
 ---
 kind: Product
 name: Two Tiered Hidden Product
-appId: 'KFH78YU956RE'
+appId: 'LFH78YU956RE'
+dataset: two-tier-service-dataset
 environments:
   - name: dev
     active: true
     approval: false
     flow: kong-api-key-acl
-    appId: '406CB7CF'
+    appId: '506CB7CF'
     services: [two-tier-service-dev]
 

e2e/cypress/fixtures/tthidden-key-auth.yml

@@ -51,11 +51,12 @@ record_publish_date: '2021-05-27'
 ---
 kind: Product
 name: Two Tiered Hidden Product
-appId: 'KFH78YU956RE'
+appId: 'LFH78YU956RE'
+dataset: two-tier-service-dataset
 environments:
   - name: dev
     active: true
     approval: false
     flow: kong-api-key-acl
-    appId: '406CB7CF'
+    appId: '506CB7CF'
     services: [two-tier-service-dev]

e2e/cypress/pageObjects/apiDirectory.ts

@@ -115,7 +115,12 @@ class ApiDirectoryPage {
   checkTwoTieredIcon(productName: string) {
     const pname: string = productName.toLowerCase().replaceAll(' ', '-')
     var ele: string = `[data-testid=two-tiered-icon-${pname}]`
-    cy.get(ele).should('not.exist')
+    cy.get(ele).should('exist')
+  }
+
+  checkTwoTieredHiddenButton() {
+    var ele: string = '[data-testid=request-access-button-two-tiered-hidden]'
+    cy.get(ele).should('exist')
   }
 
   addOrganizationAndOrgUnit(product: any) {

e2e/cypress/tests/09-update-product-env/09-two-tiered-hidden.cy.ts

@@ -77,21 +77,13 @@ describe('Verify Two Tiered Hidden', () => {
     })
   })
 
-  it('set the Dataset for the Product', () => {
-    cy.visit(pd.path)
-    cy.get('@apiowner').then(({ twoTieredHidden }: any) => {
-      pd.updateDatasetNameToCatelogue(twoTieredHidden.product.name, twoTieredHidden.product.environment.name)
-    })
-  })
-
   it('Verify that product is formatted correctly in public directory', () => {
     cy.visit(apiDir.path)
     cy.get('@apiowner').then(({ twoTieredHidden }: any) => {
       let product = twoTieredHidden.product
       apiDir.selectProduct(product.serviceName)
-      cy.get(apiDir.rqstAccessBtn).should('exist')
       apiDir.checkProductIcon(product.name, 'RiEarthFill')
-      apiDir.checkTwoTieredIcon(product.name)
+      apiDir.checkTwoTieredHiddenButton()
     })
   })
 
@@ -101,9 +93,8 @@ describe('Verify Two Tiered Hidden', () => {
     cy.get('@apiowner').then(({ twoTieredHidden }: any) => {
       let product = twoTieredHidden.product
       apiDir.selectProduct(product.serviceName)
-      cy.get(apiDir.rqstAccessBtn).should('exist')
       apiDir.checkProductIcon(product.name, 'RiEarthFill')
-      apiDir.checkTwoTieredIcon(product.name)
+      apiDir.checkTwoTieredHiddenButton()
     })
   })
 
@@ -118,9 +109,8 @@ describe('Verify Two Tiered Hidden', () => {
     cy.get('@apiowner').then(({ twoTieredHidden }: any) => {
       let product = twoTieredHidden.product
       apiDir.selectProduct(product.serviceName)
-      cy.get(apiDir.rqstAccessBtn).should('exist')
       apiDir.checkProductIcon(product.name, 'RiEarthFill')
-      apiDir.checkTwoTieredIcon(product.name)
+      apiDir.checkTwoTieredHiddenButton()
     })
   })
 
@@ -130,9 +120,8 @@ describe('Verify Two Tiered Hidden', () => {
     cy.get('@apiowner').then(({ twoTieredHidden }: any) => {
       let product = twoTieredHidden.product
       apiDir.selectProduct(product.serviceName)
-      cy.get(apiDir.rqstAccessBtn).should('exist')
       apiDir.checkProductIcon(product.name, 'RiEarthFill')
-      apiDir.checkTwoTieredIcon(product.name)
+      apiDir.checkTwoTieredHiddenButton()
     })
   })
 

src/nextapp/components/access-request-form/access-request-dialog.tsx

@@ -38,6 +38,7 @@ interface AccessRequestDialogProps {
   preview: boolean;
   open?: boolean;
   variant?: 'inline' | 'button';
+  dataTestId?: string;
 }
 
 const AccessRequestDialog: React.FC<AccessRequestDialogProps> = ({
@@ -48,6 +49,7 @@ const AccessRequestDialog: React.FC<AccessRequestDialogProps> = ({
   preview,
   open,
   variant,
+  dataTestId,
 }) => {
   const client = useQueryClient();
   const auth = useAuth();
@@ -165,7 +167,7 @@ const AccessRequestDialog: React.FC<AccessRequestDialogProps> = ({
         <Button
           disabled={disabled}
           onClick={onOpen}
-          data-testid="request-access-button"
+          data-testid={dataTestId ? dataTestId : "request-access-button"}
           variant={isInline ? 'link' : 'primary'}
           fontWeight="600"
           color="white"

src/nextapp/components/api-product-item/api-product-item.tsx

@@ -82,6 +82,11 @@ const ApiProductItem: React.FC<ApiProductItemProps> = ({
             id={id}
             name={data.name}
             preview={preview}
+            dataTestId={
+              isTieredHidden
+                ? 'request-access-button-two-tiered-hidden'
+                : 'request-access-button'
+            }
           />
         ) : null}
       </Flex>