fix: fix variables test to work for IOx (#6572)

* fix: separate iox and tsm tests for variables

* fix: update iox env var and flip on ff when testing tsm and iox

* fix: don't skip tsm test even in iox

* chore: clean up

* chore: test for variables tab being hidden in iox

* chore: update variable name to shouldShowVariables

Author: blegesse-w

cypress/e2e/shared/variables.test.ts

@@ -1,29 +1,40 @@
 import {Organization} from '../../../src/types'
 
-describe.skip('Variables', () => {
+const isIOxOrg = Boolean(Cypress.env('useIox'))
+const isTSMOrg = !isIOxOrg
+
+const setupTest = (shouldShowVariables: boolean = true) => {
+  cy.flush().then(() =>
+    cy.signin().then(() =>
+      cy
+        .setFeatureFlags({
+          showVariablesInNewIOx: shouldShowVariables,
+          schemaComposition: true,
+        })
+        .then(() =>
+          cy.get('@org').then(({id}: Organization) => {
+            cy.createQueryVariable(id)
+            // cy.wait($time) is necessary to consistently ensure sufficient time for the feature flag override.
+            // The flag reset happens via redux, (it's not a network request), so we can't cy.wait($intercepted_route).
+            cy.visit(`orgs/${id}/settings/variables`)
+            cy.wait(1200)
+            cy.location('pathname').should('match', /\/variables$/)
+          })
+        )
+    )
+  )
+}
+
+describe('Variables - TSM', () => {
   beforeEach(() => {
-    cy.flush()
-    cy.signin()
-    cy.get('@org').then(({id}: Organization) => {
-      cy.createQueryVariable(id)
-      cy.visit(`orgs/${id}/settings/variables`)
-      cy.getByTestID('tree-nav')
-    })
-    // Double check that the new schemaComposition flag does not interfere.
-    cy.setFeatureFlags({
-      schemaComposition: true,
-    })
-    // cy.wait($time) is necessary to consistently ensure sufficient time for the feature flag override.
-    // The flag reset happens via redux, (it's not a network request), so we can't cy.wait($intercepted_route).
-    cy.wait(1200)
-    cy.location('pathname').should('match', /\/variables$/)
+    setupTest()
   })
 
   it('can CRUD a CSV, upload, map, and query variable and search for variables based on names', () => {
     // Navigate away from and back to variables index using the nav bar
-    cy.clickNavBarItem('nav-item-dashboards')
+    cy.clickNavBarItem('nav-item-data-explorer')
     cy.clickNavBarItem('nav-item-settings')
-    cy.getByTestID('templates--tab').click()
+    cy.getByTestID('labels--tab').click()
     cy.getByTestID('variables--tab').click()
 
     cy.getByTestID('resource-card variable').should('have.length', 1)
@@ -87,9 +98,9 @@ describe.skip('Variables', () => {
 
       const lastMapItem = 'Mila Emile,"o61AhpOGr5aO3cYVArC0"'
       cy.get('textarea').type(`Juanito MacNeil,"5TKl6l8i4idg15Fxxe4P"
-      Astrophel Chaudhary,"bDhZbuVj5RV94NcFXZPm"
-      Ochieng Benes,"YIhg6SoMKRUH8FMlHs3V"
-      ${lastMapItem}`)
+                  Astrophel Chaudhary,"bDhZbuVj5RV94NcFXZPm"
+                  Ochieng Benes,"YIhg6SoMKRUH8FMlHs3V"
+                  ${lastMapItem}`)
 
       cy.getByTestID('map-variable-dropdown--button').click()
       cy.contains(lastMapItem).click()
@@ -158,7 +169,7 @@ describe.skip('Variables', () => {
     cy.getByInputName('name').type(mapVariableName)
 
     cy.get('textarea').type(`Astrophel Chaudhary,"bDhZbuVj5RV94NcFXZPm"
-      Ochieng Benes,"YIhg6SoMKRUH8FMlHs3V"`)
+                  Ochieng Benes,"YIhg6SoMKRUH8FMlHs3V"`)
 
     cy.getByTestID('map-variable-dropdown--button').click().last().click()
 
@@ -412,3 +423,14 @@ describe.skip('Variables', () => {
       .contains(thirdVariableName)
   })
 })
+
+describe('Variables - IOx', () => {
+  it('routes to 404 page when IOx user attempts to access variables', () => {
+    cy.skipOn(isTSMOrg)
+    const shouldShowVariables = false
+    setupTest(shouldShowVariables)
+    cy.contains('404: Page Not Found')
+    cy.clickNavBarItem('nav-item-settings')
+    cy.getByTestID('variables--tab').should('not.exist')
+  })
+})