diff --git a/.gitignore b/.gitignore index 32db999..dc19394 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,8 @@ jest-preset.json .DS_Store npm-debug.log +# build +*.tgz + # webstorm .idea diff --git a/.travis.yml b/.travis.yml index 28381dc..cb368ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,20 @@ language: node_js +node_js: + - 10 + - 12 + - 14 +before_install: + # Create a master branch for commitlint + # https://github.com/conventional-changelog/commitlint/issues/6 + - git remote set-branches origin master && git fetch jobs: include: # Define the release stage that runs semantic-release - stage: release - node_js: - - 10 - - 12 - before_install: - # Create a master branch for commitlint - # https://github.com/conventional-changelog/commitlint/issues/6 - - git remote set-branches origin master && git fetch deploy: on: branch: master provider: script skip_cleanup: true script: - - npx semantic-release \ No newline at end of file + - npx semantic-release diff --git a/__tests__/html-report-creator.spec.js b/__tests__/html-report-creator.spec.js index 3851259..b6fef33 100644 --- a/__tests__/html-report-creator.spec.js +++ b/__tests__/html-report-creator.spec.js @@ -16,15 +16,6 @@ const merge = require('lodash/merge'); const mkdirp = require('mkdirp'); const fs = require('fs'); -function prettyPrintHtml(rawHtml) { - return rawHtml.end({ - pretty: true, - indent: ' ', - newline: '\n', - allowEmpty: false, - }); -} - function buildMockResult(mockResult = {}) { const defaultMockResult = { numFailedTestSuites: 0, @@ -97,7 +88,7 @@ describe('html-report-creator', () => { createHtmlReport(mockResult); expect( - prettyPrintHtml(fs.writeFileSync.mock.calls[0][1]) + fs.writeFileSync.mock.calls[0][1] ).toMatchSnapshot(); }); @@ -119,7 +110,7 @@ describe('html-report-creator', () => { createHtmlReport(mockResult); expect( - prettyPrintHtml(fs.writeFileSync.mock.calls[0][1]) + fs.writeFileSync.mock.calls[0][1] ).toMatchSnapshot(); }); @@ -129,7 +120,7 @@ describe('html-report-creator', () => { createHtmlReport(mockResult); expect( - prettyPrintHtml(fs.writeFileSync.mock.calls[0][1]) + fs.writeFileSync.mock.calls[0][1] ).toMatchSnapshot(); }); @@ -151,7 +142,7 @@ describe('html-report-creator', () => { createHtmlReport(mockResult); expect( - prettyPrintHtml(fs.writeFileSync.mock.calls[0][1]) + fs.writeFileSync.mock.calls[0][1] ).toMatchSnapshot(); }); @@ -173,7 +164,7 @@ describe('html-report-creator', () => { createHtmlReport(mockResult); expect( - prettyPrintHtml(fs.writeFileSync.mock.calls[0][1]) + fs.writeFileSync.mock.calls[0][1] ).toMatchSnapshot(); }); @@ -195,7 +186,7 @@ describe('html-report-creator', () => { createHtmlReport(mockResult); expect( - prettyPrintHtml(fs.writeFileSync.mock.calls[0][1]) + fs.writeFileSync.mock.calls[0][1] ).toMatchSnapshot(); }); diff --git a/html-report-creator.js b/html-report-creator.js index f1f9dfa..04a3149 100644 --- a/html-report-creator.js +++ b/html-report-creator.js @@ -92,8 +92,15 @@ module.exports = (result) => { }); } }); - writeFile(process.env.JEST_TEST_REPORT_PATH || path.join(process.cwd(), 'test-results/test-report.html'), htmlOutput); + writeFile( + process.env.JEST_TEST_REPORT_PATH || path.join(process.cwd(), 'test-results/test-report.html'), + htmlOutput.end({ + pretty: true, + indent: ' ', + newline: '\n', + allowEmpty: false, + }) + ); return result; }; - diff --git a/package-lock.json b/package-lock.json index 0956a4e..0066891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1702,18 +1702,6 @@ "uri-js": "^4.2.2" } }, - "amex-jest-preset": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/amex-jest-preset/-/amex-jest-preset-6.0.1.tgz", - "integrity": "sha512-lWgwG0/UqseHJgj2EAXMIAh3UdZv1SCMKjT7xtiTmM1cPZ4l/J4ImypcLw2qL/kj25wEYWaWqJPlF5qT1s7UtA==", - "dev": true, - "requires": { - "is-ci": "^1.0.10", - "mkdirp": "^0.5.1", - "strip-ansi": "^3.0.1", - "xmlbuilder": "^9.0.0" - } - }, "ansi-align": { "version": "2.0.0", "resolved": false, @@ -4577,6 +4565,13 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -6297,6 +6292,7 @@ "@jest/types": "^25.1.0", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", "graceful-fs": "^4.2.3", "jest-serializer": "^25.1.0", "jest-util": "^25.1.0", diff --git a/package.json b/package.json index 2199eef..27fbf7b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "@semantic-release/changelog": "^5.0.0", "@semantic-release/commit-analyzer": "^8.0.1", "@semantic-release/git": "^9.0.0", - "amex-jest-preset": "*", "eslint": "^6.8.0", "eslint-config-amex": "^6.0.0", "githook-scripts": "^1.0.1", @@ -59,7 +58,7 @@ "author": "Andres Escobar (https://github.com/anescobar1991)", "license": "Apache-2.0", "jest": { - "preset": "amex-jest-preset", + "preset": "./jest-preset.js", "coveragePathIgnorePatterns": [ "/jest-setup.js", "/commitlint.config.js"