Merge pull request #291 from dhis2/Fix_networkshim_getFeatureName_util

examples/testing-network-shim-app/package.json

@@ -14,6 +14,9 @@
         "react-scripts": "4.0.1",
         "web-vitals": "^0.2.4"
     },
+    "devDependencies": {
+        "cypress": "^8.2"
+    },
     "scripts": {
         "serve": "json-server src/json-server/db.js --routes ./src/json-server/routes.json --middlewares ../../node_modules/json-server-reset --watch -p 1337",
         "start": "react-scripts start",

package.json

@@ -29,7 +29,10 @@
         "docs:start": "d2-utils-docsite serve ./docs -o ./dist",
         "build": "yarn workspace @dhis2/cypress-commands build",
         "watch": "yarn workspace @dhis2/cypress-commands build --watch",
-        "test": "jest",
+        "test": "yarn test:cli && yarn test:commands && yarn test:plugins",
+        "test:cli": "yarn workspace @dhis2/cli-utils-cypress test",
+        "test:commands": "yarn workspace @dhis2/cypress-commands test",
+        "test:plugins": "exit 0 # no tests yet",
         "test:network-shim-app": "yarn workspace testing-network-shim-app cy:capture-and-stub",
         "test:platform-app": "yarn workspace platform-app cy:capture-and-stub",
         "cy:local": "yarn build && yarn test:network-shim-app && yarn test:platform-app"
@@ -44,7 +47,6 @@
         "concurrently": "^6.2.0",
         "eslint-plugin-cypress": "^2.11.2",
         "eslint-plugin-prettier": "^3.2.0",
-        "jest": "^26.6.3",
         "wait-on": "^5.3.0"
     },
     "d2": {

packages/cli/jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    roots: ['./src', './codemods'],
+}

packages/cli/package.json

@@ -9,6 +9,9 @@
     "bin": {
         "d2-utils-cypress": "./bin/d2-utils-cypress"
     },
+    "scripts": {
+        "test": "d2-app-scripts test"
+    },
     "main": "src/index.js",
     "version": "8.0.6",
     "author": "Viktor Varland <viktor@dhis2.org>",
@@ -19,11 +22,14 @@
     },
     "dependencies": {
         "@dhis2/cli-helpers-engine": "^2.3.0",
-        "cypress": "^7.4.0",
-        "cypress-cucumber-preprocessor": "^2.0.1",
         "fs-extra": "^8.1.0",
         "jscodeshift": "^0.11.0"
     },
+    "devDependencies": {
+        "@dhis2/cli-app-scripts": "^6.2.0",
+        "cypress": "^8.2",
+        "cypress-cucumber-preprocessor": "^4"
+    },
     "publishConfig": {
         "access": "public"
     }

packages/cypress-commands/jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    roots: ['./src', './codemods'],
+}

packages/cypress-commands/package.json

@@ -23,10 +23,14 @@
         "access": "public"
     },
     "scripts": {
-        "build": "d2-app-scripts build"
+        "build": "d2-app-scripts build",
+        "test": "d2-app-scripts test"
+    },
+    "devDependencies": {
+        "@dhis2/cli-app-scripts": "^6.2.0"
     },
     "peerDependencies": {
-        "cypress": "^7",
+        "cypress": "^8.2",
         "cypress-cucumber-preprocessor": "^4"
     }
 }

packages/cypress-commands/src/setups/enableNetworkShim/utils.js

@@ -13,13 +13,7 @@ export const splitHostAndPath = (url, hosts) => {
 }
 
 export const getFeatureName = () => {
-    let obj = Cypress.mocha.getRunner().suite.ctx.test
-    let title = null
-    while (obj && obj.parent && obj.parent.title) {
-        obj = obj.parent
-        title = obj.title
-    }
-    return title
+    return Cypress.currentTest.titlePath[0]
 }
 
 export const toJsonBlob = async input => {

packages/cypress-commands/src/setups/enableNetworkShim/utils.test.js

@@ -0,0 +1,16 @@
+const { getFeatureName } = require('./utils.js')
+
+describe('getFeatureName', () => {
+    beforeEach(() => {
+        global.Cypress = {
+            title: 'bar',
+            currentTest: {
+                titlePath: ['foo', 'bar'],
+            },
+        }
+    })
+
+    it('should use firtst item of the titlePath of the current test', () => {
+        expect(getFeatureName()).toBe('foo')
+    })
+})

packages/cypress-plugins/package.json

@@ -8,14 +8,20 @@
         "url": "https://github.com/dhis2/cli-utils-cypress.git",
         "folder": "packages/cypress-plugins"
     },
+    "scripts": {
+        "test": "d2-app-scripts test"
+    },
     "author": "Jan-Gerke Salomon",
     "license": "BSD-3-Clause",
     "private": false,
     "publishConfig": {
         "access": "public"
     },
+    "devDependencies": {
+        "@dhis2/cli-app-scripts": "^6.2.0"
+    },
     "peerDependencies": {
-        "cypress": "^7",
+        "cypress": "^8.2",
         "cypress-cucumber-preprocessor": "^4"
     }
 }