2.8.0 - Improved test appending, Bumped versions

Hargne · Dec 10, 2019 · e090795 · e090795
1 parent 011c381
commit e090795
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ Please note that all configuration properties are optional.
 | `sort` | `STRING` | Sorts the test results using the given method. Available sorting methods can be found in the [documentation](https://github.com/Hargne/jest-html-reporter/wiki/Sorting-Methods). | `"default"`
 | `statusIgnoreFilter` | `STRING` | A comma-separated string of the test result statuses that should be ignored when rendering the report. Available statuses are: `"passed"`, `"pending"`, `"failed"` | `null`
 | `boilerplate` | `STRING` | The path to a boilerplate file that should be used to render the body of the test results into. `{jesthtmlreporter-content}` within the boilerplate will be replaced with the test results | `null`
-| `append` *NEW | `BOOLEAN` | If set to true, new test results will be appended to the existing test report | `false`
+| `append` | `BOOLEAN` | If set to true, new test results will be appended to the existing test report | `false`
 
 > *The plugin will search for the *styleOverridePath* from the root directory, therefore there is no need to prepend the string with `./` or `../` - You can read more about the themes in the [documentation](https://github.com/Hargne/jest-html-reporter/wiki/Test-Report-Themes).
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-html-reporter",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "Jest test results processor for generating a summary in HTML",
   "main": "dist/main",
   "unpkg": "dist/main.min.js",

diff --git a/src/utils.js b/src/utils.js
@@ -52,11 +52,41 @@ const appendFile = ({ filePath, content }) => new Promise((resolve, reject) => {
 		if (mkdirpError) {
 			return reject(new Error(`Something went wrong when creating the folder: ${mkdirpError}`));
 		}
-		return fs.appendFile(filePath, content, (writeFileError) => {
-			if (writeFileError) {
-				return reject(new Error(`Something went wrong when appending the file: ${writeFileError}`));
+
+		// Check if the file exists or not
+		return fs.readFile(filePath, 'utf8', (err, existingContent) => {
+			let parsedContent = content;
+			// The file exists - we need to strip all unecessary html
+			if (!err) {
+				const contentSearch = /<body>(.*?)<\/body>/gm.exec(content);
+				if (contentSearch) {
+					const [strippedContent] = contentSearch;
+					parsedContent = strippedContent;
+				}
+				// Then we need to add the stripped content just before the </body> tag
+				if (existingContent) {
+					let newContent = existingContent;
+					const closingBodyTag = /<\/body>/gm.exec(existingContent);
+					const indexOfClosingBodyTag = closingBodyTag ? closingBodyTag.index : 0;
+
+					newContent = [existingContent.slice(0, indexOfClosingBodyTag), parsedContent, existingContent.slice(indexOfClosingBodyTag)]
+						.join('');
+
+					return fs.writeFile(filePath, newContent, (writeFileError) => {
+						if (writeFileError) {
+							return reject(new Error(`Something went wrong when creating the file: ${writeFileError}`));
+						}
+						return resolve(filePath);
+					});
+				}
 			}
-			return resolve(filePath);
+
+			return fs.appendFile(filePath, parsedContent, (writeFileError) => {
+				if (writeFileError) {
+					return reject(new Error(`Something went wrong when appending the file: ${writeFileError}`));
+				}
+				return resolve(filePath);
+			});
 		});
 	});
 });

diff --git a/style/darkTheme.css b/style/darkTheme.css
@@ -10,6 +10,9 @@ body {
 	padding: 3rem;
 	font-size: 0.85rem;
 }
+#jesthtml-content {
+	margin-bottom: 2rem;
+}
 header {
 	display: flex;
 	align-items: center;

diff --git a/style/defaultTheme.css b/style/defaultTheme.css
@@ -9,6 +9,9 @@ body {
 	padding: 1rem;
 	font-size: 0.85rem;
 }
+#jesthtml-content {
+	margin-bottom: 2rem;
+}
 header {
 	display: flex;
 	align-items: center;

diff --git a/style/lightTheme.css b/style/lightTheme.css
@@ -9,6 +9,9 @@ body {
 	padding: 3rem;
 	font-size: 0.85rem;
 }
+#jesthtml-content {
+	margin-bottom: 2rem;
+}
 header {
 	display: flex;
 	align-items: center;