From caa75de22fc2f574e5df0f6449b59bc2131d250f Mon Sep 17 00:00:00 2001
From: Debarshi Bhaumik <debarshi@compucorp.co.uk>
Date: Wed, 24 Feb 2021 17:05:39 +0000
Subject: [PATCH] CPS-356: Fix backstopjs

---
 .github/workflows/backstop.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backstop.yml b/.github/workflows/backstop.yml
index b69231da9..422f3a2f9 100644
--- a/.github/workflows/backstop.yml
+++ b/.github/workflows/backstop.yml
@@ -36,7 +36,7 @@ jobs:
       TEST_SITE_URL: http://localhost:7980
       CIVICRM_EXTENSIONS_DIR: web/sites/all/modules/civicrm/tools/extensions
       CIVICASE_BACKSTOP_DIR: uk.co.compucorp.civicase/tests/backstop_data
-      DRUPAL_THEME_DIR: site/web/sites/all/themes
+      DRUPAL_THEME_DIR: web/sites/all/themes
 
     services:
       mysql:
@@ -57,12 +57,12 @@ jobs:
           echo "IncludeOptional $HOME/.amp/apache.d/*.conf" >> /etc/apache2/apache2.conf
           /usr/sbin/apache2ctl restart
 
-      - name: Build Reference Drupal site (CiviCRM v${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_reference_branch }}, Shoreditch - ${{ github.event.inputs.reference_shoreditch_branch }})
+      - name: Build Reference Drupal site (CiviCRM - ${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_reference_branch }}, Shoreditch - ${{ github.event.inputs.reference_shoreditch_branch }})
         run: |
           civibuild create drupal-clean --civi-ver ${{ github.event.inputs.civicrm_version }} --cms-ver 7.74 --web-root $GITHUB_WORKSPACE/${{ env.REFERENCE_SITE_FOLDER }} --url ${{ env.REFERENCE_SITE_URL }}
           chmod -R 777 $GITHUB_WORKSPACE/${{ env.REFERENCE_SITE_FOLDER }}
 
-      - name: Build Test Drupal site (CiviCRM v${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_test_branch }}, Shoreditch - ${{ github.event.inputs.test_shoreditch_branch }})
+      - name: Build Test Drupal site (CiviCRM - ${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_test_branch }}, Shoreditch - ${{ github.event.inputs.test_shoreditch_branch }})
         run: |
           civibuild create drupal-clean --civi-ver ${{ github.event.inputs.civicrm_version }} --cms-ver 7.74 --web-root $GITHUB_WORKSPACE/${{ env.TEST_SITE_FOLDER }} --url ${{ env.TEST_SITE_URL }}
           chmod -R 777 $GITHUB_WORKSPACE/${{ env.TEST_SITE_FOLDER }}
@@ -99,7 +99,7 @@ jobs:
           npm install
           npx gulp backstopjs:setup-data
 
-      - name: Reference Screenshots in (CiviCRM v${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_reference_branch }}, Shoreditch - ${{ github.event.inputs.reference_shoreditch_branch }})
+      - name: Reference Screenshots in (CiviCRM - ${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_reference_branch }}, Shoreditch - ${{ github.event.inputs.reference_shoreditch_branch }})
         continue-on-error: true
         working-directory: ${{ env.REFERENCE_SITE_FOLDER }}/${{ env.CIVICRM_EXTENSIONS_DIR }}/${{ env.CIVICASE_BACKSTOP_DIR }}
         run: |
@@ -138,12 +138,12 @@ jobs:
           npx gulp backstopjs:setup-data
 
       - name: Update site-config.json for Reference Site to target Test Site
-        working-directory: ${{ env.TEST_SITE_FOLDER }}/${{ env.CIVICRM_EXTENSIONS_DIR }}/${{ env.CIVICASE_BACKSTOP_DIR }}
+        working-directory: ${{ env.REFERENCE_SITE_FOLDER }}/${{ env.CIVICRM_EXTENSIONS_DIR }}/${{ env.CIVICASE_BACKSTOP_DIR }}
         run: |
           sed -i 's+${{ env.REFERENCE_SITE_URL }}+${{ env.TEST_SITE_URL }}+' site-config.json
           sed -i 's+${{ env.REFERENCE_SITE_FOLDER }}+${{ env.TEST_SITE_FOLDER }}+' site-config.json
 
-      - name: Test Screenshots in (CiviCRM v${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_test_branch }}, Shoreditch - ${{ github.event.inputs.test_shoreditch_branch }})
+      - name: Test Screenshots in (CiviCRM - ${{ github.event.inputs.civicrm_version }}, CiviCase - ${{ github.event.inputs.civicase_test_branch }}, Shoreditch - ${{ github.event.inputs.test_shoreditch_branch }})
         working-directory: ${{ env.REFERENCE_SITE_FOLDER }}/${{ env.CIVICRM_EXTENSIONS_DIR }}/${{ env.CIVICASE_BACKSTOP_DIR }}
         continue-on-error: true
         run: |