ci: 🎡 pass env var to ci unit

jaskaransarkaria · Dec 31, 2023 · cca7ff3 · cca7ff3
1 parent ad1d798
commit cca7ff3
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 16 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 16.16
       - name: Install dependencies
         run: npm ci
       - name: Install Playwright Browsers

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -13,10 +13,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: 16.6
+          node-version: 16.16
       - name: Install dependencies
         run: npm ci
       - name: Linting
         run: npm run lint
       - name: Unit tests
         run: npm run test:unit:ci
+        env:
+          PUBLIC_BUCKET_URL: https://storage.googleapis.com/enki-website
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.14.2
+v16.16
diff --git a/src/lib/components/Basket/Basket.svelte b/src/lib/components/Basket/Basket.svelte
@@ -49,7 +49,7 @@
         in:fade
       >
         <img
-          src={`${PUBLIC_BUCKET_URL}/${obj.id}-0`}
+          src={`${PUBLIC_BUCKET_URL}/${obj.imgHash}`}
           alt={`${obj.name}`}
           on:click={() => goto(`/shop/product/${obj.id}`)}
           class={isMobile ? "mobile-product-img" : "product-img"}

diff --git a/src/lib/types/basketProduct.ts b/src/lib/types/basketProduct.ts
@@ -1,6 +1,7 @@
 export interface BasketProduct {
   name: string;
   id: number;
+  imgHash: string;
   categoryId: number;
   quantity: number;
   price: number;

diff --git a/src/lib/utils/basket.test.ts b/src/lib/utils/basket.test.ts
@@ -7,7 +7,11 @@ const mockProduct = {
   CurrentStock: 1,
   CategoryId: 999,
   Description: "big animal",
-  ProductImages: [],
+  ProductImages: [
+    {
+      ImageUrl: "/foobar-0-9sjs9s.jpg",
+    },
+  ],
   ProductTags: [],
   VariantGroupId: null,
   ProductDetails: {
@@ -25,6 +29,7 @@ describe("GIVEN updateBasket()", () => {
         categoryId: mockProduct.CategoryId,
         name: mockProduct.Name,
         quantity: 1,
+        imgHash: "foobar-0-9sjs9s",
         price: mockProduct.SalePrice,
         currentStock: mockProduct.CurrentStock,
         giftWrap: false,
@@ -44,6 +49,7 @@ describe("GIVEN updateBasket()", () => {
             categoryId: mockProduct.CategoryId,
             name: mockProduct.Name,
             quantity: 1,
+            imgHash: "foobar-0-9sjs9s",
             price: mockProduct.SalePrice,
             currentStock: mockProduct.CurrentStock,
             giftWrap: false,
@@ -59,6 +65,7 @@ describe("GIVEN updateBasket()", () => {
         categoryId: mockProduct.CategoryId,
         name: mockProduct.Name,
         quantity: 2,
+        imgHash: "foobar-0-9sjs9s",
         price: mockProduct.SalePrice,
         currentStock: mockProduct.CurrentStock,
         giftWrap: false,
@@ -78,6 +85,7 @@ describe("GIVEN updateBasket()", () => {
             categoryId: mockProduct.CategoryId,
             name: mockProduct.Name,
             quantity: 2,
+            imgHash: "foobar-0-9sjs9s",
             price: mockProduct.SalePrice,
             currentStock: mockProduct.CurrentStock,
             giftWrap: false,
@@ -93,6 +101,7 @@ describe("GIVEN updateBasket()", () => {
         categoryId: mockProduct.CategoryId,
         name: mockProduct.Name,
         quantity: 1,
+        imgHash: "foobar-0-9sjs9s",
         price: mockProduct.SalePrice,
         currentStock: mockProduct.CurrentStock,
         giftWrap: false,
@@ -112,6 +121,7 @@ describe("GIVEN updateBasket()", () => {
             categoryId: mockProduct.CategoryId,
             name: mockProduct.Name,
             quantity: 1,
+            imgHash: "foobar-0-9sjs9s",
             price: mockProduct.SalePrice,
             currentStock: mockProduct.CurrentStock,
             giftWrap: false,

diff --git a/src/lib/utils/basket.ts b/src/lib/utils/basket.ts
@@ -1,5 +1,6 @@
 import type { BasketProduct } from "$lib/types/basketProduct";
 import type { Product } from "$lib/types/product";
+import { getImageFilename } from "$lib/utils/getImageFilename";
 
 const removeItemFromBasket = (
   currentQuantity: number,
@@ -15,6 +16,7 @@ const removeItemFromBasket = (
           categoryId: list[listIndx].categoryId,
           name: list[listIndx].name,
           quantity: list[listIndx].quantity - 1,
+          imgHash: list[listIndx].imgHash,
           price: list[listIndx].price,
           currentStock: list[listIndx].currentStock,
           giftWrap: list[listIndx].giftWrap ?? false,
@@ -34,6 +36,7 @@ const addItemToBasket = (
     categoryId: list[listIndx].categoryId,
     name: list[listIndx].name,
     quantity: list[listIndx].quantity + 1,
+    imgHash: list[listIndx].imgHash,
     price: list[listIndx].price,
     currentStock: list[listIndx].currentStock,
     giftWrap: list[listIndx].giftWrap ?? false,
@@ -46,7 +49,12 @@ const addItemToBasket = (
 const addNewItemToBasket = (
   product: Pick<
     Product,
-    "Id" | "Name" | "SalePrice" | "CurrentStock" | "CategoryId"
+    | "Id"
+    | "Name"
+    | "SalePrice"
+    | "CurrentStock"
+    | "CategoryId"
+    | "ProductImages"
   >,
   list: BasketProduct[]
 ): BasketProduct[] => [
@@ -55,6 +63,10 @@ const addNewItemToBasket = (
     categoryId: product.CategoryId,
     name: product.Name,
     quantity: 1,
+    imgHash:
+      product?.ProductImages?.length > 0
+        ? getImageFilename(product.ProductImages[0].ImageUrl)
+        : "/coming-soon.png",
     price: product.SalePrice,
     currentStock: product.CurrentStock,
     giftWrap: false,
@@ -67,7 +79,12 @@ const addNewItemToBasket = (
 export const updateBasket = (
   product: Pick<
     Product,
-    "Id" | "Name" | "SalePrice" | "CurrentStock" | "CategoryId"
+    | "Id"
+    | "Name"
+    | "SalePrice"
+    | "CurrentStock"
+    | "CategoryId"
+    | "ProductImages"
   >,
   list: BasketProduct[],
   updateType: string

diff --git a/tests/mocks/categories/GET.mock b/tests/mocks/categories/GET.mock
@@ -8,55 +8,64 @@ Access-Control-Allow-Origin: *
     "Name": "Books",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "1876023"
+
   },
   {
     "Id": 2,
     "Name": "Lion",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "2"
   },
   {
     "Id": 3,
     "Name": "Zebra",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "3"
   },
   {
     "Id": 4,
     "Name": "Hippopotamus",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "4"
   },
   {
     "Id": 5,
     "Name": "Water Buffalo",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "5"
   },
   {
     "Id": 6,
     "Name": "Giraffe",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "6"
   },
   {
     "Id": 7,
     "Name": "Cheetah",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "7"
   },
   {
     "Id": 8,
     "Name": "Crocodile",
     "ParentId": null,
     "Children": [],
-    "NominalCode": ""
+    "NominalCode": "",
+    "Description": "8"
   }
 ]
diff --git a/tests/mocks/fixtures/categories.ts b/tests/mocks/fixtures/categories.ts
@@ -5,54 +5,62 @@ export const mockCategories = [
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "1876023",
   },
   {
     Id: 2,
     Name: "Lion",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "2",
   },
   {
     Id: 3,
     Name: "Zebra",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "3",
   },
   {
     Id: 4,
     Name: "Hippopotamus",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "4",
   },
   {
     Id: 5,
     Name: "Water Buffalo",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "5",
   },
   {
     Id: 6,
     Name: "Giraffe",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "6",
   },
   {
     Id: 7,
     Name: "Cheetah",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "7",
   },
   {
     Id: 8,
     Name: "Crocodile",
     ParentId: null,
     Children: [],
     NominalCode: "",
+    Description: "8",
   },
 ];
diff --git a/...s/classes/wedding-rings.spec.js-snapshots/Classes-Wedding-Ring-Page-1-linux.png b/...s/classes/wedding-rings.spec.js-snapshots/Classes-Wedding-Ring-Page-1-linux.png
diff --git a/...ktop-Home-Page-loads-desktop-and-can-navigate-through-animated-svgs-1-linux.png b/...ktop-Home-Page-loads-desktop-and-can-navigate-through-animated-svgs-1-linux.png