fixing test issues - incomplete

Voltz-Corp · Jun 10, 2024 · c88fe47 · c88fe47
1 parent 4197274
commit c88fe47
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 21 deletions.
diff --git a/app_company/views.py b/app_company/views.py
@@ -1,6 +1,5 @@
 import json
 import os
-from datetime import datetime
 
 from django.views import View
 from django.shortcuts import render, redirect

diff --git a/cypress/e2e/ConvertOrderRequest.cy.js b/cypress/e2e/ConvertOrderRequest.cy.js
@@ -19,7 +19,6 @@ describe('HomePage', () => {
         cy.get(':nth-child(6) > a').click()
         cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
         cy.get('.content > form > button').click()
-        cy.get('#status').select('Aguardando orçamento')
         cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('50')
         cy.get('.content > form > button').click()
@@ -62,9 +61,9 @@ describe('HomePage', () => {
         cy.GoToEmployee()
         cy.get(':nth-child(1) > a').click()
         cy.get(':nth-child(6) > a').click()
-        cy.get('#status').select('Aguardando orçamento')
         cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
         cy.get('.content > form > button').click()
+        cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('175.00')
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
@@ -106,7 +105,6 @@ describe('HomePage', () => {
         cy.get(':nth-child(6) > a').click()
         cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
         cy.get('.content > form > button').click()
-        cy.get('#status').select('Aguardando orçamento')
         cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('50')
         cy.get('.content > form > button').click()

diff --git a/cypress/e2e/ManagingMyServices.cy.js b/cypress/e2e/ManagingMyServices.cy.js
@@ -20,7 +20,8 @@ describe('HomePage', () => {
     cy.GoToEmployee("paulo@paulo.com")
     cy.get(':nth-child(1) > a').click()
     cy.get(':nth-child(6) > a').click()
-    cy.get('#status').select('Aguardando orçamento')
+    cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+    cy.get('.content > form > button').click()
     cy.get('.content > form > button').click()
     cy.get('.budgetContainer > input').type("200")
     cy.get('.content > form > button').click()

diff --git a/cypress/e2e/ManagingOrder.cy.js b/cypress/e2e/ManagingOrder.cy.js
@@ -17,7 +17,9 @@ describe('HomePage', () => {
       cy.CreateAdmin()
       cy.get(':nth-child(1) > a').click()
       cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Aguardando orçamento')
+    //   cy.get('#status').select('Aguardando orçamento')
+    cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+      cy.get('.content > form > button').click()
       cy.get('.content > form > button').click()
       cy.get('.budgetContainer > input').type("200")
       cy.get('.content > form > button').click()
@@ -55,7 +57,9 @@ describe('HomePage', () => {
         cy.CreateAdmin()
         cy.get(':nth-child(1) > a').click()
         cy.get(':nth-child(6) > a').click()
-        cy.get('#status').select('Aguardando orçamento')
+        // cy.get('#status').select('Aguardando orçamento')
+        cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+        cy.get('.content > form > button').click()
         cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type("200")
         cy.get('.content > form > button').click()
@@ -97,7 +101,9 @@ describe('HomePage', () => {
         cy.CreateEmployee("Paulo", "paulo@paulo.com")
         cy.get(':nth-child(1) > a').click()
         cy.get(':nth-child(6) > a').click()
-        cy.get('#status').select('Aguardando orçamento')
+        // cy.get('#status').select('Aguardando orçamento')
+        cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+        cy.get('.content > form > button').click()
         cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type("200")
         cy.get('.content > form > button').click()

diff --git a/cypress/e2e/ReopeningService.cy.js b/cypress/e2e/ReopeningService.cy.js
@@ -21,7 +21,8 @@ describe('Reopening Service Tests', () => {
 
       cy.get('ul > :nth-child(1)').click()
       cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Aguardando orçamento')
+      cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+      cy.get('.content > form > button').click()
       cy.get('.content > form > button').click()
 
       cy.get('.budgetContainer > input').type('90')
@@ -78,7 +79,9 @@ describe('Reopening Service Tests', () => {
 
       cy.get('ul > :nth-child(1)').click()
       cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Aguardando orçamento')
+      // cy.get('#status').select('Aguardando orçamento')
+      cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+      cy.get('.content > form > button').click()
       cy.get('.content > form > button').click()
 
       cy.get('.budgetContainer > input').type('90')
@@ -116,11 +119,16 @@ describe('Reopening Service Tests', () => {
       cy.get('ul > :nth-child(1)').click()
       cy.get(':nth-child(6) > a').click()
 
-      cy.get('#status').select('Aguardando orçamento')
+      // cy.get('#status').select('Aguardando orçamento')
+      // cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+      // cy.get('.content > form > button').click()
+
+      // cy.get('.budgetWatingConfirmation > input').clear()
+      // cy.get('.budgetWatingConfirmation > input').type('0')
       cy.get('.content > form > button').click()
 
-      cy.get('.budgetContainer > input').clear()
-      cy.get('.budgetContainer > input').type('0')
+      // cy.get('.budgetContainer > input').clear()
+      // cy.get('.budgetContainer > input').type('0')
       cy.get('.content > form > button').click()
 
       cy.Logout()

diff --git a/cypress/e2e/ServiceListCustomization.cy.js b/cypress/e2e/ServiceListCustomization.cy.js
@@ -25,9 +25,10 @@ describe('Service filtering test', () =>{
         cy.GoToEmployee()
         cy.get(':nth-child(1) > a').click()
         cy.get(':nth-child(1) > :nth-child(6) > a').click()
-        cy.get('#status').select('Aguardando orçamento')
+        // cy.get('#status').select('Aguardando orçamento')
         cy.get('.scheduleDateContainer > input').type('2024-06-18')
         cy.get('.content > form > button').click()
+        cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('400')
         cy.get('.content > form > button').click()
         cy.Logout()
@@ -72,9 +73,10 @@ describe('Service filtering test', () =>{
         cy.CreateAdmin()
         cy.get(':nth-child(1) > a').click()
         cy.get(':nth-child(1) > :nth-child(6) > a').click()
-        cy.get('#status').select('Aguardando orçamento')
+        // cy.get('#status').select('Aguardando orçamento')
         cy.get('.scheduleDateContainer > input').type('2024-06-18')
         cy.get('.content > form > button').click()
+        cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('400')
         cy.get('.content > form > button').click()
         cy.Logout()
@@ -117,9 +119,10 @@ describe('Service filtering test', () =>{
         cy.CreateAdmin()
         cy.get(':nth-child(1) > a').click()
         cy.get(':nth-child(1) > :nth-child(6) > a').click()
-        cy.get('#status').select('Aguardando orçamento')
+        // cy.get('#status').select('Aguardando orçamento')
         cy.get('.scheduleDateContainer > input').type('2024-06-18')
         cy.get('.content > form > button').click()
+        cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('400')
         cy.get('.content > form > button').click()
         cy.Logout()

diff --git a/cypress/e2e/StatusMonitoring.cy.js b/cypress/e2e/StatusMonitoring.cy.js
@@ -42,7 +42,6 @@ describe('test suite status monitoring', () => {
         cy.get(':nth-child(6) > a').click();
         cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
         cy.get('.content > form > button').click();
-        cy.get('#status').select('Aguardando orçamento')
         cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('50')
         cy.get('.content > form > button').click()

diff --git a/cypress/e2e/solicitationManagement.cy.js b/cypress/e2e/solicitationManagement.cy.js
@@ -60,7 +60,6 @@ const oneMonthFromToday = formatDate(new Date(today.getFullYear(), today.getMont
         cy.get(':nth-child(6) > a').click()
         cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
         cy.get('.content > form > button').click()
-        cy.get('#status').select('Aguardando orçamento')
         cy.get('.content > form > button').click()
         cy.get('.budgetContainer > input').type('50')
         cy.get('.content > form > button').click()
@@ -119,7 +118,6 @@ const oneMonthFromToday = formatDate(new Date(today.getFullYear(), today.getMont
       cy.get(':nth-child(6) > a').click()
       cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
       cy.get('.content > form > button').click()
-      cy.get('#status').select('Aguardando orçamento')
       cy.get('.content > form > button').click()
       cy.get('.budgetContainer > input').type('54000')
       cy.get('.content > form > button').click()

diff --git a/cypress/e2e/solicitationRating.cy.js b/cypress/e2e/solicitationRating.cy.js
@@ -17,7 +17,8 @@ describe('Service rating', () => {
       cy.CreateAdmin()
       cy.get(':nth-child(1) > a').click()
       cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Aguardando orçamento')
+      cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+      cy.get('.content > form > button').click()
       cy.get('.content > form > button').click()
       cy.get('.budgetContainer > input').type("200")
       cy.get('.content > form > button').click()
@@ -69,7 +70,8 @@ describe('Service rating', () => {
       cy.CreateAdmin()
       cy.get(':nth-child(1) > a').click()
       cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Aguardando orçamento')
+      cy.get('.scheduleDateContainer > input').invoke('removeAttr', 'type').type('2024-06-18')
+      cy.get('.content > form > button').click()
       cy.get('.content > form > button').click()
       cy.get('.budgetContainer > input').type("200")
       cy.get('.content > form > button').click()