From a3099b5cde05be6a3a9400cd6a9e58c6e9be2310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 3 May 2021 17:25:03 +0200
Subject: [PATCH] Fixes for tests

---
 cypress/integration/client_portal/credits.spec.js             | 2 +-
 cypress/integration/client_portal/invoices.spec.js            | 2 +-
 cypress/integration/client_portal/payment_methods.spec.js     | 2 +-
 cypress/integration/client_portal/payments.spec.js            | 2 +-
 cypress/integration/client_portal/quotes.spec.js              | 2 +-
 cypress/integration/client_portal/recurring_invoices.spec.js  | 3 ++-
 .../ninja2020/components/general/sidebar/header.blade.php     | 4 ++--
 .../ninja2020/components/general/sidebar/main.blade.php       | 1 +
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cypress/integration/client_portal/credits.spec.js b/cypress/integration/client_portal/credits.spec.js
index 41e94ca8eabc..ca51088147dd 100644
--- a/cypress/integration/client_portal/credits.spec.js
+++ b/cypress/integration/client_portal/credits.spec.js
@@ -14,7 +14,7 @@ describe('Credits', () => {
         cy.visit('/client/credits');
 
         cy.get('body')
-            .find('span')
+            .find('[data-ref=meta-title]')
             .first()
             .should('contain.text', 'Credits');
     });
diff --git a/cypress/integration/client_portal/invoices.spec.js b/cypress/integration/client_portal/invoices.spec.js
index 41d798874a3d..8f1c9d28339d 100644
--- a/cypress/integration/client_portal/invoices.spec.js
+++ b/cypress/integration/client_portal/invoices.spec.js
@@ -14,7 +14,7 @@ context('Invoices', () => {
         cy.visit('/client/invoices');
 
         cy.get('body')
-            .find('span')
+            .find('[data-ref=meta-title]')
             .first()
             .should('contain.text', 'Invoices');
     });
diff --git a/cypress/integration/client_portal/payment_methods.spec.js b/cypress/integration/client_portal/payment_methods.spec.js
index 4c87e5547d04..69a682d4ac92 100644
--- a/cypress/integration/client_portal/payment_methods.spec.js
+++ b/cypress/integration/client_portal/payment_methods.spec.js
@@ -14,7 +14,7 @@ context('Payment methods', () => {
         cy.visit('/client/payment_methods');
 
         cy.get('body')
-            .find('span')
+            .find('[data-ref=meta-title]')
             .first()
             .should('contain.text', 'Payment Method');
     });
diff --git a/cypress/integration/client_portal/payments.spec.js b/cypress/integration/client_portal/payments.spec.js
index e569acc86507..aa735b970999 100644
--- a/cypress/integration/client_portal/payments.spec.js
+++ b/cypress/integration/client_portal/payments.spec.js
@@ -14,7 +14,7 @@ context('Payments', () => {
         cy.visit('/client/payments');
 
         cy.get('body')
-            .find('span')
+            .find('[data-ref=meta-title]')
             .first()
             .should('contain.text', 'Payments');
     });
diff --git a/cypress/integration/client_portal/quotes.spec.js b/cypress/integration/client_portal/quotes.spec.js
index 2b2918e48149..538b2fd558eb 100644
--- a/cypress/integration/client_portal/quotes.spec.js
+++ b/cypress/integration/client_portal/quotes.spec.js
@@ -14,7 +14,7 @@ describe('Quotes', () => {
         cy.visit('/client/quotes');
 
         cy.get('body')
-            .find('span')
+            .find('[data-ref=meta-title]')
             .first()
             .should('contain.text', 'Quotes');
     });
diff --git a/cypress/integration/client_portal/recurring_invoices.spec.js b/cypress/integration/client_portal/recurring_invoices.spec.js
index 5041301d4a06..7fae096d784a 100644
--- a/cypress/integration/client_portal/recurring_invoices.spec.js
+++ b/cypress/integration/client_portal/recurring_invoices.spec.js
@@ -14,7 +14,8 @@ context('Recurring invoices', () => {
     it('should show reucrring invoices text', () => {
         cy.visit('/client/recurring_invoices');
 
-        cy.get('span')
+        cy.get('body')
+            .find('[data-ref=meta-title]')
             .first()
             .should('contain.text', 'Recurring Invoices');
     });
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
index a5e0a6f8e334..3fdf7251fc38 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
@@ -5,7 +5,7 @@
         </svg>
     </button>
     <div class="flex-1 px-3 md:px-8 flex justify-between items-center">
-        <span class="text-xl text-gray-900">@yield('meta_title')</span>
+        <span class="text-xl text-gray-900" data-ref="meta-title">@yield('meta_title')</span>
         <div class="flex items-center md:ml-6 md:mr-2">
             @if($multiple_contacts->count() > 1)
             <div class="relative inline-block text-left" x-data="{ open: false }">
@@ -23,7 +23,7 @@
                     <div class="rounded bg-white shadow-xs">
                         <div class="py-1">
                             @foreach($multiple_contacts as $contact)
-                                <a data-turbolinks="false" href="{{ route('client.switch_company', $contact->hashed_id) }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ $contact->company->present()->name }}</a>
+                                <a href="{{ route('client.switch_company', $contact->hashed_id) }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ $contact->company->present()->name }}</a>
                             @endforeach
                         </div>
                     </div>
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php
index cd7fcca31ee6..b907fe6a9f08 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php
@@ -26,6 +26,7 @@
             <div class="mx-auto px-4 sm:px-6 md:px-8">
                 <div class="pt-4 py-6">
                     @includeWhen(session()->has('success'), 'portal.ninja2020.components.general.messages.success')
+                    
                     {{ $slot }}
                 </div>
             </div>