latest from iris

saucelabs · Apr 25, 2024 · b59b67a · b59b67a
1 parent 610e532
commit b59b67a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/visual-js/visual-cypress/src/index.ts b/visual-js/visual-cypress/src/index.ts
@@ -200,23 +200,23 @@ class CypressSauceVisual {
     try {
       const { id, url } = await this.api.createBuild({
         name:
-          SAUCE_VISUAL_BUILD_NAME ||
           config.saucelabs?.buildName ||
+          SAUCE_VISUAL_BUILD_NAME ||
           'Cypress Visual Testing',
         project:
+          config.saucelabs?.project ||
           SAUCE_VISUAL_PROJECT ||
           SAUCE_VISUAL_PROJECT_NAME ||
-          config.saucelabs?.project ||
           null,
         branch:
+          config.saucelabs?.branch ||
           SAUCE_VISUAL_BRANCH ||
           SAUCE_VISUAL_BRANCH_NAME ||
-          config.saucelabs?.branch ||
           null,
         defaultBranch:
+          config.saucelabs?.defaultBranch ||
           SAUCE_VISUAL_DEFAULT_BRANCH ||
           SAUCE_VISUAL_DEFAULT_BRANCH_NAME ||
-          config.saucelabs?.defaultBranch ||
           null,
         customId: SAUCE_VISUAL_CUSTOM_ID || null,
       });

diff --git a/visual-js/visual-nightwatch/nightwatch/globals.js b/visual-js/visual-nightwatch/nightwatch/globals.js
@@ -57,11 +57,11 @@ const globals = {
       ({ url: visualBuildUrl } = build);
     } else {
       const sauceBuildData = {
-        name: SAUCE_VISUAL_BUILD_NAME || buildName || 'Nightwatch Visual Demo',
-        project:
-          SAUCE_VISUAL_PROJECT || project || 'Nightwatch Visual Examples',
-        branch: SAUCE_VISUAL_BRANCH || branch || 'main',
-        defaultBranch: SAUCE_VISUAL_DEFAULT_BRANCH || defaultBranch,
+        name:
+          buildName || SAUCE_VISUAL_BUILD_NAME || 'Nightwatch Visual Testing',
+        project: project || SAUCE_VISUAL_PROJECT,
+        branch: branch || SAUCE_VISUAL_BRANCH,
+        defaultBranch: defaultBranch || SAUCE_VISUAL_DEFAULT_BRANCH,
       };
       try {
         ({ id: visualBuildId, url: visualBuildUrl } = await getApi(

diff --git a/visual-js/visual-wdio/src/SauceVisualService.ts b/visual-js/visual-wdio/src/SauceVisualService.ts
@@ -292,13 +292,13 @@ export default class SauceVisualService implements Services.ServiceInstance {
       try {
         build = await this.apiClient.createBuild({
           name:
-            SAUCE_VISUAL_BUILD_NAME ||
             this.options.buildName ||
+            SAUCE_VISUAL_BUILD_NAME ||
             'WebdriverIO Visual Testing',
-          project: SAUCE_VISUAL_PROJECT || this.options.project || null,
-          branch: SAUCE_VISUAL_BRANCH || this.options.branch || null,
+          project: this.options.project || SAUCE_VISUAL_PROJECT || null,
+          branch: this.options.branch || SAUCE_VISUAL_BRANCH || null,
           defaultBranch:
-            SAUCE_VISUAL_DEFAULT_BRANCH || this.options.defaultBranch || null,
+            this.options.defaultBranch || SAUCE_VISUAL_DEFAULT_BRANCH || null,
         });
       } catch (e: unknown) {
         const errorMessage = ensureError(e).message ?? 'Unknown error';