Merge pull request #71 from DanielHaroldLane/fix/useCssFile-styleOver…

…ridePath

Update not to load CSS content if useCssFile and styleOverridePath supplied

src/config.js

@@ -76,6 +76,13 @@ const getPageTitle = () =>
 const getLogo = () =>
 	process.env.JEST_HTML_REPORTER_LOGO || config.logo || null;
 
+/**
+ * Returns whether there is a user defined stylesheet override path
+ */
+const getHasStyleOverridePath = () =>
+	Boolean(process.env.JEST_HTML_REPORTER_STYLE_OVERRIDE_PATH) ||
+	Boolean(config.styleOverridePath);
+
 /**
  * Returns whether the report should contain failure messages or not
  * @return {Boolean}
@@ -97,6 +104,11 @@ const shouldIncludeConsoleLog = () =>
 const shouldUseCssFile = () =>
 	process.env.JEST_HTML_REPORTER_USE_CSS_FILE || config.useCssFile || false;
 
+/**
+ * Returns whether the report should load the stylesheet content
+ */
+const shouldGetStylesheetContent = () => !(getHasStyleOverridePath() && shouldUseCssFile());
+
 /**
  * Returns the configured threshold (in seconds) when to apply a warning
  * @return {Number}
@@ -132,12 +144,14 @@ module.exports = {
 	setConfigData,
 	getOutputFilepath,
 	getStylesheetFilepath,
+	getHasStyleOverridePath,
 	getCustomScriptFilepath,
 	getPageTitle,
 	getLogo,
 	shouldIncludeFailureMessages,
 	shouldIncludeConsoleLog,
 	shouldUseCssFile,
+	shouldGetStylesheetContent,
 	getExecutionTimeWarningThreshold,
 	getBoilerplatePath,
 	getTheme,

src/reportGenerator.js

@@ -18,13 +18,21 @@ class ReportGenerator {
 	generate({ data, ignoreConsole }) {
 		const fileDestination = this.config.getOutputFilepath();
 		const useCssFile = this.config.shouldUseCssFile();
+		const shouldGetStylesheetContent = this.config.shouldGetStylesheetContent();
 		let stylesheetPath = null;
+		let stylesheetContent = null;
 
 		if (useCssFile) {
 			stylesheetPath = this.config.getStylesheetFilepath();
 		}
 
-		return this.getStylesheetContent()
+		if (shouldGetStylesheetContent) {
+			stylesheetContent = () => this.getStylesheetContent();
+		} else {
+			stylesheetContent = () => Promise.resolve();
+		}
+
+		return stylesheetContent()
 			.then(stylesheet => this.renderHtmlReport({
 				data,
 				stylesheet,

test/config.spec.js

@@ -89,6 +89,44 @@ describe('config', () => {
 		});
 	});
 
+	describe('getHasStyleOverridePath', () => {
+		it('should return true if the value from package.json or jesthtmlreporter.config.json is set', () => {
+			config.setConfigData({ styleOverridePath: 'setInJson.css' });
+			expect(config.getHasStyleOverridePath()).toEqual(true);
+		});
+		it('should return true if the environment variable is set', () => {
+			process.env.JEST_HTML_REPORTER_STYLE_OVERRIDE_PATH = 'setInEnv.css';
+			expect(config.getHasStyleOverridePath()).toEqual(true);
+		});
+		it('should return false if no setting was provided', () => {
+			expect(config.getHasStyleOverridePath()).toEqual(false);
+		});
+	});
+
+	describe('shouldGetStylesheetContent', () => {
+		it('should return false if styleOverridePath and useCssFile from package.json or jesthtmlreporter.config.json is set', () => {
+			config.setConfigData({
+				styleOverridePath: 'setInJson.css',
+				useCssFile: true,
+			});
+			expect(config.shouldGetStylesheetContent()).toEqual(false);
+		});
+		it('should return false if styleOverridePath and useCssFile environment variables are set', () => {
+			process.env.JEST_HTML_REPORTER_STYLE_OVERRIDE_PATH = 'setInEnv.css';
+			process.env.JEST_HTML_REPORTER_USE_CSS_FILE = true;
+			expect(config.shouldGetStylesheetContent()).toEqual(false);
+		});
+		it('should return true if only one variable is set', () => {
+			config.setConfigData({
+				useCssFile: true,
+			});
+			expect(config.shouldGetStylesheetContent()).toEqual(true);
+		});
+		it('should return true if no setting was provided', () => {
+			expect(config.shouldGetStylesheetContent()).toEqual(true);
+		});
+	});
+
 	describe('getPageTitle', () => {
 		it('should return the value from package.json or jesthtmlreporter.config.json', () => {
 			config.setConfigData({ pageTitle: 'setInJson' });