test(e2e): refactor skip mechanism (#4559)

wix · Aug 21, 2024 · 1036718 · 1036718
1 parent fc78018
commit 1036718
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 78 deletions.
diff --git a/detox/test/e2e/03.actions.test.js b/detox/test/e2e/03.actions.test.js
@@ -1,5 +1,4 @@
 const driver = require('./drivers/actions-driver').actionsScreenDriver;
-const custom = require('./utils/custom-it');
 
 describe('Actions', () => {
   beforeAll(async () => {
@@ -227,7 +226,7 @@ describe('Actions', () => {
     await expect(element(by.id('UniqueId007'))).toBeVisible();
   });
 
-  custom.it.skipFromRNVersion(71)('should adjust legacy slider and assert its value', async () => {
+  it('@rn71 should adjust legacy slider and assert its value', async () => {
     const reactSliderId = 'legacySliderWithASimpleID';
     await expect(element(by.id(reactSliderId))).toHaveSliderPosition(0.25);
     await element(by.id(reactSliderId)).adjustSliderToPosition(0.75);

diff --git a/detox/test/e2e/33.attributes.test.js b/detox/test/e2e/33.attributes.test.js
@@ -1,6 +1,5 @@
 const { device, element, by } = require('detox');
 const expect = require('expect').default;
-const custom = require('./utils/custom-it');
 
 describe('Attributes', () => {
   /** @type {Detox.IndexableNativeElement} */
@@ -157,7 +156,7 @@ describe('Attributes', () => {
     });
   });
 
-  custom.describe.skipFromRNVersion(71)('of a legacy slider', () => {
+  describe('of a legacy slider (@rn71)', () => {
     beforeAll(() => useMatcher(by.id('legacySliderId')));
 
     it(':ios: should have a string percent .value, and .normalizedSliderPosition', () => {

diff --git a/detox/test/e2e/35.overlay.test.js b/detox/test/e2e/35.overlay.test.js
@@ -1,5 +1,4 @@
 const { expectToThrow } = require('./utils/custom-expects');
-const custom = require('./utils/custom-it');
 
 describe(':ios: Overlay', () => {
   let showAlertButton;
@@ -55,11 +54,11 @@ describe(':ios: Overlay', () => {
         await dismissAlertButton.tap();
       });
 
-      custom.it.withFailureIf.iOSWithRNLessThan67('should be able to tap on elements', async () => {
+      it('should be able to tap on elements', async () => {
         await showOverlayWindowButton.tap();
       });
 
-      custom.it.withFailureIf.iOSWithRNLessThan67('should be able to scroll elements', async () => {
+      it('should be able to scroll elements', async () => {
         await verticalScrollView.scrollTo('bottom');
         await expect(showOverlayWindowButton).not.toBeVisible();
       });

diff --git a/detox/test/e2e/jest.config.js b/detox/test/e2e/jest.config.js
@@ -55,6 +55,7 @@ module.exports = async () => {
         'jest-metadata/environment-listener',
         'jest-allure2-reporter/environment-listener',
         require.resolve('detox-allure2-adapter'),
+        require.resolve('./utils/rnSkipper'),
       ]
     },
     'testRunner': './test/node_modules/jest-circus/runner',

diff --git a/detox/test/e2e/utils/custom-it.js b/detox/test/e2e/utils/custom-it.js
diff --git a/detox/test/e2e/utils/rnSkipper.js b/detox/test/e2e/utils/rnSkipper.js
@@ -0,0 +1,21 @@
+const rn = require('../../../src/utils/rn-consts/rn-consts').rnVersion.minor;
+
+/** @type {import('jest-environment-emit').EnvironmentListenerFn} */
+const listener = ({ testEvents }) => {
+  testEvents
+    .on('start_describe_definition', ({ event: { blockName }, state: { currentDescribeBlock }}) => {
+      const match = blockName.match(/@rn(\d+)/i);
+      if (match && match[1] != rn) {
+        currentDescribeBlock.mode = 'skip';
+      }
+    })
+    .on('add_test', ({ event: { testName }, state: { currentDescribeBlock }}) => {
+      const match = testName.match(/@rn(\d+)/i);
+      if (match && match[1] != rn) {
+        const n = currentDescribeBlock.children.length;
+        currentDescribeBlock.children[n - 1].mode = 'skip';
+      }
+    });
+};
+
+module.exports = listener;