fix: set default user config when cypressImageDiff undefined

haim-io · Sep 11, 2023 · 76374f8 · 76374f8
1 parent 08aa95d
commit 76374f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/command.js b/src/command.js
@@ -1,7 +1,8 @@
 import { recurse } from 'cypress-recurse';
+import DEFAULT_CONFIG from './config.default'
 
 const compareSnapshotCommand = defaultScreenshotOptions => {
-  const userConfig = Cypress.env('cypressImageDiff')
+  const userConfig = Cypress.env('cypressImageDiff') || DEFAULT_CONFIG
 
   const height = Cypress.config('viewportHeight') || 1440
   const width = Cypress.config('viewportWidth') || 1980

diff --git a/src/config.default.js b/src/config.default.js
@@ -0,0 +1,11 @@
+export default {
+  ROOT_DIR: '',
+  FAILURE_THRESHOLD: 0,
+  RETRY_OPTIONS: {},
+  FAIL_ON_MISSING_BASELINE: false,
+  COMPARISON_OPTIONS: { threshold: 0.1 },
+  JSON_REPORT: {
+    FILENAME: '',
+    OVERWRITE: true,
+  },
+}
diff --git a/src/config.js b/src/config.js
@@ -1,5 +1,6 @@
 import path from 'path'
 import merge from 'lodash/merge'
+import DEFAULT_CONFIG from './config.default'
 
 function getUserConfigFile() {
   try {
@@ -10,18 +11,6 @@ function getUserConfigFile() {
   }
 }
 
-const DEFAULT_CONFIG = {
-  ROOT_DIR: '',
-  FAILURE_THRESHOLD: 0,
-  RETRY_OPTIONS: {},
-  FAIL_ON_MISSING_BASELINE: false,
-  COMPARISON_OPTIONS: { threshold: 0.1 },
-  JSON_REPORT: {
-    FILENAME: '',
-    OVERWRITE: true
-  }
-}
-
 export const userConfig = merge(DEFAULT_CONFIG, getUserConfigFile())
 
 export class Paths {