ember-cli-code-coverage · kategengler · Jun 8, 2023 · May 20, 2023 · Jun 6, 2023 · Jun 8, 2023
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,6 @@ yarn-error.log
 # ember-try
 .node_modules.ember-try/
 /bower.json.ember-try
-/package.json.ember-try
+/package.json.ember-try
+
+.DS_Store
diff --git a/packages/ember-cli-code-coverage/index.js b/packages/ember-cli-code-coverage/index.js
@@ -58,7 +58,7 @@ module.exports = {
       let {
         stableWorkspaceDir,
       } = require('@embroider/compat/src/default-pipeline');
-      cwd = stableWorkspaceDir(cwd);
+      cwd = stableWorkspaceDir(cwd, process.env.EMBER_ENV);
     }
 
     const IstanbulPlugin = require.resolve('babel-plugin-istanbul');

diff --git a/packages/ember-cli-code-coverage/package.json b/packages/ember-cli-code-coverage/package.json
@@ -34,8 +34,6 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@embroider/compat": "^0.47.0",
-    "@embroider/core": "^0.47.0",
     "babel-plugin-istanbul": "^6.0.0",
     "body-parser": "^1.19.0",
     "ember-cli-babel": "^7.26.6",
@@ -91,6 +89,18 @@
     "release-it-lerna-changelog": "^2.3.0",
     "sinon": "^4.2.2"
   },
+  "peerDependencies": {
+    "@embroider/compat": "^0.47.0 || ^1.0.0 || ^2.0.0 || >=3.0.0",
+    "@embroider/core": "^0.47.0 || ^1.0.0 || ^2.0.0 || >=3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@embroider/compat": {
+      "optional": true
+    },
+    "@embroider/core": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": "14.* || 16.* || >= 18"
   },

diff --git a/test-packages/__snapshots__/my-embroider-app-test.js.snap b/test-packages/__snapshots__/my-embroider-app-test.js.snap
@@ -0,0 +1,63 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`app coverage generation generates coverage with @ember/compat >= 2.1.0 1`] = `
+Object {
+  "total": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+  },
+}
+`;
+
+exports[`app coverage generation runs coverage when env var is set 1`] = `
+Object {
+  "total": Object {
+    "branches": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+    "functions": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+    "lines": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+    "statements": Object {
+      "covered": 0,
+      "pct": "Unknown",
+      "skipped": 0,
+      "total": 0,
+    },
+  },
+}
+`;
diff --git a/test-packages/my-app-with-custom-path-in-repo-addon/package.json b/test-packages/my-app-with-custom-path-in-repo-addon/package.json
@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
+    "@ember/string": "^3.1.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "babel-eslint": "^10.0.3",
@@ -59,5 +60,8 @@
     "paths": [
       "local-lib/addons/my-in-repo-addon"
     ]
+  },
+  "volta": {
+    "node": "14.21.3"
   }
 }
diff --git a/test-packages/my-app-with-in-repo-addon/package.json b/test-packages/my-app-with-in-repo-addon/package.json
@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
+    "@ember/string": "^3.1.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "babel-eslint": "^10.0.3",
@@ -59,5 +60,8 @@
     "paths": [
       "lib/my-in-repo-addon"
     ]
+  },
+  "volta": {
+    "node": "14.21.3"
   }
 }
diff --git a/test-packages/my-app-with-in-repo-engine/package.json b/test-packages/my-app-with-in-repo-engine/package.json
@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
+    "@ember/string": "^3.1.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "babel-eslint": "^10.0.3",

diff --git a/test-packages/my-app/package.json b/test-packages/my-app/package.json
@@ -24,6 +24,7 @@
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^1.5.3",
+    "@ember/string": "~3.0.0",
     "ember-cli": "~3.16.2",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-babel": "^7.17.2",

diff --git a/test-packages/my-embroider-app-test.js b/test-packages/my-embroider-app-test.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const fs = require('fs-extra');
+const util = require('util');
+const rimraf = util.promisify(require('rimraf'));
+const { dir, file } = require('chai-files');
+const path = require('path');
+const execa = require('execa');
+
+const APP_DIR  = 'my-embroider-app';
+const BASE_PATH = path.join(__dirname,APP_DIR);
+
+describe('app coverage generation', function () {
+  jest.setTimeout(10000000);
+
+  beforeEach(async function () {
+    await rimraf(`${BASE_PATH}/coverage*`);
+    await execa('git', ['clean', '-f',APP_DIR], { cwd: __dirname });
+    await execa('git', ['restore',APP_DIR], { cwd: __dirname });
+  });
+
+  afterEach(async function () {
+    await rimraf(`${BASE_PATH}/coverage*`);
+    await execa('git', ['clean', '-f',APP_DIR], { cwd: __dirname });
+    await execa('git', ['restore',APP_DIR], { cwd: __dirname });
+    await execa('git', ['clean', '-f', 'yarn.lock']);
+    await execa('git', ['restore', 'yarn.lock']);
+  });
+
+  it('runs coverage when env var is set', async function () {
+    dir(`${BASE_PATH}/coverage`).assertDoesNotExist();
+
+    let env = { COVERAGE: 'true' };
+    await execa('yarn',['install'], { env });
+    await execa('ember', ['test'], { cwd: BASE_PATH, env });
+    file(`${BASE_PATH}/coverage/lcov-report/index.html`).assertIsNotEmpty();
+    file(`${BASE_PATH}/coverage/index.html`).assertIsNotEmpty();
+
+    let summary = fs.readJSONSync(`${BASE_PATH}/coverage/coverage-summary.json`);
+    expect(summary).toMatchSnapshot();
+  });
+
+  it('generates coverage with @ember/compat >= 2.1.0', async function () {
+    dir(`${BASE_PATH}/coverage`).assertDoesNotExist();
+
+    let env = { COVERAGE: 'true' };
+    fs.copySync(`${BASE_PATH}/-package-with-compat-2.json`, `${BASE_PATH}/package.json`);
+    await execa('yarn',['install'], { env });
+    await execa('ember', ['test'], { cwd: BASE_PATH, env });
+
+    file(`${BASE_PATH}/coverage/lcov-report/index.html`).assertIsNotEmpty();
+    file(`${BASE_PATH}/coverage/index.html`).assertIsNotEmpty();
+
+    let summary = fs.readJSONSync(`${BASE_PATH}/coverage/coverage-summary.json`);
+    expect(summary).toMatchSnapshot();
+  });
+});
diff --git a/test-packages/my-embroider-app/-package-with-compat-2.json b/test-packages/my-embroider-app/-package-with-compat-2.json
@@ -0,0 +1,76 @@
+{
+    "name": "my-embroider-app",
+    "version": "0.0.0",
+    "private": true,
+    "description": "Small description for my-embroider-app goes here",
+    "repository": "",
+    "license": "MIT",
+    "author": "",
+    "directories": {
+      "doc": "doc",
+      "test": "tests"
+    },
+    "scripts": {
+      "build": "ember build --environment=production",
+      "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+      "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+      "lint:hbs": "ember-template-lint .",
+      "lint:hbs:fix": "ember-template-lint . --fix",
+      "lint:js": "eslint . --cache",
+      "lint:js:fix": "eslint . --fix",
+      "start": "ember serve",
+      "test": "npm-run-all lint test:*",
+      "test:ember": "ember test"
+    },
+    "devDependencies": {
+      "@ember/optional-features": "^2.0.0",
+      "@ember/test-helpers": "^2.4.2",
+      "@embroider/compat": "2.1.0",
+      "@embroider/core": "2.1.0",
+      "@embroider/webpack": "2.1.0",
+      "@glimmer/component": "^1.0.4",
+      "@glimmer/tracking": "^1.0.4",
+      "babel-eslint": "^10.1.0",
+      "broccoli-asset-rev": "^3.0.0",
+      "ember-auto-import": "^1.11.3",
+      "ember-cli-code-coverage": "2.0.0",
+      "ember-cli": "~3.28.0",
+      "ember-cli-app-version": "^5.0.0",
+      "ember-cli-babel": "^7.26.6",
+      "ember-cli-dependency-checker": "^3.2.0",
+      "ember-cli-htmlbars": "^5.7.1",
+      "ember-cli-inject-live-reload": "^2.1.0",
+      "ember-cli-sri": "^2.1.1",
+      "ember-cli-terser": "^4.0.2",
+      "ember-data": "~3.28.0",
+      "ember-export-application-global": "^2.0.1",
+      "ember-fetch": "^8.1.1",
+      "ember-load-initializers": "^2.1.2",
+      "ember-maybe-import-regenerator": "^0.1.6",
+      "ember-page-title": "^6.2.2",
+      "ember-qunit": "^5.1.4",
+      "ember-resolver": "^8.0.2",
+      "ember-source": "~3.28.0",
+      "ember-template-lint": "^3.6.0",
+      "ember-welcome-page": "^4.0.0",
+      "eslint": "^7.32.0",
+      "eslint-config-prettier": "^8.3.0",
+      "eslint-plugin-ember": "^10.5.4",
+      "eslint-plugin-node": "^11.1.0",
+      "eslint-plugin-prettier": "^3.4.1",
+      "eslint-plugin-qunit": "^6.2.0",
+      "loader.js": "^4.7.0",
+      "npm-run-all": "^4.1.5",
+      "prettier": "^2.3.2",
+      "qunit": "^2.16.0",
+      "qunit-dom": "^1.6.0",
+      "webpack": "^5.51.1"
+    },
+    "engines": {
+      "node": "12.* || 14.* || >= 16"
+    },
+    "ember": {
+      "edition": "octane"
+    }
+  }
+
diff --git a/test-packages/my-embroider-app/.editorconfig b/test-packages/my-embroider-app/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
diff --git a/test-packages/my-embroider-app/.ember-cli b/test-packages/my-embroider-app/.ember-cli
@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}
diff --git a/test-packages/my-embroider-app/.eslintignore b/test-packages/my-embroider-app/.eslintignore
@@ -0,0 +1,22 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.*/
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try