From bb1c7c19c9b63d4954157869cf8c577c4fe1c86e Mon Sep 17 00:00:00 2001
From: SHENGXING LU <slu@SHENGXINGs-MacBook-Air.local>
Date: Wed, 10 Dec 2025 12:04:10 +0100
Subject: [PATCH 1/3] QA tags

---
 .../categories/categories.component.html      | 12 +++---
 .../create-category.component.html            |  6 +--
 .../verification/verification.component.html  |  4 +-
 .../pages/catalogs/catalogs.component.html    | 18 ++++----
 .../pages/checkout/checkout.component.html    |  1 +
 .../order-info/order-info.component.html      | 10 ++---
 .../search-catalog.component.html             |  2 +-
 src/app/pages/search/search.component.html    |  2 +-
 .../seller-catalogs.component.html            |  6 +--
 .../seller-offer/seller-offer.component.html  |  6 +--
 .../update-offer/update-offer.component.html  | 10 ++---
 .../create-product-spec.component.html        | 42 +++++++++----------
 .../billing-info/billing-info.component.html  |  2 +-
 .../org-info/org-info.component.html          |  6 +--
 .../billing-account-form.component.html       |  2 +-
 src/app/shared/card/card.component.html       | 10 ++---
 .../categories-filter.component.html          |  4 +-
 .../category-item.component.html              | 10 ++---
 .../offer/catalogue/catalogue.component.html  |  4 +-
 .../offer/category/category.component.html    |  4 +-
 .../shared/forms/offer/offer.component.html   |  4 +-
 ...onfiguration-profile-drawer.component.html |  6 +--
 .../price-component-drawer.component.html     |  8 +++-
 .../price-components-table.component.html     |  4 +-
 .../price-plan-drawer.component.html          |  4 +-
 .../offer/prod-spec/prod-spec.component.html  |  4 +-
 src/app/shared/header/header.component.html   |  4 +-
 27 files changed, 100 insertions(+), 95 deletions(-)

diff --git a/src/app/pages/admin/categories/categories.component.html b/src/app/pages/admin/categories/categories.component.html
index e2ea9d8b..90d6c37e 100644
--- a/src/app/pages/admin/categories/categories.component.html
+++ b/src/app/pages/admin/categories/categories.component.html
@@ -7,12 +7,12 @@ <h2 class="text-2xl font-bold mb-4 dark:text-white">{{ 'CATEGORIES._categories'
         </div>
 
         <div class="flex flex-row w-full justify-end">
-            <button type="button" (click)="createCategory()" class="ml-2 mr-8 mb-4 text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center align-middle me-2">
+            <button data-cy="adminAddNewCategory" type="button" (click)="createCategory()" class="ml-2 mr-8 mb-4 text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center align-middle me-2">
                 <p class="pl-2 pr-2 dark:text-white">{{ 'CATEGORIES._add_new_cat' | translate }}</p>
                 <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
                   <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
                 </svg>
-            </button>  
+            </button>
         </div>
 
       </div>
@@ -112,10 +112,10 @@ <h6 class="mb-3 text-sm font-medium text-gray-900 dark:text-white">
             <tbody>
                 @for (cat of categories; track cat.id;let idx = $index) {
                     <tr class="flex border-b dark:border-gray-700 hover:bg-gray-200 w-full justify-between dark:bg-secondary-300 dark:hover:bg-secondary-200">
-                        <td class="flex px-6 py-4 w-2/4">
+                        <td data-cy="adminTableOfferName" class="flex px-6 py-4 w-2/4">
                             <b>{{cat.name}}</b>
                         </td>
-                        <td class="hidden md:flex px-6 py-4 w-fit">
+                        <td data-cy="adminTableOfferStatus" class="hidden md:flex px-6 py-4 w-fit">
                             @if(cat.lifecycleStatus == 'Active'){
                                 <span class="bg-blue-100 max-h-6 dark:bg-secondary-300 text-blue-600 text-xs font-medium me-2 px-2.5 py-0.5 rounded border border-blue-400">{{cat.lifecycleStatus}}</span>
                             } @else if(cat.lifecycleStatus == 'Launched') {
@@ -129,8 +129,8 @@ <h6 class="mb-3 text-sm font-medium text-gray-900 dark:text-white">
                         <td class="hidden md:table-cell px-6 py-4 w-fit">
                             {{cat.lastUpdate | date:'EEEE, dd/MM/yy, HH:mm'}} 
                         </td> 
-                        <td class="flex px-6 py-4 w-fit justify-end">                            
-                            <button type="button" (click)="goToUpdate(cat)" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center me-2">
+                        <td class="flex px-6 py-4 w-fit justify-end">
+                            <button data-cy="adminEditCategory" type="button" (click)="goToUpdate(cat)" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center me-2">
                                 <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
                                     <path fill-rule="evenodd" d="M14 4.182A4.136 4.136 0 0 1 16.9 3c1.087 0 2.13.425 2.899 1.182A4.01 4.01 0 0 1 21 7.037c0 1.068-.43 2.092-1.194 2.849L18.5 11.214l-5.8-5.71 1.287-1.31.012-.012Zm-2.717 2.763L6.186 12.13l2.175 2.141 5.063-5.218-2.141-2.108Zm-6.25 6.886-1.98 5.849a.992.992 0 0 0 .245 1.026 1.03 1.03 0 0 0 1.043.242L10.282 19l-5.25-5.168Zm6.954 4.01 5.096-5.186-2.218-2.183-5.063 5.218 2.185 2.15Z" clip-rule="evenodd"/>
                                 </svg>
diff --git a/src/app/pages/admin/categories/create-category/create-category.component.html b/src/app/pages/admin/categories/create-category/create-category.component.html
index 91f0a0fa..771371bf 100644
--- a/src/app/pages/admin/categories/create-category/create-category.component.html
+++ b/src/app/pages/admin/categories/create-category/create-category.component.html
@@ -66,7 +66,7 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white">{{ 'CREATE_
                         <app-markdown-textarea formControlName="description"></app-markdown-textarea>
                         <label class="font-bold text-lg dark:text-white">{{ 'CREATE_CATEGORIES._choose_parent' | translate }}</label>
                         <label class="inline-flex items-center me-5 cursor-pointer ml-4">
-                            <input type="checkbox" (change)="toggleParent()" [checked]="parentSelectionCheck" class="sr-only peer">
+                            <input data-cy="adminToggleParentCategory" type="checkbox" (change)="toggleParent()" [checked]="parentSelectionCheck" class="sr-only peer">
                             <div class="relative w-11 h-6 bg-gray-400 dark:bg-gray-700 rounded-full peer peer-focus:ring-4 peer-focus:ring-primary-100 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-primary-100"></div>
                         </label>
                         @if(parentSelectionCheck){
@@ -128,7 +128,7 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white">{{ 'CREATE_
 
                     </form>
                     <div class="flex w-full justify-items-end justify-end">
-                        <button type="button" (click)="showFinish();generalDone=true;" [disabled]="!generalForm.valid || (parentSelectionCheck == true && selectedCategory==undefined)" [ngClass]="!generalForm.valid || (parentSelectionCheck == true && selectedCategory==undefined) ? 'opacity-50' : 'hover:bg-primary-50'" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                        <button data-cy="adminCategoryNext" type="button" (click)="showFinish();generalDone=true;" [disabled]="!generalForm.valid || (parentSelectionCheck == true && selectedCategory==undefined)" [ngClass]="!generalForm.valid || (parentSelectionCheck == true && selectedCategory==undefined) ? 'opacity-50' : 'hover:bg-primary-50'" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                             {{ 'CREATE_CATEGORIES._next' | translate }}
                             <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
@@ -176,7 +176,7 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white">{{ 'CREATE_
                     
                     
                     <div class="flex w-full justify-items-end justify-end ml-4">
-                        <button type="button" (click)="createCategory();" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                        <button data-cy="adminCreateCategory" type="button" (click)="createCategory();" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                             {{ 'CREATE_CATEGORIES._create' | translate }}
                             <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
diff --git a/src/app/pages/admin/verification/verification.component.html b/src/app/pages/admin/verification/verification.component.html
index 8aea089b..03595adc 100644
--- a/src/app/pages/admin/verification/verification.component.html
+++ b/src/app/pages/admin/verification/verification.component.html
@@ -38,11 +38,11 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white">{{ 'ADMIN._
                             class="mb-2 bg-gray-50 dark:bg-secondary-300 border border-gray-300 dark:border-secondary-200 dark:text-white text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />
     
                     <label for="vc" class="font-bold text-lg dark:text-white">{{ 'ADMIN._vc' | translate }}</label>
-                    <textarea formControlName="vc" rows="8" class="block w-full min-h-fit px-0 text-sm text-gray-800 dark:text-gray-200 bg-white dark:bg-secondary-300 border-0" placeholder="Add credential..." ></textarea>
+                    <textarea data-cy="adminVerifiableCredential" formControlName="vc" rows="8" class="block w-full min-h-fit px-0 text-sm text-gray-800 dark:text-gray-200 bg-white dark:bg-secondary-300 border-0" placeholder="Add credential..." ></textarea>
                 </form>
 
                 <div class="flex w-full justify-items-end justify-end ml-4">
-                    <button type="button" (click)="verifyCredential();" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                    <button data-cy="adminAddCredential" type="button" (click)="verifyCredential();" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                         {{ 'ADMIN._add' | translate }}
                         <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
diff --git a/src/app/pages/catalogs/catalogs.component.html b/src/app/pages/catalogs/catalogs.component.html
index 37af1d5c..494796a4 100644
--- a/src/app/pages/catalogs/catalogs.component.html
+++ b/src/app/pages/catalogs/catalogs.component.html
@@ -1,6 +1,6 @@
 <div class="container mx-auto pt-2 mb-8">
 
-    <h1 class="mb-2 text-center mt-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-4xl lg:text-5xl dark:text-white w-full"><span class="underline underline-offset-3 decoration-8 decoration-primary-100 dark:decoration-primary-100">{{'CATALOGS._all_catalogs' | translate}}</span></h1>
+    <h1 data-cy="cataloguesAllHeader" class="mb-2 text-center mt-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-4xl lg:text-5xl dark:text-white w-full"><span class="underline underline-offset-3 decoration-8 decoration-primary-100 dark:decoration-primary-100">{{'CATALOGS._all_catalogs' | translate}}</span></h1>
     <p class="mb-8 text-lg font-normal text-gray-500 lg:text-xl sm:px-16 xl:px-48 dark:text-secondary-50 text-center">{{'CATALOGS._choose' | translate}}</p>
 
     <!-- HEADER SEARCH BAR -->
@@ -33,30 +33,30 @@ <h1 class="mb-2 text-center mt-4 text-4xl font-extrabold leading-none tracking-t
 
             @for (cat of catalogs; track cat.id) {
 
-                <div (click)="goToCatalogSearch(cat.id)" class="block cursor-pointer rounded-lg bg-cover mb-4 md:mb-0" style="background-image: url(assets/logos/dome-logo-element-colour.png);" >
+                <div data-cy="cataloguesList" (click)="goToCatalogSearch(cat.id)" class="block cursor-pointer rounded-lg bg-cover mb-4 md:mb-0" style="background-image: url(assets/logos/dome-logo-element-colour.png);" >
                     <div class="block w-full h-full p-6 bg-opacity-100 bg-secondary-50 rounded-lg dark:bg-secondary-100 bg-secondary-50/90 dark:bg-secondary-100/90 bg-cover">
-                        <h5 [ngClass]="{
+                        <h5 data-cy="cataloguesTitle" [ngClass]="{
                           'break-all': hasLongWord(cat.name, 20),
                           'break-words': !hasLongWord(cat.name, 20)
                         }"  class="text-2xl font-bold tracking-tight line-clamp-4 text-primary-100 dark:text-white text-wrap break-words">{{cat.name}}</h5>
-                        <markdown class="line-clamp-[8] text-wrap break-all dark:text-white text-gray-900" [data]="cat.description ? cat.description : 'CATALOGS._no_desc' | translate"></markdown>
+                        <markdown data-cy="cataloguesDescription" class="line-clamp-[8] text-wrap break-all dark:text-white text-gray-900" [data]="cat.description ? cat.description : 'CATALOGS._no_desc' | translate"></markdown>
                         <!--<a (click)="showFullDesc(cat);$event.stopPropagation();" class="text-xs font-medium inline-flex items-center px-2.5 py-0.5 rounded-md text-secondary-50 bg-primary-100 dark:bg-secondary-50 dark:text-primary-100 mb-2">
                           <fa-icon [icon]="faEye" class="text-primary-50 mr-2"></fa-icon>
                           {{'CATALOGS._view_details' | translate}}
                         </a>-->
                         <hr class="h-px my-1 bg-primary-100 border-0 dark:bg-primary-100">
-                        <div class="">
+                        <div data-cy="cataloguesCategories" class="">
                           @for(category of cat.category; track category.id) {
                             <span [ngClass]="{
                               'break-all': hasLongWord(category.name, 20),
                               'break-words': !hasLongWord(category.name, 20)
                             }" class="inline-block bg-blue-300 text-primary-100 text-xs font-bold me-2 px-2.5 py-0.5 rounded-full w-fit text-wrap break-words">{{category.name}}</span>
                           } @empty {
-                            <span class="inline-block bg-blue-300 text-primary-100 text-xs font-bold me-2 px-2.5 py-0.5 rounded-full w-fit text-wrap break-words">{{'CATALOGS._no_cat' | translate}}</span>                            
+                            <span class="inline-block bg-blue-300 text-primary-100 text-xs font-bold me-2 px-2.5 py-0.5 rounded-full w-fit text-wrap break-words">{{'CATALOGS._no_cat' | translate}}</span>
                           }
                         </div>
                         <div class="flex sticky top-[100vh] justify-center align-items-bottom">
-                          <button (click)="showFullDesc(cat);$event.stopPropagation();" type="button" class="flex mt-2 items-center align-items-bottom text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-100 dark:hover:bg-primary-50 dark:focus:ring-primary-100 mr-1">
+                          <button data-cy="cataloguesViewDetails" (click)="showFullDesc(cat);$event.stopPropagation();" type="button" class="flex mt-2 items-center align-items-bottom text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-100 dark:hover:bg-primary-50 dark:focus:ring-primary-100 mr-1">
                             <svg class="w-[18px] h-[18px] text-white mr-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 14">
                               <g stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
                                 <path d="M10 10a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/>
@@ -104,7 +104,7 @@ <h1 class="mb-2 text-center mt-4 text-4xl font-extrabold leading-none tracking-t
   class="fixed inset-0 z-40 flex flex-col lg:flex-row justify-center overflow-y-auto overflow-x-hidden px-4 pt-[80px] lg:pt-0 lg:items-center">
 
   <div class="relative w-full max-w-4xl">
-    <div class="relative bg-white dark:bg-secondary-100 rounded-lg shadow-lg bg-cover bg-right-bottom overflow-y-auto max-h-[calc(100vh-160px)]"
+    <div data-cy="cataloguesDetailsContents" class="relative bg-white dark:bg-secondary-100 rounded-lg shadow-lg bg-cover bg-right-bottom overflow-y-auto max-h-[calc(100vh-160px)]"
          (click)="$event.stopPropagation();">
 
    <!-- HEADER -->
@@ -131,7 +131,7 @@ <h5 class="md:text-3xl lg:text-4xl font-semibold tracking-tight text-primary-100
    <hr class="h-px my-1 bg-primary-100 border-0 dark:bg-primary-100" />
 
    <!-- CATEGORIES -->
-   <div class="p-4 flex flex-wrap gap-2">
+   <div data-cy="cataloguesCategoriesList" class="p-4 flex flex-wrap gap-2">
      @for(category of showingCat.category; track category.id) {
        <span [ngClass]="{
         'break-all': hasLongWord(category.name, 20),
diff --git a/src/app/pages/checkout/checkout.component.html b/src/app/pages/checkout/checkout.component.html
index 32847b6b..80296e3d 100644
--- a/src/app/pages/checkout/checkout.component.html
+++ b/src/app/pages/checkout/checkout.component.html
@@ -46,6 +46,7 @@ <h1 class="mb-4 pb-2 mt-4 text-4xl font-extrabold leading-none tracking-tight te
             <p class="text-lg capitalize text-heading lg:text-xl dark:text-white">{{ 'SHOPPING_CART._billingAddress' | translate }}</p></div>
           @if (billingAddresses.length > 0) {
             <button
+              data-cy="orderAddBill"
               (click)="addBill=true;$event.stopPropagation();"
               class="flex items-center text-sm font-semibold text-accent dark:text-white transition-colors duration-200 hover:text-accent-hover focus:text-accent-hover focus:outline-0">
               <svg fill="none" viewBox="0 0 24 24" stroke="currentColor" class="h-4 w-4 stroke-2 ltr:mr-0.5 rtl:ml-0.5">
diff --git a/src/app/pages/product-orders/sections/order-info/order-info.component.html b/src/app/pages/product-orders/sections/order-info/order-info.component.html
index 03c257d6..e1e7ac04 100644
--- a/src/app/pages/product-orders/sections/order-info/order-info.component.html
+++ b/src/app/pages/product-orders/sections/order-info/order-info.component.html
@@ -201,7 +201,7 @@ <h6 class="mb-3 text-sm font-bold text-gray-900 dark:text-white">
                                                         </g>
                                                         </svg>
                                                 </button>
-                                              <button (click)="toggleDrawer(order);$event.stopPropagation();" type="button"
+                                              <button data-cy="orderNotesButton" (click)="toggleDrawer(order);$event.stopPropagation();" type="button"
                                                       class="text-white bg-primary-100 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center me-2">
                                                 @if (hasNotes(order)) {
                                                   <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
@@ -265,7 +265,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                         </button>
                     </div>
                     <!-- Modal body -->
-                    <div class="w-full h-full">
+                    <div data-cy="orderDetailsModal" class="w-full h-full">
                         <div class="p-4 relative overflow-x-auto rounded-lg">
                             <div class="flex flex-row gap-2 pb-2 text-gray-600">
                                 <p class="w-fit text-base font-bold shrink-0 dark:text-white">
@@ -563,7 +563,7 @@ <h5 id="drawer-notes-label" class="flex items-center text-base font-semibold tex
     </div>
 
     <!-- Display notes when available -->
-    <div *ngFor="let note of selectedOrder?.note" class="flex"
+    <div data-cy="orderNotesMessages" *ngFor="let note of selectedOrder?.note" class="flex"
          [ngClass]="{'justify-end': note.author === partyId, 'justify-start': note.author !== partyId}">
 
       <div class="max-w-xs p-3 rounded-lg shadow-md"
@@ -589,11 +589,11 @@ <h5 id="drawer-notes-label" class="flex items-center text-base font-semibold tex
   <!-- Input for adding new notes (fixed at the bottom) -->
   <div class="border-t pt-3">
     <div class="flex flex-col">
-      <textarea [(ngModel)]="newNoteText"
+      <textarea data-cy="orderNotesTextField" [(ngModel)]="newNoteText"
                 class="w-full p-2 text-sm border rounded-lg resize-none h-20"
                 placeholder="Write a new note..."
                 (keyup.enter)="addNote()"></textarea>
-      <button (click)="addNote()"
+      <button data-cy="orderNotesSendButton" (click)="addNote()"
               class="mt-2 px-4 py-2 text-sm font-semibold text-white bg-blue-500 rounded-lg hover:bg-blue-600">
         {{ isUpdating ? 'Saving...' : 'Send' }}
       </button>
diff --git a/src/app/pages/search-catalog/search-catalog.component.html b/src/app/pages/search-catalog/search-catalog.component.html
index 766754c7..9a849db7 100644
--- a/src/app/pages/search-catalog/search-catalog.component.html
+++ b/src/app/pages/search-catalog/search-catalog.component.html
@@ -5,7 +5,7 @@
         <nav class="flex px-5 py-3 text-gray-700 border border-gray-200 rounded-lg bg-gray-50 dark:bg-tertiary-100 dark:border-gray-700" aria-label="Breadcrumb">
             <ol class="inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
             <li class="inline-flex items-center">
-                <button (click)="goTo('/catalogues')" class="inline-flex w-full items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white">
+                <button data-cy="cataloguesAllButton" (click)="goTo('/catalogues')" class="inline-flex w-full items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white">
                 <svg class="w-3 h-3 mr-2 text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 12 10">
                 <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 1 1 5l4 4m6-8L7 5l4 4"/>
                 </svg>
diff --git a/src/app/pages/search/search.component.html b/src/app/pages/search/search.component.html
index 15ab4756..857e1eac 100644
--- a/src/app/pages/search/search.component.html
+++ b/src/app/pages/search/search.component.html
@@ -54,7 +54,7 @@
         @for (prod of products; track prod.id; let index = $index) {
           <bae-off-card data-cy="baeCard" [productOff]=prod [cardId]="index" class="w-full h-full p-2"></bae-off-card>
         } @empty {
-          <div class="min-h-19 dark:text-gray-600 text-center">{{ 'DASHBOARD._not_found' | translate }}</div>
+          <div data-cy="searchNoOffersFound" class="min-h-19 dark:text-gray-600 text-center">{{ 'DASHBOARD._not_found' | translate }}</div>
         }
       </div>
       @if (!loading_more) {
diff --git a/src/app/pages/seller-offerings/offerings/seller-catalogs/seller-catalogs.component.html b/src/app/pages/seller-offerings/offerings/seller-catalogs/seller-catalogs.component.html
index e022482e..1fa8c377 100644
--- a/src/app/pages/seller-offerings/offerings/seller-catalogs/seller-catalogs.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-catalogs/seller-catalogs.component.html
@@ -151,13 +151,13 @@ <h2 class="text-base font-bold">{{ 'OFFERINGS._order_by' | translate }}</h2>
             <tbody data-cy="catalogTable">
                 @for (cat of catalogs; track cat.id) {
                     <tr data-cy="catalogRow" class="border-b hover:bg-gray-200 dark:bg-secondary-300 dark:border-gray-700 dark:hover:bg-secondary-200">
-                        <td [ngClass]="{
+                        <td data-cy="catalogName" [ngClass]="{
                             'break-all': hasLongWord(cat.name, 20),
                             'break-words': !hasLongWord(cat.name, 20)
                             }" class="px-6 py-4 text-wrap break-words">
                             {{cat.name}}
                         </td>
-                        <td class="px-6 py-4">
+                        <td data-cy="catalogStatus" class="px-6 py-4">
                             @if(cat.lifecycleStatus == 'Active'){
                                 <span class="bg-gray-100 dark:bg-secondary-300 text-blue-600 text-xs font-medium me-2 px-2.5 py-0.5 rounded border border-blue-400">{{cat.lifecycleStatus}}</span>
                             } @else if(cat.lifecycleStatus == 'Launched') {
@@ -203,7 +203,7 @@ <h2 class="text-base font-bold">{{ 'OFFERINGS._order_by' | translate }}</h2>
     @if (!loading_more) {
         @if (page_check) {
         <div class="flex pt-6 pb-2 justify-center align-middle">
-            <button (click)="next()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
+            <button data-cy="loadMore" (click)="next()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
             {{ 'OFFERINGS._load_more' | translate }}
             <svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                 <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
diff --git a/src/app/pages/seller-offerings/offerings/seller-offer/seller-offer.component.html b/src/app/pages/seller-offerings/offerings/seller-offer/seller-offer.component.html
index 10577307..cbe6840f 100644
--- a/src/app/pages/seller-offerings/offerings/seller-offer/seller-offer.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-offer/seller-offer.component.html
@@ -154,13 +154,13 @@ <h2 class="text-base font-bold">{{ 'OFFERINGS._order_by' | translate }}</h2>
                 <tbody data-cy="offers">
                     @for (offer of offers; track offer.id) {
                         <tr data-cy="offerRow" class="border-b hover:bg-gray-200 dark:bg-secondary-300 dark:border-gray-700 dark:hover:bg-secondary-200">
-                            <td [ngClass]="{
+                            <td data-cy="offerTitle" [ngClass]="{
                                 'break-all': hasLongWord(offer.name, 20),
                                 'break-words': !hasLongWord(offer.name, 20)
                                 }" class="px-6 py-4 text-wrap break-words">
                                 {{offer.name}}
                             </td>
-                            <td class="px-6 py-4">
+                            <td data-cy="offerStatus" class="px-6 py-4">
                                 @if(offer.lifecycleStatus == 'Active'){
                                     <span class="bg-blue-100 dark:bg-secondary-300 text-blue-600 text-xs font-medium me-2 px-2.5 py-0.5 rounded border border-blue-400">{{offer.lifecycleStatus}}</span>
                                 } @else if(offer.lifecycleStatus == 'Launched') {
@@ -181,7 +181,7 @@ <h2 class="text-base font-bold">{{ 'OFFERINGS._order_by' | translate }}</h2>
                             <td class="px-6 py-4 hidden md:table-cell">
                                 {{offer.lastUpdate | date:'EEEE, dd/MM/yy, HH:mm'}} 
                             </td>
-                            <td class="px-6 py-4">
+                            <td data-cy="offerEdit" class="px-6 py-4">
                                 <button type="button" (click)="goToUpdate(offer)" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-2.5 text-center inline-flex items-center me-2">
                                     <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
                                         <path fill-rule="evenodd" d="M14 4.182A4.136 4.136 0 0 1 16.9 3c1.087 0 2.13.425 2.899 1.182A4.01 4.01 0 0 1 21 7.037c0 1.068-.43 2.092-1.194 2.849L18.5 11.214l-5.8-5.71 1.287-1.31.012-.012Zm-2.717 2.763L6.186 12.13l2.175 2.141 5.063-5.218-2.141-2.108Zm-6.25 6.886-1.98 5.849a.992.992 0 0 0 .245 1.026 1.03 1.03 0 0 0 1.043.242L10.282 19l-5.25-5.168Zm6.954 4.01 5.096-5.186-2.218-2.183-5.063 5.218 2.185 2.15Z" clip-rule="evenodd"/>
diff --git a/src/app/pages/seller-offerings/offerings/seller-offer/update-offer/update-offer.component.html b/src/app/pages/seller-offerings/offerings/seller-offer/update-offer/update-offer.component.html
index aa45227e..1ce5846f 100644
--- a/src/app/pages/seller-offerings/offerings/seller-offer/update-offer/update-offer.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-offer/update-offer/update-offer.component.html
@@ -4,11 +4,11 @@
         <nav class="flex px-5 py-3 text-gray-700 border border-gray-200 rounded-lg bg-secondary-50 dark:bg-secondary-100 dark:border-gray-800 dark:text-white" aria-label="Breadcrumb">
             <ol class="inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
             <li class="inline-flex items-center">
-                <button (click)="goBack()" class="inline-flex items-center text-sm font-medium text-gray-500 dark:text-white hover:text-primary-100 dark:hover:text-primary-50">
-                <svg class="w-3 h-3 mr-2 text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 12 10">
-                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 1 1 5l4 4m6-8L7 5l4 4"/>
-                </svg>
-                {{ 'UPDATE_OFFER._back' | translate }}
+                <button data-cy="editOfferBack" (click)="goBack()" class="inline-flex items-center text-sm font-medium text-gray-500 dark:text-white hover:text-primary-100 dark:hover:text-primary-50">
+                    <svg class="w-3 h-3 mr-2 text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 12 10">
+                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 1 1 5l4 4m6-8L7 5l4 4"/>
+                    </svg>
+                    {{ 'UPDATE_OFFER._back' | translate }}
                 </button>
             </li>
             <li aria-current="page">
diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html
index 0f41c8bc..c05799fa 100644
--- a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html
@@ -215,10 +215,10 @@ <h3 class="font-bold text-primary-100 dark:text-primary-50 text-left ml-4">
                         </p>
                         
                         <div class="flex items-center justify-between">
-                            <button (click)="toggleUploadSelfAtt();$event.stopPropagation();" type="button" class="text-white file-select-button mr-4 bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
+                            <button data-cy="productSpecUploadFirst" (click)="toggleUploadSelfAtt();$event.stopPropagation();" type="button" class="text-white file-select-button mr-4 bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
                                 <svg class="w-4 h-4 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
                                     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 5v9m-5 0H5a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-4a1 1 0 0 0-1-1h-2M8 9l4-5 4 5m1 8h.01"/>
-                                </svg>                                                
+                                </svg>
                             </button>
                             @if(selfAtt){
                                 <button (click)="removeSelfAtt()" type="button" class="text-white bg-red-600 hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
@@ -247,7 +247,7 @@ <h3 class="font-bold text-primary-100 dark:text-primary-50 text-left ml-4">
                                                 <label for="checkbox-item-1" class="ms-2 text-sm" [ngClass]="iso.domesupported == true ? 'text-primary-100 font-bold' : 'text-gray-900 dark:text-white font-medium'">
                                                     {{iso.name}}
                                                 </label>
-                                                <button (click)="addISO(iso)" type="button" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
+                                                <button data-cy="productSpecCharAddISO" (click)="addISO(iso)" type="button" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
                                                     <svg class="w-4 h-4 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 24 24">
                                                         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
                                                     </svg>
@@ -290,15 +290,15 @@ <h3 class="font-bold text-primary-100 dark:text-primary-50 text-left ml-4">
                                             class="mb-2 bg-gray-50 dark:bg-secondary-300 border border-2 border-gray-300 dark:border-secondary-200 dark:text-white text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" /> -->                                     
                                         </td>
                                         <td class="px-6 py-4 inline-flex">
-                                            <button (click)="toggleUploadFile(sel);$event.stopPropagation();" type="button" class="text-white file-select-button mr-4 bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
+                                            <button data-cy="productSpecUploadSecond" (click)="toggleUploadFile(sel);$event.stopPropagation();" type="button" class="text-white file-select-button mr-4 bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
                                                 <svg class="w-4 h-4 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
                                                     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 5v9m-5 0H5a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-4a1 1 0 0 0-1-1h-2M8 9l4-5 4 5m1 8h.01"/>
-                                                </svg>                                                
-                                            </button>                                          
-                                            <button (click)="removeISO(sel)" type="button" class="text-white bg-red-600 hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
+                                                </svg>
+                                            </button>
+                                            <button data-cy="productSpecDeleteCompliance" (click)="removeISO(sel)" type="button" class="text-white bg-red-600 hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 font-medium rounded-full text-sm p-1 text-center inline-flex items-center">
                                                 <svg class="w-4 h-4 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
                                                     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18 17.94 6M18 18 6.06 6"/>
-                                                </svg>                                                                                                
+                                                </svg>
                                             </button>                                              
                                         </td>
                                     </tr>
@@ -692,7 +692,7 @@ <h3 class="text-sm italic text-gray-600 ml-4 dark:text-gray-200">There's no char
                         @if (!loadingResourceSpec_more) {
                             @if (resourceSpecPageCheck) {
                             <div class="flex pt-6 pb-2 justify-center align-middle">
-                                <button (click)="nextRes()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
+                                <button data-cy="loadMore" (click)="nextRes()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
                                 {{ 'CREATE_PROD_SPEC._load_more' | translate }}
                                 <svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                                     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
@@ -858,7 +858,7 @@ <h3 class="font-semibold text-gray-900 dark:text-white">{{ 'CREATE_PROD_SPEC._fi
                                         </svg>
                                         <div class="flex w-full justify-center">
                                             <p class="text-gray-500 mr-2 w-fit">{{ 'CREATE_PROD_SPEC._drop_files' | translate }}
-                                                <button (click)="openFileSelector()" class="font-medium text-primary-100 dark:text-primary-50 hover:underline">{{ 'CREATE_PROD_SPEC._select_files' | translate }}</button>
+                                                <button data-cy="productSpecAttachSelectFile" (click)="openFileSelector()" class="font-medium text-primary-100 dark:text-primary-50 hover:underline">{{ 'CREATE_PROD_SPEC._select_files' | translate }}</button>
                                             </p> 
                                         </div>
                                     </div>
@@ -954,7 +954,7 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                     }
                     @if(showNewAtt==false){
                         <div class="flex w-full justify-items-center justify-center">
-                            <button type="button" (click)="showNewAtt=!showNewAtt" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                            <button data-cy="productSpecAddNewAttachment" type="button" (click)="showNewAtt=!showNewAtt" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                                 {{ 'CREATE_PROD_SPEC._new_att' | translate }}
                                 <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                                     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
@@ -1084,11 +1084,11 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                                                     {{rel.productSpec.lastUpdate | date:'EEEE, dd/MM/yy, HH:mm'}} 
                                                 </td>
                                                 <td class="px-6 py-4">
-                                                    <button (click)="deleteRel(rel)" class="font-bold text-white bg-red-500 rounded-3xl">
+                                                    <button data-cy="productSpecDeleteRelationship" (click)="deleteRel(rel)" class="font-bold text-white bg-red-500 rounded-3xl">
                                                         <svg class="w-4 h-4 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                                                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18 17.94 6M18 18 6.06 6"/>
-                                                        </svg>                                  
-                                                    </button>    
+                                                        </svg>
+                                                    </button>
                                                 </td>
                                             </tr>
                                         }
@@ -1098,11 +1098,11 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                         }
                         @if(showCreateRel==false){
                             <div class="flex w-full justify-items-center justify-center">
-                                <button type="button" (click)="showCreateRel=!showCreateRel" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                                <button data-cy="productSpecAddRelationship" type="button" (click)="showCreateRel=!showCreateRel" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                                     {{ 'CREATE_PROD_SPEC._add_relationship' | translate }}
                                     <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                                         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
-                                    </svg>                                  
+                                    </svg>
                                 </button>
                             </div>
                         } @else {
@@ -1198,11 +1198,11 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                                 }
                             }
                             <div class="flex w-full justify-items-center justify-center mt-4">
-                                <button type="button" (click)="saveRel()" [disabled]="prodSpecRels.length==0 || selectedProdSpec.id == ''" [ngClass]="prodSpecRels.length==0 || selectedProdSpec.id == '' ? 'opacity-50' : 'hover:bg-primary-50'" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                                <button data-cy="productSpecSaveRelationship" type="button" (click)="saveRel()" [disabled]="prodSpecRels.length==0 || selectedProdSpec.id == ''" [ngClass]="prodSpecRels.length==0 || selectedProdSpec.id == '' ? 'opacity-50' : 'hover:bg-primary-50'" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                                     {{ 'CREATE_PROD_SPEC._save_relationship' | translate }}
                                     <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                                         <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M11 16h2m6.707-9.293-2.414-2.414A1 1 0 0 0 16.586 4H5a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V7.414a1 1 0 0 0-.293-.707ZM16 20v-6a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v6h8ZM9 4h6v3a1 1 0 0 1-1 1h-4a1 1 0 0 1-1-1V4Z"/>
-                                    </svg>                                                                   
+                                    </svg>
                                 </button>
                             </div>
                         }
@@ -1610,17 +1610,17 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 17h3a3 3 0 0 0 0-6h-.025a5.56 5.56 0 0 0 .025-.5A5.5 5.5 0 0 0 7.207 9.021C7.137 9.017 7.071 9 7 9a4 4 0 1 0 0 8h2.167M12 19v-9m0 0-2 2m2-2 2 2"/>
                         </svg>                        
                         <p class="text-gray-500 mr-4">{{ 'CREATE_PROD_SPEC._drop_files' | translate }}
-                            <button (click)="openFileSelector()" class="font-medium text-primary-100 dark:text-primary-50 hover:underline">{{ 'CREATE_PROD_SPEC._select_files' | translate }}</button>
+                            <button data-cy="productSpecSelectFile" (click)="openFileSelector()" class="font-medium text-primary-100 dark:text-primary-50 hover:underline">{{ 'CREATE_PROD_SPEC._select_files' | translate }}</button>
                         </p>                       
                     </ng-template>
                 </ngx-file-drop>  
 
               
                 <div class="flex justify-center items-center space-x-4">
-                    <button (click)="showUploadFile=false;$event.stopPropagation();" type="button" class="py-2 px-3 text-sm font-medium text-gray-500 bg-white rounded-lg border border-gray-200 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 hover:text-gray-900 focus:z-10">
+                    <button data-cy="productSpecCancelUpload" (click)="showUploadFile=false;$event.stopPropagation();" type="button" class="py-2 px-3 text-sm font-medium text-gray-500 bg-white rounded-lg border border-gray-200 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 hover:text-gray-900 focus:z-10">
                         {{ 'CREATE_PROD_SPEC._cancel' | translate }}
                     </button>
-                    <button (click)="uploadFile()" type="submit" class="py-2 px-3 text-sm font-medium text-center text-white bg-primary-100 hover:bg-primary-50 rounded-lg focus:ring-4 focus:outline-none focus:ring-primary-50">
+                    <button data-cy="productSpecConfirmUpload" (click)="uploadFile()" type="submit" class="py-2 px-3 text-sm font-medium text-center text-white bg-primary-100 hover:bg-primary-50 rounded-lg focus:ring-4 focus:outline-none focus:ring-primary-50">
                         {{ 'CREATE_PROD_SPEC._upload' | translate }}
                     </button>
                 </div>
diff --git a/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html b/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html
index 91592bb4..fd495793 100644
--- a/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html
+++ b/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html
@@ -50,7 +50,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                                 ({{bill.telephoneType}}) {{bill.telephoneNumber}}
                             </td>
                             <td class="px-6 py-4 inline-flex">
-                                <button (click)="toggleEditBill(bill);$event.stopPropagation();" type="button" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
+                                <button data-cy="billingEdit" (click)="toggleEditBill(bill);$event.stopPropagation();" type="button" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
                                     <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
                                         <path fill-rule="evenodd" d="M14 4.182A4.136 4.136 0 0 1 16.9 3c1.087 0 2.13.425 2.899 1.182A4.01 4.01 0 0 1 21 7.037c0 1.068-.43 2.092-1.194 2.849L18.5 11.214l-5.8-5.71 1.287-1.31.012-.012Zm-2.717 2.763L6.186 12.13l2.175 2.141 5.063-5.218-2.141-2.108Zm-6.25 6.886-1.98 5.849a.992.992 0 0 0 .245 1.026 1.03 1.03 0 0 0 1.043.242L10.282 19l-5.25-5.168Zm6.954 4.01 5.096-5.186-2.218-2.183-5.063 5.218 2.185 2.15Z" clip-rule="evenodd"/>
                                     </svg>
diff --git a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html
index 20848ab0..cb666209 100644
--- a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html
+++ b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html
@@ -253,12 +253,12 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                                 }                                
                             </td> 
                             <td class="px-6 py-4 inline-flex">
-                                <button type="button" (click)="showEdit(medium)" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
+                                <button data-cy="editContact" type="button" (click)="showEdit(medium)" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
                                     <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
                                         <path fill-rule="evenodd" d="M14 4.182A4.136 4.136 0 0 1 16.9 3c1.087 0 2.13.425 2.899 1.182A4.01 4.01 0 0 1 21 7.037c0 1.068-.43 2.092-1.194 2.849L18.5 11.214l-5.8-5.71 1.287-1.31.012-.012Zm-2.717 2.763L6.186 12.13l2.175 2.141 5.063-5.218-2.141-2.108Zm-6.25 6.886-1.98 5.849a.992.992 0 0 0 .245 1.026 1.03 1.03 0 0 0 1.043.242L10.282 19l-5.25-5.168Zm6.954 4.01 5.096-5.186-2.218-2.183-5.063 5.218 2.185 2.15Z" clip-rule="evenodd"/>
                                     </svg>
                                 </button>
-                                <button type="button" (click)="removeMedium(medium)" class="text-white bg-red-800 hover:bg-red-900 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
+                                <button data-cy="deleteContact" type="button" (click)="removeMedium(medium)" class="text-white bg-red-800 hover:bg-red-900 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
                                     <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
                                         <path fill-rule="evenodd" d="M8.586 2.586A2 2 0 0 1 10 2h4a2 2 0 0 1 2 2v2h3a1 1 0 1 1 0 2v12a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V8a1 1 0 0 1 0-2h3V4a2 2 0 0 1 .586-1.414ZM10 6h4V4h-4v2Zm1 4a1 1 0 1 0-2 0v8a1 1 0 1 0 2 0v-8Zm4 0a1 1 0 1 0-2 0v8a1 1 0 1 0 2 0v-8Z" clip-rule="evenodd"/>
                                         </svg>
@@ -375,7 +375,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
             }
         </form>
         <div class="flex w-full justify-items-center justify-center m-2 p-2">
-            <button type="button" [disabled]="!mediumForm.valid" [ngClass]="!mediumForm.valid ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="saveMedium()" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+            <button data-cy="saveOrgProfile" type="button" [disabled]="!mediumForm.valid" [ngClass]="!mediumForm.valid ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="saveMedium()" class="flex text-white justify-center bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                 {{ 'PROFILE._save' | translate }}
                 <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                     <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M11 16h2m6.707-9.293-2.414-2.414A1 1 0 0 0 16.586 4H5a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V7.414a1 1 0 0 0-.293-.707ZM16 20v-6a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v6h8ZM9 4h6v3a1 1 0 0 1-1 1h-4a1 1 0 0 1-1-1V4Z"/>
diff --git a/src/app/shared/billing-account-form/billing-account-form.component.html b/src/app/shared/billing-account-form/billing-account-form.component.html
index 61fdfd96..3621908d 100644
--- a/src/app/shared/billing-account-form/billing-account-form.component.html
+++ b/src/app/shared/billing-account-form/billing-account-form.component.html
@@ -130,7 +130,7 @@
         <label for="phoneNumber" class="mb-3 block text-sm font-semibold leading-none text-body-dark dark:text-white">{{ 'BILLING._phone' | translate }} (*)</label>
         <div class="w-full">
             <div class="relative flex items-center">
-                <button (click)="prefixCheck=!prefixCheck"
+                <button data-cy="billingPhoneCountry" (click)="prefixCheck=!prefixCheck"
                 class="mb-2 flex-shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 dark:bg-secondary-300 dark:border-secondary-200 dark:text-white rounded-s-lg hover:bg-gray-200 dark:hover:bg-primary-200 focus:ring-4 focus:outline-none focus:ring-gray-100" type="button">
                     {{phonePrefix.flag}} {{phonePrefix.code}}
                     <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/></svg>
diff --git a/src/app/shared/card/card.component.html b/src/app/shared/card/card.component.html
index 4fa6f43b..6385bdd9 100644
--- a/src/app/shared/card/card.component.html
+++ b/src/app/shared/card/card.component.html
@@ -14,7 +14,7 @@
 
   <div class="flex-1 h-full bg-cover bg-right-bottom bg-opacity-25 bg-blend-multiply rounded-lg" [style.background-image]="'url(' + currentTheme?.assets?.cardDefaultBgUrl + ')'">
     <div class="flex-1 h-full px-5 py-5 bg-secondary-50/95 dark:bg-tertiary-100/95 rounded-b-lg">
-      <div class="flex items-center flex-wrap overflow-y-hidden overflow-x-hidden align-middle">
+      <div data-cy="searchOfferCategories" class="flex items-center flex-wrap overflow-y-hidden overflow-x-hidden align-middle">
         <!--<a class="text-xs font-medium inline-flex items-center px-2.5 py-0.5 rounded-md mb-2 mr-2"
         [ngClass]="complianceLevel == 'NL' ? 'bg-red-200 text-red-700' : complianceLevel == 'BL' ? 'bg-orange-200 text-orange-700' : complianceLevel == 'P' ? 'bg-yellow-200 text-yellow-700' : 'bg-green-200 text-green-700'">
         <fa-icon [icon]="faAtom" class="mr-2" [ngClass]="complianceLevel == 'NL' ? 'text-red-700' : complianceLevel == 'BL' ? 'text-orange-700' : complianceLevel == 'P' ? 'text-yellow-700' : 'text-green-700'"></fa-icon>
@@ -37,19 +37,19 @@
           <bae-badge class="mr-2" [category]=cat></bae-badge>
         }
         @if(checkMoreCats){
-          <a class="text-xs font-medium inline-flex items-center px-2.5 py-0.5 rounded-md text-secondary-50 bg-primary-100 dark:bg-secondary-50 dark:text-primary-100 mb-2 mr-2">
+          <a data-cy="searchShowAllCategories" class="text-xs font-medium inline-flex items-center px-2.5 py-0.5 rounded-md text-secondary-50 bg-primary-100 dark:bg-secondary-50 dark:text-primary-100 mb-2 mr-2">
             <fa-icon [icon]="faEllipsis" class="text-secondary-50 dark:text-primary-100"></fa-icon>
           </a>
         }
         </div>
       <a (click)="goToProductDetails(productOff)" class="cursor-pointer">
-        <h5 [ngClass]="{
+        <h5 data-cy="searchOfferTitle" [ngClass]="{
           'break-all': hasLongWord(productOff?.name, 20),
           'break-words': !hasLongWord(productOff?.name, 20)
         }"
         class="text-xl font-semibold line-clamp-2 tracking-tight text-primary-100 dark:text-white text-wrap break-words">{{productOff?.name}}</h5>
       </a>
-      <markdown class="min-h-19 h-19 line-clamp-2 text-gray-600 dark:text-gray-400" [data]="productOff?.description"></markdown>
+      <markdown data-cy="searchOfferDescription" class="min-h-19 h-19 line-clamp-2 text-gray-600 dark:text-gray-400" [data]="productOff?.description"></markdown>
       <!--<div class="flex w-full justify-between mt-2.5 mb-5 text-gray-500 font-mono">
         <div>V: {{productOff?.version || 'latest'}}</div>
         <div class="flex items-center">
@@ -74,7 +74,7 @@
 
       <div class="flex sticky top-[100vh] items-center justify-center align-items-bottom rounded-lg mt-4">
 
-        <button (click)="toggleDetailsModal();$event.stopPropagation();"  type="button" class="flex items-center align-items-bottom text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-100 dark:hover:bg-primary-50 dark:focus:ring-primary-100 mr-1">
+        <button data-cy="searchViewDetails" (click)="toggleDetailsModal();$event.stopPropagation();"  type="button" class="flex items-center align-items-bottom text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-100 dark:hover:bg-primary-50 dark:focus:ring-primary-100 mr-1">
           <svg class="w-[18px] h-[18px] text-white mr-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 14">
             <g stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
               <path d="M10 10a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/>
diff --git a/src/app/shared/categories-filter/categories-filter.component.html b/src/app/shared/categories-filter/categories-filter.component.html
index 81dda8ce..2334c806 100644
--- a/src/app/shared/categories-filter/categories-filter.component.html
+++ b/src/app/shared/categories-filter/categories-filter.component.html
@@ -1,7 +1,7 @@
 <h2 class="text-2xl dark:text-secondary-50 p-2">{{ 'CATEGORIES._categories' | translate }}</h2>
   <div id="accordion-collapse"  data-accordion="open" >
     @for(category of categories; track category.id; let idx = $index) {
-    
+
         <h2 [id]="'accordion-heading-'+idx">
           @if (category.children) {
             @if (category.children.length != 0) {
@@ -15,7 +15,7 @@ <h2 [id]="'accordion-heading-'+idx">
                     <input [checked]="isCheckedCategory(category)" type="checkbox" value="" class="hidden peer">
                     <fa-icon [icon]="isCheckedCategory(category) ? faCircleCheck : faCircle" class="text-2xl"></fa-icon>
                   </div>
-                  <button type="button" class="ml-4" [attr.data-accordion-target]="'#accordion-body-'+idx" aria-expanded="false" [attr.aria-controls]="'accordion-body-'+idx">              
+                  <button type="button" class="ml-4" [attr.data-accordion-target]="'#accordion-body-'+idx" aria-expanded="false" [attr.aria-controls]="'accordion-body-'+idx">
                     <svg data-accordion-icon class="w-3 h-3 rotate-180 shrink-0" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5 5 1 1 5"/>
                     </svg>
diff --git a/src/app/shared/category-item/category-item.component.html b/src/app/shared/category-item/category-item.component.html
index f4d76ee0..7ad523aa 100644
--- a/src/app/shared/category-item/category-item.component.html
+++ b/src/app/shared/category-item/category-item.component.html
@@ -3,27 +3,27 @@
     <input [(ngModel)]="checked" type="checkbox" [id]="option" value="" class="hidden peer" #optioninput>
     <label [for]="option" [ngClass]="isParent && isFirst ? labelClassParentFirst : isParent && isLast ? labelClassParentLast : isParent ? labelClassParent : labelClass" (click)="onClick(optioninput.checked)">
       <div class="flex w-full justify-between items-center">
-        <div [ngClass]="{
+        <div data-cy="searchCategoryName" [ngClass]="{
           'break-all': hasLongWord(data?.name, 20),
           'break-words': !hasLongWord(data?.name, 20)
           }" class="w-full text-base text-left font-semibold text-wrap break-words">{{ data?.name }}</div>
-        <fa-icon [icon]="checked ? faCircleCheck : faCircle" class="mr-7 text-2xl"></fa-icon>
+        <fa-icon data-cy="searchCategorySelect" [icon]="checked ? faCircleCheck : faCircle" class="mr-7 text-2xl"></fa-icon>
       </div>
     </label>
   } @else {
     @if(data){
       <h2 [id]="'accordion-heading-'+simplifiedId">
         <div [ngClass]="checkClasses(isFirst,isLast,data)">
-          <span [ngClass]="{
+          <span data-cy="searchCategoryName" [ngClass]="{
             'break-all': hasLongWord(data.name, 20),
             'break-words': !hasLongWord(data.name, 20)
             }" class="text-left justify-start text-wrap break-words">{{ data.name }}</span>
           <div class="justify-end inline-flex">
-            <div class="justify-end" (click)="onClickCategory(data)">
+            <div data-cy="searchCategorySelect" class="justify-end" (click)="onClickCategory(data)">
               <input [checked]="isCheckedCategory(data)" type="checkbox" value="" class="hidden peer">
               <fa-icon [icon]="isCheckedCategory(data) ? faCircleCheck : faCircle" class="text-2xl"></fa-icon>
             </div>
-            <button type="button" class="ml-4" [attr.data-accordion-target]="'#accordion-body-'+simplifiedId" aria-expanded="false" [attr.aria-controls]="'accordion-body-'+simplifiedId">              
+            <button data-cy="searchCategoryDropdown" type="button" class="ml-4" [attr.data-accordion-target]="'#accordion-body-'+simplifiedId" aria-expanded="false" [attr.aria-controls]="'accordion-body-'+simplifiedId">
               <svg data-accordion-icon class="w-3 h-3 rotate-180 shrink-0" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                 <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5 5 1 1 5"/>
               </svg>
diff --git a/src/app/shared/forms/offer/catalogue/catalogue.component.html b/src/app/shared/forms/offer/catalogue/catalogue.component.html
index 491ce39c..c571bfbc 100644
--- a/src/app/shared/forms/offer/catalogue/catalogue.component.html
+++ b/src/app/shared/forms/offer/catalogue/catalogue.component.html
@@ -51,7 +51,7 @@
                                 (click)="$event.stopPropagation(); toggleSelection(cat)">
                         </td>
 
-                        <td [ngClass]="{
+                        <td data-cy="offerCatalogName" [ngClass]="{
                             'break-all': hasLongWord(cat.name, 20),
                             'break-words': !hasLongWord(cat.name, 20)
                             }" class="px-6 py-4 text-wrap break-words">
@@ -80,7 +80,7 @@
     @if (!loadingCatalog_more) {
         @if (catalogPageCheck) {
         <div class="flex pt-6 pb-2 justify-center align-middle">
-            <button (click)="nextCatalog()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
+            <button data-cy="loadMore" (click)="nextCatalog()" class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 dark:hover:bg-secondary-100 border border-gray-300 dark:border-secondary-200 rounded-lg hover:bg-gray-200">
                 {{ 'CREATE_PROD_SPEC._load_more' | translate }}
             <svg class="w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                 <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-7 7V5"/>
diff --git a/src/app/shared/forms/offer/category/category.component.html b/src/app/shared/forms/offer/category/category.component.html
index 65bd947f..e270f0b9 100644
--- a/src/app/shared/forms/offer/category/category.component.html
+++ b/src/app/shared/forms/offer/category/category.component.html
@@ -58,7 +58,7 @@
             (click)="manageCategory(category)">
 
           <!-- Botón Expandir -->
-            <td class="px-6 py-4">
+            <td data-cy="offerCategoryExpand" class="px-6 py-4">
               <button
                 *ngIf="category.childrenLoaded || !category.childrenLoaded"
                 (click)="toggleCategory(category); $event.stopPropagation()"
@@ -82,7 +82,7 @@
 
 
             <!-- Nombre de la Categoría con Indentación -->
-            <td class="px-6 py-4" [style.padding-left.px]="level * 20">
+            <td data-cy="offerCategoryName" class="px-6 py-4" [style.padding-left.px]="level * 20">
               {{ category.name }}
             </td>
 
diff --git a/src/app/shared/forms/offer/offer.component.html b/src/app/shared/forms/offer/offer.component.html
index 2062f257..c9e032f4 100644
--- a/src/app/shared/forms/offer/offer.component.html
+++ b/src/app/shared/forms/offer/offer.component.html
@@ -20,7 +20,7 @@ <h2 class="text-3xl font-bold text-primary-100 dark:text-white pb-4">
 } @else {
   <!-- Stepper -->
   <form [formGroup]="productOfferForm">
-    <ol class="flex items-start w-full text-sm font-medium text-center text-gray-500 dark:text-gray-400">
+    <ol data-cy="offerSteps" class="flex items-start w-full text-sm font-medium text-center text-gray-500 dark:text-gray-400">
       @for (step of steps; track i; let i = $index) {
         <li 
             (click)="handleStepClick(i)"
@@ -141,7 +141,7 @@ <h3 class="block md:hidden mt-2 text-center text-2xl text-primary-100 dark:text-
   }
     <!-- Navigation Buttons -->
     <div class="flex justify-end mt-6 space-x-4">
-      <button (click)="goToStep(currentStep - 1)"
+      <button data-cy="offerPrevious" (click)="goToStep(currentStep - 1)"
               [disabled]="currentStep === 0"
               [ngClass]="{
                 'text-gray-500 dark:text-gray-400 hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== 0,
diff --git a/src/app/shared/forms/offer/price-plans/configuration-profile-drawer/configuration-profile-drawer.component.html b/src/app/shared/forms/offer/price-plans/configuration-profile-drawer/configuration-profile-drawer.component.html
index d9e655d6..d2eddbfe 100644
--- a/src/app/shared/forms/offer/price-plans/configuration-profile-drawer/configuration-profile-drawer.component.html
+++ b/src/app/shared/forms/offer/price-plans/configuration-profile-drawer/configuration-profile-drawer.component.html
@@ -42,7 +42,7 @@ <h5 class="text-xl font-semibold tracking-tight text-primary-100">{{char.value.n
               </div>
             }@else{
               <!-- Dropdown Selector -->
-              <select *ngIf="!char.value.options?.[0]?.valueFrom"
+              <select data-cy="offerProfileSelect" *ngIf="!char.value.options?.[0]?.valueFrom"
                       class="mb-2 bg-gray-50 dark:bg-secondary-300 border text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:text-gray-100"
                       (change)="changeProfileValue($index, $event)">
                 <option *ngFor="let opt of char.value.options" [value]="opt.value" [selected]="opt.isDefault">
@@ -55,8 +55,8 @@ <h5 class="text-xl font-semibold tracking-tight text-primary-100">{{char.value.n
       </div>
       <!-- Action Buttons -->
       <div class="flex justify-end space-x-3 p-4">
-        <button type="button" (click)="closeDrawer()" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 rounded dark:text-white">{{ 'FORMS.PRICE_PLANS._cancel' | translate }}</button>
-        <button type="button" (click)="saveProfile()"
+        <button data-cy="offerProfileCancel" type="button" (click)="closeDrawer()" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 rounded dark:text-white">{{ 'FORMS.PRICE_PLANS._cancel' | translate }}</button>
+        <button data-cy="offerProfileSave" type="button" (click)="saveProfile()"
                 class="px-4 py-2 rounded text-white transition"
                 [ngClass]="{'bg-primary-100 hover:bg-primary-50': form.valid, 'bg-gray-400 cursor-not-allowed': form.invalid}">
           {{ 'FORMS.PRICE_PLANS._save' | translate }}
diff --git a/src/app/shared/forms/offer/price-plans/price-component-drawer/price-component-drawer.component.html b/src/app/shared/forms/offer/price-plans/price-component-drawer/price-component-drawer.component.html
index 747b4b19..cc0ea62e 100644
--- a/src/app/shared/forms/offer/price-plans/price-component-drawer/price-component-drawer.component.html
+++ b/src/app/shared/forms/offer/price-plans/price-component-drawer/price-component-drawer.component.html
@@ -202,7 +202,7 @@ <h2 class="text-xl font-semibold text-gray-700 dark:text-white">
 
       <!-- Descuento -->
       <div class="flex items-center mb-4">
-        <input
+        <input data-cy="offerPriceComponentDiscount"
           type="checkbox"
           [(ngModel)]="showDiscount"
           [ngModelOptions]="{ standalone: true }"
@@ -222,6 +222,7 @@ <h2 class="text-xl font-semibold text-gray-700 dark:text-white">
           </label>
           <div class="flex space-x-2">
             <input
+              data-cy="offerDiscountAmount"
               formControlName="discountValue"
               type="number"
               placeholder="Amount"
@@ -229,6 +230,7 @@ <h2 class="text-xl font-semibold text-gray-700 dark:text-white">
               [ngClass]="(priceComponentForm.get('discountValue')?.invalid == true && priceComponentForm.value.discountValue!='') || (priceComponentForm.get('discountValue')?.touched && priceComponentForm.value.discountValue=='') ? 'border-red-600' : 'dark:border-gray-600'"
             >
             <select
+              data-cy="offerDiscountUnit"
               formControlName="discountUnit"
               class="w-1/2 p-2 border rounded dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"
             >
@@ -262,6 +264,7 @@ <h2 class="text-xl font-semibold text-gray-700 dark:text-white">
           </label>
           <div class="flex space-x-2">
             <input
+              data-cy="offerDiscountDuration"
               formControlName="discountDuration"
               type="number"
               placeholder="Duration"
@@ -269,6 +272,7 @@ <h2 class="text-xl font-semibold text-gray-700 dark:text-white">
               [ngClass]="(priceComponentForm.get('discountDuration')?.invalid == true && priceComponentForm.value.discountDuration!='') || (priceComponentForm.get('discountDuration')?.touched && priceComponentForm.value.discountDuration=='') ? 'border-red-600' : 'dark:border-gray-600'"
             >
             <select
+              data-cy="offerDiscountDurationUnit"
               formControlName="discountDurationUnit"
               class="w-1/2 p-2 border rounded dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"
             >
@@ -294,7 +298,7 @@ <h2 class="text-xl font-semibold text-gray-700 dark:text-white">
       }
       <!-- Botones -->
       <div class="flex justify-end space-x-3 mt-6">
-        <button type="button" (click)="closeDrawer()" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 dark-text:white rounded">{{ 'FORMS.PRICE_PLAN_COMPONENT._cancel' | translate }}</button>
+        <button data-cy="cancelPriceComponent" type="button" (click)="closeDrawer()" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 dark-text:white rounded">{{ 'FORMS.PRICE_PLAN_COMPONENT._cancel' | translate }}</button>
         <button data-cy="savePriceComponent" type="submit" [disabled]="priceComponentForm.invalid" [ngClass]="priceComponentForm.invalid ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" class="px-4 py-2 bg-blue-500 text-white rounded">{{ 'FORMS.PRICE_PLAN_COMPONENT._save' | translate }}</button>
       </div>
       </form>
diff --git a/src/app/shared/forms/offer/price-plans/price-components-table/price-components-table.component.html b/src/app/shared/forms/offer/price-plans/price-components-table/price-components-table.component.html
index f78fa1bc..1ed5273d 100644
--- a/src/app/shared/forms/offer/price-plans/price-components-table/price-components-table.component.html
+++ b/src/app/shared/forms/offer/price-plans/price-components-table/price-components-table.component.html
@@ -18,7 +18,7 @@
           <td class="px-6 py-4">{{ getPriceTypeLabel(component.priceType) }}</td>
           <td class="px-6 py-4 text-center flex justify-center gap-3">
             <!-- Botón Editar -->
-            <button (click)="editPriceComponent(component)" class="text-blue-500 hover:text-secondary-400 transition">
+            <button data-cy="ppEditPriceComponent" (click)="editPriceComponent(component)" class="text-blue-500 hover:text-secondary-400 transition">
               <svg class="min-w-4 w-4 h-4 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
                 <path fill="currentColor"
                       d="M410.3 231l11.3-11.3-33.9-33.9-62.1-62.1L291.7 89.8l-11.3 11.3-22.6 22.6L58.6 322.9c-10.4
@@ -31,7 +31,7 @@
               </svg>
             </button>
             <!-- Botón Eliminar -->
-            <button (click)="confirmDelete(component)" class="text-red-500 hover:text-red-700 transition">
+            <button data-cy="ppDeletePriceComponent" (click)="confirmDelete(component)" class="text-red-500 hover:text-red-700 transition">
               <svg class="min-w-4 w-4 h-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
                 <path fill="currentColor"
                       d="M163.8 0L284.2 0c12.1 0 23.2 6.8 28.6 17.7L320 32l96 0c17.7 0 32 14.3 32 32s-14.3 32-32
diff --git a/src/app/shared/forms/offer/price-plans/price-plan-drawer/price-plan-drawer.component.html b/src/app/shared/forms/offer/price-plans/price-plan-drawer/price-plan-drawer.component.html
index 9460f1a7..43e34a20 100644
--- a/src/app/shared/forms/offer/price-plans/price-plan-drawer/price-plan-drawer.component.html
+++ b/src/app/shared/forms/offer/price-plans/price-plan-drawer/price-plan-drawer.component.html
@@ -149,7 +149,7 @@ <h3 class="font-bold text-lg dark:text-white">
               <span class="font-medium">{{ 'FORMS.PRICE_PLANS._profile_desc' | translate }}</span>
             </div>
             <div class="px-4">              
-              <button type="button" (click)="openConfigurationProfileDrawer()"
+              <button data-cy="configProfile" type="button" (click)="openConfigurationProfileDrawer()"
                       class="mt-2 px-4 py-1 bg-blue-500 text-white rounded flex items-center">
                 <svg class="min-w-4 w-4 h-4 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
                   <path fill="currentColor"
@@ -218,7 +218,7 @@ <h3 class="font-bold text-lg dark:text-white">
 
         <!-- Action Buttons -->
         <div class="flex justify-end space-x-3">
-          <button type="button" (click)="closeDrawer()" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 rounded">
+          <button data-cy="cancelPricePlan" type="button" (click)="closeDrawer()" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 rounded">
             {{ 'FORMS.PRICE_PLANS._cancel' | translate }}
           </button>
           <button type="submit"
diff --git a/src/app/shared/forms/offer/prod-spec/prod-spec.component.html b/src/app/shared/forms/offer/prod-spec/prod-spec.component.html
index ffc76a70..1f716292 100644
--- a/src/app/shared/forms/offer/prod-spec/prod-spec.component.html
+++ b/src/app/shared/forms/offer/prod-spec/prod-spec.component.html
@@ -62,7 +62,7 @@
                          (click)="$event.stopPropagation(); !isEditMode && toggleSelection(prod)">
                 </td>
 
-                <td class="px-6 py-4">{{ prod.name }}</td>
+                <td data-cy="offerProductSpecName" class="px-6 py-4">{{ prod.name }}</td>
                 <td class="px-6 py-4">
                   <span class="text-xs font-medium px-2.5 py-0.5 rounded border" [ngClass]="getBundleClass(prod.isBundle)">
                     {{ prod.isBundle ? ('OFFERINGS._bundle' | translate) : ('OFFERINGS._simple' | translate) }}
@@ -84,7 +84,7 @@
     }
     @if (prodSpecPageCheck) {
       <div class="flex pt-6 pb-2 justify-center align-middle">
-        <button (click)="nextProdSpec()"
+        <button data-cy="loadMore" (click)="nextProdSpec()"
                 class="flex cursor-pointer shadow-lg items-center justify-center px-3 h-8 text-sm font-medium text-gray-500 dark:text-white bg-white dark:bg-primary-100 border rounded-lg hover:bg-gray-200"
                 [disabled]="loadingProdSpec_more">
           {{ 'CREATE_PROD_SPEC._load_more' | translate }}
diff --git a/src/app/shared/header/header.component.html b/src/app/shared/header/header.component.html
index 59c08f50..1c120205 100644
--- a/src/app/shared/header/header.component.html
+++ b/src/app/shared/header/header.component.html
@@ -24,11 +24,11 @@
                   <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" [attr.aria-labelledby]="link.id!">
                     <li *ngFor="let childLink of link.children">
                       <!-- Enlace externo -->
-                      <a *ngIf="!childLink.isRouterLink" [href]="childLink.url" target="_blank" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
+                      <a *ngIf="!childLink.isRouterLink" [attr.data-cy]="childLink.label === 'HEADER._guidelines' ? 'guidelinesRegister' : childLink.label === 'HEADER._registration' ? 'registrationForm' : childLink.label === 'HEADER._guideline_publish' ? 'guidelinePublish' : null" [href]="childLink.url" target="_blank" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
                         {{ childLink.label | translate }}
                       </a>
                       <!-- Enlace interno (botón que navega) -->
-                      <button *ngIf="childLink.isRouterLink" (click)="goTo(childLink.url!)" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
+                      <button *ngIf="childLink.isRouterLink" [attr.data-cy]="childLink.label === 'HEADER._services' ? 'browseServices' : childLink.label === 'HEADER._catalogs' ? 'browseCatalogs' : null" (click)="goTo(childLink.url!)" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
                         {{ childLink.label | translate }}
                       </button>
                     </li>

From be4a8b2242c33042a248bea91094548fb6fa1f24 Mon Sep 17 00:00:00 2001
From: SHENGXING LU <slu@SHENGXINGs-MacBook-Air.local>
Date: Wed, 10 Dec 2025 15:31:07 +0100
Subject: [PATCH 2/3] catalogUpdate tag missed

---
 .../update-catalog/update-catalog.component.html                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html b/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html
index 25825dc3..8c9343ef 100644
--- a/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html
@@ -234,7 +234,7 @@ <h3 class="block md:hidden mt-2 text-center text-2xl text-primary-100 dark:text-
                     256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/>
             </svg>
             </button>
-            <button data-cy=catalogFinish (click)="createCatalog()"
+            <button data-cy="catalogUpdate" (click)="createCatalog()"
             [disabled]="!generalForm.valid || loading"
             [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
     

From bdb6193cb792c2ea00cdca5e3d71699071501a64 Mon Sep 17 00:00:00 2001
From: SHENGXING LU <slu@SHENGXINGs-MacBook-Air.local>
Date: Thu, 11 Dec 2025 11:43:29 +0100
Subject: [PATCH 3/3] form fixes

---
 .../create-catalog/create-catalog.component.html         | 4 ++--
 .../update-catalog/update-catalog.component.html         | 2 +-
 .../create-product-spec.component.html                   | 8 +++++---
 .../update-product-spec.component.html                   | 7 ++++---
 .../create-resource-spec.component.html                  | 8 +++++---
 .../update-resource-spec.component.html                  | 8 +++++---
 .../create-service-spec.component.html                   | 9 ++++++---
 .../update-service-spec.component.html                   | 8 +++++---
 8 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/app/pages/seller-offerings/offerings/seller-catalogs/create-catalog/create-catalog.component.html b/src/app/pages/seller-offerings/offerings/seller-catalogs/create-catalog/create-catalog.component.html
index eaf7d854..f5814c17 100644
--- a/src/app/pages/seller-offerings/offerings/seller-catalogs/create-catalog/create-catalog.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-catalogs/create-catalog/create-catalog.component.html
@@ -157,12 +157,12 @@ <h3 class="block md:hidden mt-2 text-center text-2xl text-primary-100 dark:text-
                 </svg>
                 </button>
                 @if(currentStep === 1){
-                <button data-cy=catalogFinish (click)="createCatalog()"
+                <button data-cy="catalogFinish" (click)="createCatalog()"
                 [disabled]="!generalForm.valid || loading"
                 [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
         
                 class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                    Create Catalog
+                    {{ 'CREATE_CATALOG._create' | translate }}
                 </button>
                 }
             </div>
diff --git a/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html b/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html
index 8c9343ef..a46d2de3 100644
--- a/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-catalogs/update-catalog/update-catalog.component.html
@@ -239,7 +239,7 @@ <h3 class="block md:hidden mt-2 text-center text-2xl text-primary-100 dark:text-
             [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
     
             class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                Update Catalogue
+                {{ 'UPDATE_CATALOG._update' | translate }}
             </button>
         </div>
     </div>
diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html
index c05799fa..477ef3cb 100644
--- a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.html
@@ -1562,7 +1562,8 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                     {{ 'CREATE_OFFER._previous' | translate }}
                 </button>
         
-                <button (click)="goToStep(currentStep + 1)"
+                <button data-cy="btnNext"
+                        (click)="goToStep(currentStep + 1)"
                         [disabled]="currentStep === steps.length - 1 || !validateCurrentStep() || !canNavigate(currentStep) || isStepDisabled()"
                         [ngClass]="{
                         'hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== steps.length - 1 && (validateCurrentStep() || canNavigate(currentStep)),
@@ -1577,12 +1578,13 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'CREATE_PROD_SPEC._add_att
                 </svg>
                 </button>
                 @if ((currentStep === 7 && !BUNDLE_ENABLED) || (currentStep === 8 && BUNDLE_ENABLED)) {
-                    <button (click)="createProduct()"
+                    <button data-cy="btnCreateProduct"
+                    (click)="createProduct()"
                     [disabled]="isStepDisabled() || loading"
                     [ngClass]="loading || isStepDisabled() ? 'opacity-50' : 'hover:bg-primary-50'"
             
                     class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                        Create Product
+                        {{ 'CREATE_PROD_SPEC._create_prod' | translate }}
                     </button>
                 }
             </div>          
diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html
index 254e1cfc..2c038977 100644
--- a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html
@@ -1633,7 +1633,8 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'UPDATE_PROD_SPEC._add_att
                     {{ 'CREATE_OFFER._previous' | translate }}
                 </button>
         
-                <button (click)="goToStep(currentStep + 1)"
+                <button data-cy="btnNext"
+                        (click)="goToStep(currentStep + 1)"
                         [disabled]="currentStep === steps.length - 1 || !canNavigate(currentStep) || isStepDisabled()"
                         [ngClass]="{
                         'hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== steps.length - 1 && (validateCurrentStep() || canNavigate(currentStep)),
@@ -1647,12 +1648,12 @@ <h4 class="text-lg font-bold ml-4 dark:text-white">{{ 'UPDATE_PROD_SPEC._add_att
                         256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/>
                 </svg>
                 </button>
-                <button (click)="updateProduct()"
+                <button data-cy="productSpecUpdate" (click)="updateProduct()"
                 [disabled]="isStepDisabled() || loading"
                 [ngClass]="loading || isStepDisabled() ? 'opacity-50' : 'hover:bg-primary-50'"
         
                 class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                    Update Product
+                    {{ 'UPDATE_PROD_SPEC._update_prod' | translate }}
                 </button>
             </div>     
         </div>
diff --git a/src/app/pages/seller-offerings/offerings/seller-resource-spec/create-resource-spec/create-resource-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-resource-spec/create-resource-spec/create-resource-spec.component.html
index e0829101..08cdca30 100644
--- a/src/app/pages/seller-offerings/offerings/seller-resource-spec/create-resource-spec/create-resource-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-resource-spec/create-resource-spec/create-resource-spec.component.html
@@ -444,7 +444,8 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'CR
                 {{ 'CREATE_OFFER._previous' | translate }}
             </button>
     
-            <button (click)="goToStep(currentStep + 1)"
+            <button data-cy="resSpecNext"
+                    (click)="goToStep(currentStep + 1)"
                     [disabled]="currentStep === steps.length - 1 || !validateCurrentStep() || !canNavigate(currentStep)"
                     [ngClass]="{
                     'hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== steps.length - 1 && (validateCurrentStep() || canNavigate(currentStep)),
@@ -459,12 +460,13 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'CR
             </svg>
             </button>
             @if (currentStep === 2) {
-            <button  (click)="createResource()"
+            <button data-cy="resSpecFinish"
+            (click)="createResource()"
             [disabled]="!generalForm.valid || loading"
             [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
     
             class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                Create Resource
+                {{ 'CREATE_RES_SPEC._create_res' | translate }}
             </button>
             }
         </div>
diff --git a/src/app/pages/seller-offerings/offerings/seller-resource-spec/update-resource-spec/update-resource-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-resource-spec/update-resource-spec/update-resource-spec.component.html
index bc0fbc8a..fd7145c0 100644
--- a/src/app/pages/seller-offerings/offerings/seller-resource-spec/update-resource-spec/update-resource-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-resource-spec/update-resource-spec/update-resource-spec.component.html
@@ -522,7 +522,8 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'UP
                 {{ 'CREATE_OFFER._previous' | translate }}
             </button>
     
-            <button (click)="goToStep(currentStep + 1)"
+            <button data-cy="resSpecUpdateNext"
+                    (click)="goToStep(currentStep + 1)"
                     [disabled]="currentStep === steps.length - 1 || !canNavigate(currentStep) || !generalForm.valid"
                     [ngClass]="{
                     'hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== steps.length - 1 && (validateCurrentStep() || canNavigate(currentStep)),
@@ -536,12 +537,13 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'UP
                     256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/>
             </svg>
             </button>
-            <button (click)="updateResource()"
+            <button data-cy="resourceSpecUpdate"
+            (click)="updateResource()"
             [disabled]="!generalForm.valid || loading"
             [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
     
             class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                Update Resource
+                {{ 'UPDATE_RES_SPEC._update_res' | translate }}
             </button>
         </div>
     </div>
diff --git a/src/app/pages/seller-offerings/offerings/seller-service-spec/create-service-spec/create-service-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-service-spec/create-service-spec/create-service-spec.component.html
index 61e8d815..aecfa46a 100644
--- a/src/app/pages/seller-offerings/offerings/seller-service-spec/create-service-spec/create-service-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-service-spec/create-service-spec/create-service-spec.component.html
@@ -445,7 +445,8 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'CR
                 {{ 'CREATE_OFFER._previous' | translate }}
             </button>
     
-            <button (click)="goToStep(currentStep + 1)"
+            <button data-cy="servSpecNext"
+                    (click)="goToStep(currentStep + 1)"
                     [disabled]="currentStep === steps.length - 1 || !validateCurrentStep() || !canNavigate(currentStep)"
                     [ngClass]="{
                     'hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== steps.length - 1 && (validateCurrentStep() || canNavigate(currentStep)),
@@ -460,12 +461,14 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'CR
             </svg>
             </button>
             @if (currentStep === 2) {
-            <button  (click)="createService()"
+            <button
+            data-cy="servSpecFinish"
+            (click)="createService()"
             [disabled]="!generalForm.valid || loading"
             [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
     
             class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                Create Service
+                {{ 'CREATE_SERV_SPEC._create_serv' | translate }}
             </button>
             }
         </div>
diff --git a/src/app/pages/seller-offerings/offerings/seller-service-spec/update-service-spec/update-service-spec.component.html b/src/app/pages/seller-offerings/offerings/seller-service-spec/update-service-spec/update-service-spec.component.html
index d1115190..f945010c 100644
--- a/src/app/pages/seller-offerings/offerings/seller-service-spec/update-service-spec/update-service-spec.component.html
+++ b/src/app/pages/seller-offerings/offerings/seller-service-spec/update-service-spec/update-service-spec.component.html
@@ -522,7 +522,8 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'UP
                 {{ 'CREATE_OFFER._previous' | translate }}
             </button>
     
-            <button (click)="goToStep(currentStep + 1)"
+            <button data-cy="servSpecUpdateNext"
+                    (click)="goToStep(currentStep + 1)"
                     [disabled]="currentStep === steps.length - 1 || !canNavigate(currentStep) || !generalForm.valid"
                     [ngClass]="{
                     'hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-700 dark:hover:text-white': currentStep !== steps.length - 1 && (validateCurrentStep() || canNavigate(currentStep)),
@@ -536,12 +537,13 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white pb-4">{{ 'UP
                     256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/>
             </svg>
             </button>
-            <button (click)="updateService()"
+            <button data-cy="serviceSpecUpdate"
+            (click)="updateService()"
             [disabled]="!generalForm.valid || loading"
             [ngClass]="loading || !generalForm.valid ? 'opacity-50' : 'hover:bg-primary-50'"
     
             class="px-4 py-2 text-base font-medium text-white rounded-lg bg-primary-100">
-                Update Service
+                {{ 'UPDATE_SERV_SPEC._update_serv' | translate }}
             </button>
         </div>
     </div>