[CI][Tests] Consolidate se23 tests (#10243)

### WHY are these changes introduced? Part of #10191 ### WHAT is this pull request doing? - Force test providers to `polarisSummerEditions2023: true`, this is temporary until we clean up the AppProvider - Delete `.github/workflows/ci.yml` - Rename `.github/workflows/ci-experimental.yml` to `.github/workflows/ci.yml` - Consolidate any tests that use the flag ### Tophat - Make sure there isn't an experimental CI check anymore and that CI passes
Shopify · Sep 18, 2023 · d091b9e · d091b9e
1 parent be90502
commit d091b9e
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 148 deletions.
diff --git a/.github/workflows/ci-experimental.yml b/.github/workflows/ci-experimental.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,9 +43,9 @@ jobs:
             **/.turbo
             node_modules/.cache/turbo
             polaris.shopify.com/.next/cache
-          key: ${{ runner.os }}-node${{ matrix.node-version }}-test-v2-${{ github.sha }}
+          key: ${{ runner.os }}-node${{ matrix.node-version }}-test-v3-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-node${{ matrix.node-version }}-test-v2-
+            ${{ runner.os }}-node${{ matrix.node-version }}-test-v3-
 
       - name: Install dependencies
         run: yarn --frozen-lockfile

diff --git a/...igation/components/Item/components/SecondaryNavigation/tests/SecondaryNavigation.test.tsx b/...igation/components/Item/components/SecondaryNavigation/tests/SecondaryNavigation.test.tsx
@@ -83,80 +83,69 @@ describe('<SecondaryNavigation />', () => {
       });
     });
 
-    describe('with polarisSummerEditions2023 feature flag enabled', () => {
-      it('renders Item with onMouseLeave and onMouseEnter undefined when the item is disabled', () => {
-        const mockPropsWithDisabledItem = {
-          ...mockProps,
-          subNavigationItems: [
-            mockProps.subNavigationItems[0],
-            mockProps.subNavigationItems[1],
-            {
-              ...mockProps.subNavigationItems[2],
-              disabled: true,
-            },
-          ],
-        };
-
-        const component = mountWithApp(
-          <SecondaryNavigation {...mockPropsWithDisabledItem} />,
+    it('renders Item with onMouseLeave and onMouseEnter undefined when the item is disabled', () => {
+      const mockPropsWithDisabledItem = {
+        ...mockProps,
+        subNavigationItems: [
+          mockProps.subNavigationItems[0],
+          mockProps.subNavigationItems[1],
           {
-            features: {polarisSummerEditions2023: true},
+            ...mockProps.subNavigationItems[2],
+            disabled: true,
           },
-        );
+        ],
+      };
 
-        expect(component.findAll(Item)[2]).toHaveReactProps({
-          onMouseEnter: undefined,
-          onMouseLeave: undefined,
-        });
+      const component = mountWithApp(
+        <SecondaryNavigation {...mockPropsWithDisabledItem} />,
+      );
+
+      expect(component.findAll(Item)[2]).toHaveReactProps({
+        onMouseEnter: undefined,
+        onMouseLeave: undefined,
       });
+    });
 
-      it('adds showVerticalHoverPointer prop to the hovered item', () => {
-        const component = mountWithApp(<SecondaryNavigation {...mockProps} />, {
-          features: {polarisSummerEditions2023: true},
-        });
+    it('adds showVerticalHoverPointer prop to the hovered item', () => {
+      const component = mountWithApp(<SecondaryNavigation {...mockProps} />);
 
-        const hoveredIndex = 2;
-        component.findAll(Item)[hoveredIndex].trigger('onMouseEnter');
+      const hoveredIndex = 2;
+      component.findAll(Item)[hoveredIndex].trigger('onMouseEnter');
 
-        component.findAll(Item).forEach((item, index) => {
-          expect(item).toHaveReactProps({
-            showVerticalHoverPointer: index === hoveredIndex,
-          });
+      component.findAll(Item).forEach((item, index) => {
+        expect(item).toHaveReactProps({
+          showVerticalHoverPointer: index === hoveredIndex,
         });
       });
+    });
 
-      it('adds showVerticalLine prop to all the Item components before the matched item', () => {
-        const component = mountWithApp(<SecondaryNavigation {...mockProps} />, {
-          features: {polarisSummerEditions2023: true},
-        });
+    it('adds showVerticalLine prop to all the Item components before the matched item', () => {
+      const component = mountWithApp(<SecondaryNavigation {...mockProps} />);
 
-        const indexWithMatchedItem = 1;
+      const indexWithMatchedItem = 1;
 
-        component.findAll(Item).forEach((item, index) => {
-          const shouldShowVerticalLine = index < indexWithMatchedItem;
-          expect(item).toHaveReactProps({
-            showVerticalLine: shouldShowVerticalLine,
-          });
+      component.findAll(Item).forEach((item, index) => {
+        const shouldShowVerticalLine = index < indexWithMatchedItem;
+        expect(item).toHaveReactProps({
+          showVerticalLine: shouldShowVerticalLine,
         });
       });
+    });
 
-      it('adds showVerticalLine prop to all the Item components before the hovered item when hovered item is before the matched item', () => {
-        const component = mountWithApp(<SecondaryNavigation {...mockProps} />, {
-          features: {polarisSummerEditions2023: true},
-        });
+    it('adds showVerticalLine prop to all the Item components before the hovered item when hovered item is before the matched item', () => {
+      const component = mountWithApp(<SecondaryNavigation {...mockProps} />);
 
-        // Make sure the hovered item is before the matched item
-        const hoveredIndex = 0;
-        component.findAll(Item)[hoveredIndex].trigger('onMouseEnter');
+      // Make sure the hovered item is before the matched item
+      const hoveredIndex = 0;
+      component.findAll(Item)[hoveredIndex].trigger('onMouseEnter');
 
-        const indexWithMatchedItem = 1;
+      const indexWithMatchedItem = 1;
 
-        component.findAll(Item).forEach((item, index) => {
-          const shouldShowVerticalLine = index < indexWithMatchedItem;
+      component.findAll(Item).forEach((item, index) => {
+        const shouldShowVerticalLine = index < indexWithMatchedItem;
 
-          expect(item).toHaveReactProps({
-            showVerticalLine: shouldShowVerticalLine,
-          });
+        expect(item).toHaveReactProps({
+          showVerticalLine: shouldShowVerticalLine,
         });
       });
     });

diff --git a/polaris-react/src/components/Navigation/components/Item/tests/Item.test.tsx b/polaris-react/src/components/Navigation/components/Item/tests/Item.test.tsx
@@ -162,7 +162,6 @@ describe('<Nav.Item />', () => {
       {
         location: 'foo',
       },
-      {features: {polarisSummerEditions2023: true}},
     );
 
     expect(item).toContainReactComponent(Icon, {
@@ -188,7 +187,6 @@ describe('<Nav.Item />', () => {
       {
         location: 'bar',
       },
-      {features: {polarisSummerEditions2023: true}},
     );
 
     expect(item).toContainReactComponent(Icon, {

diff --git a/polaris-react/src/components/OptionList/components/Option/tests/Option.test.tsx b/polaris-react/src/components/OptionList/components/Option/tests/Option.test.tsx
@@ -58,7 +58,6 @@ describe('<Option />', () => {
 
     const input = mountWithApp(
       <Option {...defaultProps} onClick={spy} allowMultiple />,
-      {features: {polarisSummerEditions2023: true}},
     ).find('input')!;
     input.trigger('onClick');
 

diff --git a/polaris-react/src/components/PolarisTestProvider/PolarisTestProvider.tsx b/polaris-react/src/components/PolarisTestProvider/PolarisTestProvider.tsx
@@ -67,7 +67,7 @@ export function PolarisTestProvider({
 
   const featuresConfig = useMemo(
     () => ({
-      polarisSummerEditions2023: false,
+      polarisSummerEditions2023: true,
       ...features,
     }),
     [features],

diff --git a/polaris-react/src/components/Tooltip/tests/Tooltip.test.tsx b/polaris-react/src/components/Tooltip/tests/Tooltip.test.tsx
@@ -359,7 +359,6 @@ describe('<Tooltip />', () => {
         <Tooltip content="Inner content">
           <Link>link content</Link>
         </Tooltip>,
-        {features: {polarisSummerEditions2023: true}},
       );
 
       findWrapperComponent(tooltip)!.trigger('onMouseOver');
@@ -510,26 +509,6 @@ describe('<Tooltip />', () => {
       });
     });
   });
-
-  // se23 - default border radius 1 replaced with 2
-  describe('polarisSummerEditions2023 false', () => {
-    it('renders content with the default border radius', () => {
-      const tooltip = mountWithApp(
-        <Tooltip content="Inner content">
-          <Link>link content</Link>
-        </Tooltip>,
-        {features: {polarisSummerEditions2023: false}},
-      );
-
-      findWrapperComponent(tooltip)!.trigger('onMouseOver');
-
-      expect(tooltip.find(TooltipOverlay)).toContainReactComponent('div', {
-        style: expect.objectContaining({
-          '--pc-tooltip-border-radius': 'var(--p-border-radius-1)',
-        }) as React.CSSProperties,
-      });
-    });
-  });
 });
 
 function findWrapperComponent(tooltip: any) {

diff --git a/polaris-react/tests/utilities/react-testing.tsx b/polaris-react/tests/utilities/react-testing.tsx
@@ -27,7 +27,7 @@ export const mountWithApp = createMount<
       <PolarisTestProvider
         i18n={translations}
         features={{
-          polarisSummerEditions2023: process.env.SE23 === 'on',
+          polarisSummerEditions2023: true,
           ...features,
         }}
         {...rest}