Merge pull request #51 from Voltz-Corp/main

merge
Voltz-Corp · Jun 10, 2024 · 221e96b · 221e96b
2 parents 117c04c + 7e00638
commit 221e96b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/app_company/templates/app_company/service-order.html b/app_company/templates/app_company/service-order.html
@@ -14,6 +14,9 @@
             <i data-lucide="x" class="close" id="closeIcon"></i>
         </a>
 
+        <h1> {{ debug_current_url }} </h1>
+        <h1> {{ debug_previous_url }} </h1>
+
         <div class="infos">
             <h1>Solicitação {{service_order.id}}</h1>
             <p class="{{service_order.status}} status">Status: {{ service_order.get_status_display }}</p>

diff --git a/app_company/views.py b/app_company/views.py
@@ -423,7 +423,9 @@ def get(self, request, pk):
         ctx = {
             "all_orders": all_orders,
             "employees": employees,
-            "previous_url": request.session['previous_url'] 
+            "previous_url": request.session['previous_url'] ,
+            "debug_current_url": current_url, 
+            "debug_previous_url": previous_url 
         }
 
         try:

diff --git a/cypress/e2e/ConvertOrderRequest.cy.js b/cypress/e2e/ConvertOrderRequest.cy.js
@@ -52,7 +52,7 @@ describe('HomePage', () => {
             });
 
         cy.CreateClient("Luan Kato", "[email protected]")
-        cy.CreateSolicitation("Geladeira", "BRM56BK", "Brastemp", "Não tá gelando e ta com cheiro forte de queimado")
+        cy.CreateSolicitation("Geladeira", "BRM56BK", "Brastemp", "Não tá gelando e tá com cheiro forte de queimado")
         cy.visit('/')
         cy.ClientLogout()
         cy.CreateAdmin()

diff --git a/cypress/e2e/solicitationManagement.cy.js b/cypress/e2e/solicitationManagement.cy.js
@@ -67,7 +67,7 @@ const oneMonthFromToday = formatDate(new Date(today.getFullYear(), today.getMont
         cy.get('.logout > button').click()
         cy.GoToClient()
         cy.get('.view > button').click()
-        cy.get('.price > span').invoke('text').should('have.string', "50,00")
+        cy.get('.price > span').invoke('text').should('have.string', "R$ 50,00")
         cy.get('.waitingForm > p').invoke('text').should('have.string', "Você deseja prosseguir com o serviço?")
      })