diff --git a/generators/app/index.js b/generators/app/index.js index 80a3aab..002c408 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -189,6 +189,7 @@ export default class extends Generator { devDependencies: { shx: "^0.3.4", "@ui5/cli": "^3", + "@ui5/middleware-code-coverage": "latest", "ui5-middleware-livereload": "latest", karma: "^6.4.2", "karma-chrome-launcher": "^3.2.0", diff --git a/generators/app/templates/_.gitignore b/generators/app/templates/_.gitignore index bc0c795..ad68d22 100644 --- a/generators/app/templates/_.gitignore +++ b/generators/app/templates/_.gitignore @@ -9,3 +9,4 @@ deployer/resources/ Makefile* mta-* approuter/*/webapp/ +tmp/ diff --git a/generators/newwebapp/templates/uimodule/ui5.yaml b/generators/newwebapp/templates/uimodule/ui5.yaml index 0d636e7..f6e1bab 100644 --- a/generators/newwebapp/templates/uimodule/ui5.yaml +++ b/generators/newwebapp/templates/uimodule/ui5.yaml @@ -18,6 +18,8 @@ server: customMiddleware: - name: ui5-middleware-livereload afterMiddleware: compression + - name: "@ui5/middleware-code-coverage" + afterMiddleware: compression <% if(platform !== 'Static webserver' && platform !== 'SAP NetWeaver'){ -%> - name: ui5-middleware-cfdestination afterMiddleware: compression diff --git a/generators/qunit/index.js b/generators/qunit/index.js index a96301b..24c667d 100644 --- a/generators/qunit/index.js +++ b/generators/qunit/index.js @@ -1,4 +1,5 @@ import Generator from "yeoman-generator"; +import semver from "semver"; import jsUtils from "../../helpers/jsutils.js"; import path from "path"; import glob from "glob"; @@ -152,6 +153,14 @@ export default class extends Generator { this.config.set("qunittests", tests); this.options.oneTimeConfig.qunittests = tests; + // set qunit coverage file + if (semver.gte(props.frameworkVersion, "1.113.0")) { + this.config.set("qunitCoverageFile", "qunit-coverage-istanbul.js"); + } else { + this.config.set("qunitCoverageFile", "qunit-coverage.js"); + } + this.options.oneTimeConfig.qunitCoverageFile = this.config.get("qunitCoverageFile"); + const sModule = (this.options.oneTimeConfig.modulename ? this.options.oneTimeConfig.modulename + "/" : "") + "webapp/"; diff --git a/generators/qunit/templates/test/unit/unitTests.qunit.html b/generators/qunit/templates/test/unit/unitTests.qunit.html index 72d941f..3915777 100644 --- a/generators/qunit/templates/test/unit/unitTests.qunit.html +++ b/generators/qunit/templates/test/unit/unitTests.qunit.html @@ -18,6 +18,7 @@ + diff --git a/package.json b/package.json index e1d3e7a..8b146d3 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "directory-tree": "^3.0.1", "glob": "^7.2.0", "object-assign-deep": "^0.4.0", + "semver": "^7.5.4", "valid-filename": "^4.0.0", "yaml": "^2.2.2", "yeoman-environment": "^3.16.2",