From c12542b351e4957d84a90dcd54bee8cff6372cd7 Mon Sep 17 00:00:00 2001 From: Mendo6472 Date: Mon, 13 May 2024 11:43:13 -0500 Subject: [PATCH 01/16] REF:TEST: Refactored test to comply with test design --- .../admin_user/administrator_user_list.html | 4 +- .../admin_user/components/user_list.html | 4 +- .../templates/components/LeftSideMenu.html | 4 +- .../tests/functionality/__init__.py | 2 +- .../functionality/admin_user/___init___.py | 1 - .../functionality/admin_user/__init__.py | 1 + .../functionality/admin_user/admin_user.py | 67 +++- .../tests/functionality/auth/login.py | 24 ++ .../functionality/control_board/__init__.py | 1 - .../control_board_external_user.py | 71 ---- .../functionality/left_panel/__init__.py | 1 + .../left_panel/left_panel_navitagion.py | 98 +++++ .../request_creation/create_hiring_request.py | 84 +++++ .../request_hiring/request_hiring.py | 343 +++++++++++++++++- .../functionality/statistics/__init__.py | 1 + .../functionality/statistics/statistics.py | 160 ++++++++ .../views/request_hiring/change_state.py | 2 - 17 files changed, 777 insertions(+), 91 deletions(-) delete mode 100644 hiring_module/hiring_app/tests/functionality/admin_user/___init___.py create mode 100644 hiring_module/hiring_app/tests/functionality/admin_user/__init__.py delete mode 100644 hiring_module/hiring_app/tests/functionality/control_board/__init__.py delete mode 100644 hiring_module/hiring_app/tests/functionality/control_board/control_board_external_user.py create mode 100644 hiring_module/hiring_app/tests/functionality/left_panel/__init__.py create mode 100644 hiring_module/hiring_app/tests/functionality/left_panel/left_panel_navitagion.py create mode 100644 hiring_module/hiring_app/tests/functionality/statistics/__init__.py create mode 100644 hiring_module/hiring_app/tests/functionality/statistics/statistics.py diff --git a/hiring_module/hiring_app/templates/admin_user/administrator_user_list.html b/hiring_module/hiring_app/templates/admin_user/administrator_user_list.html index 48daacf..d43f727 100644 --- a/hiring_module/hiring_app/templates/admin_user/administrator_user_list.html +++ b/hiring_module/hiring_app/templates/admin_user/administrator_user_list.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% load static %} {% block title %} -Panel de control +Lista de usuarios {% endblock %} @@ -60,7 +60,7 @@
-

Panel de control

+

Lista de usuarios

diff --git a/hiring_module/hiring_app/templates/admin_user/components/user_list.html b/hiring_module/hiring_app/templates/admin_user/components/user_list.html index 00f9402..1538047 100644 --- a/hiring_module/hiring_app/templates/admin_user/components/user_list.html +++ b/hiring_module/hiring_app/templates/admin_user/components/user_list.html @@ -1,11 +1,11 @@
-

Solicitudes de contratación

+

Lista de usuarios

-
Listado de solicitudes de contratación
+
Listado de usuarios del equipo
Agregar usuario diff --git a/hiring_module/hiring_app/templates/components/LeftSideMenu.html b/hiring_module/hiring_app/templates/components/LeftSideMenu.html index c21daf2..4923021 100644 --- a/hiring_module/hiring_app/templates/components/LeftSideMenu.html +++ b/hiring_module/hiring_app/templates/components/LeftSideMenu.html @@ -16,7 +16,7 @@
  • - + Panel de control @@ -29,7 +29,7 @@ {% endif %} {% if actualgroup != "external" %} - + Estadisticas diff --git a/hiring_module/hiring_app/tests/functionality/__init__.py b/hiring_module/hiring_app/tests/functionality/__init__.py index 2f90783..7cd3312 100644 --- a/hiring_module/hiring_app/tests/functionality/__init__.py +++ b/hiring_module/hiring_app/tests/functionality/__init__.py @@ -1,5 +1,5 @@ from .auth import * -from .control_board import * +from .left_panel import * from .request_creation import * \ No newline at end of file diff --git a/hiring_module/hiring_app/tests/functionality/admin_user/___init___.py b/hiring_module/hiring_app/tests/functionality/admin_user/___init___.py deleted file mode 100644 index 5d96140..0000000 --- a/hiring_module/hiring_app/tests/functionality/admin_user/___init___.py +++ /dev/null @@ -1 +0,0 @@ -from .admin_user import AdminUserTest \ No newline at end of file diff --git a/hiring_module/hiring_app/tests/functionality/admin_user/__init__.py b/hiring_module/hiring_app/tests/functionality/admin_user/__init__.py new file mode 100644 index 0000000..1a781ed --- /dev/null +++ b/hiring_module/hiring_app/tests/functionality/admin_user/__init__.py @@ -0,0 +1 @@ +from .admin_user import * \ No newline at end of file diff --git a/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py b/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py index c076f3a..6979ba2 100644 --- a/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py +++ b/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py @@ -22,7 +22,7 @@ def tearDownClass(cls): super().tearDownClass() - def test_add_user(self): + def test_external_to_manager(self): self.selenium.get(self.live_server_url) username_input = self.selenium.find_element(By.NAME,'id') @@ -38,7 +38,7 @@ def test_add_user(self): self.selenium.find_element(By.ID, 'UserList').click() time.sleep(2) - self.assertEqual('Panel de control', self.selenium.title) + self.assertEqual('Lista de usuarios', self.selenium.title) self.selenium.find_element(By.ID, 'addUser').click() @@ -52,10 +52,69 @@ def test_add_user(self): time.sleep(2) - user = self.selenium.find_element(By.ID, '1106293874').text + user = self.selenium.find_element(By.ID, '1106293874_id').text self.assertIn('1106293874', user) + def test_manager_to_leader(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME, 'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + self.assertIn('Panel de control de Administrador', self.selenium.title) + + self.selenium.find_element(By.ID, 'UserList').click() + + time.sleep(2) + self.assertEqual('Lista de usuarios', self.selenium.title) + + self.selenium.find_element(By.ID, 'roleSelect_1111539567').send_keys('leader') + + time.sleep(2) + + self.assertEqual('1111539567', self.selenium.find_element(By.ID, '1111539567_id').text) + + select_element = self.selenium.find_element(By.ID, "roleSelect_1111539567") + + selected_option = select_element.find_element(By.CSS_SELECTOR, "option:checked") + + selected_value = selected_option.get_attribute("value") + + self.assertEqual('leader', selected_value) + + def test_leader_to_admin(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME, 'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + self.assertIn('Panel de control de Administrador', self.selenium.title) + + self.selenium.find_element(By.ID, 'UserList').click() + + time.sleep(2) + self.assertEqual('Lista de usuarios', self.selenium.title) + + self.selenium.find_element(By.ID, 'roleSelect_1109185879').send_keys('administrator') + + time.sleep(2) + + self.assertEqual('1109185879', self.selenium.find_element(By.ID, '1109185879_id').text) + + select_element = self.selenium.find_element(By.ID, "roleSelect_1109185879") + + selected_option = select_element.find_element(By.CSS_SELECTOR, "option:checked") + + selected_value = selected_option.get_attribute("value") + + self.assertEqual('admin', selected_value) def test_delete_user(self): @@ -75,7 +134,7 @@ def test_delete_user(self): self.selenium.find_element(By.ID, 'UserList').click() time.sleep(2) - self.assertEqual('Panel de control', self.selenium.title) + self.assertEqual('Lista de usuarios', self.selenium.title) self.selenium.find_element(By.ID, 'roleSelect_1109185879').send_keys('remove') diff --git a/hiring_module/hiring_app/tests/functionality/auth/login.py b/hiring_module/hiring_app/tests/functionality/auth/login.py index 883f639..b5ea3aa 100644 --- a/hiring_module/hiring_app/tests/functionality/auth/login.py +++ b/hiring_module/hiring_app/tests/functionality/auth/login.py @@ -65,3 +65,27 @@ def test_login_external_user(self): password_input.send_keys(Keys.RETURN) self.assertIn('Panel de control de usuario externo', self.selenium.title) + + def test_login_wrong_password(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Log In', self.selenium.title) + + def test_login_wrong_username(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('111607086') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Log In', self.selenium.title) diff --git a/hiring_module/hiring_app/tests/functionality/control_board/__init__.py b/hiring_module/hiring_app/tests/functionality/control_board/__init__.py deleted file mode 100644 index 1ab8cc0..0000000 --- a/hiring_module/hiring_app/tests/functionality/control_board/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .control_board_external_user import ControlBoardExternalUser diff --git a/hiring_module/hiring_app/tests/functionality/control_board/control_board_external_user.py b/hiring_module/hiring_app/tests/functionality/control_board/control_board_external_user.py deleted file mode 100644 index 0bdec89..0000000 --- a/hiring_module/hiring_app/tests/functionality/control_board/control_board_external_user.py +++ /dev/null @@ -1,71 +0,0 @@ -from django.contrib.auth.models import User -from django.contrib.staticfiles.testing import StaticLiveServerTestCase -from selenium.webdriver.chrome.webdriver import WebDriver -from selenium.webdriver.common.keys import Keys -from selenium.webdriver.common.by import By - -class ControlBoardExternalUser(StaticLiveServerTestCase): - @classmethod - def setUpClass(cls): - super().setUpClass() - cls.selenium = WebDriver() - cls.selenium.implicitly_wait(10) - - @classmethod - def tearDownClass(cls): - cls.selenium.quit() - super().tearDownClass() - - - def test_get_form_monitoring(self): - self.selenium.get(self.live_server_url) - - username_input = self.selenium.find_element(By.NAME,'id') - password_input = self.selenium.find_element(By.NAME, 'password') - username_input.send_keys('1106293874') - password_input.send_keys('mariagonzales123') - - password_input.send_keys(Keys.RETURN) - - button_create_monitoring_contract = self.selenium.find_element(By.ID, 'create_monitoring_contract') - - button_create_monitoring_contract.click() - - - self.assertIn('Solicitudes de contratos de Monitoría', self.selenium.title) - - - def test_get_form_cex(self): - self.selenium.get(self.live_server_url) - - username_input = self.selenium.find_element(By.NAME,'id') - password_input = self.selenium.find_element(By.NAME, 'password') - username_input.send_keys('1106293874') - password_input.send_keys('mariagonzales123') - - password_input.send_keys(Keys.RETURN) - - button_create_monitoring_contract = self.selenium.find_element(By.ID, 'create_cex_contract') - - button_create_monitoring_contract.click() - - - self.assertIn('Solicitudes de contratos CEX', self.selenium.title) - - - def test_get_form_pos(self): - self.selenium.get(self.live_server_url) - - username_input = self.selenium.find_element(By.NAME,'id') - password_input = self.selenium.find_element(By.NAME, 'password') - username_input.send_keys('1106293874') - password_input.send_keys('mariagonzales123') - - password_input.send_keys(Keys.RETURN) - - button_create_pos_contract = self.selenium.find_element(By.ID, 'create_pos_contract') - - button_create_pos_contract.click() - - - self.assertIn('Solicitudes de contratos POS', self.selenium.title) diff --git a/hiring_module/hiring_app/tests/functionality/left_panel/__init__.py b/hiring_module/hiring_app/tests/functionality/left_panel/__init__.py new file mode 100644 index 0000000..aca00a3 --- /dev/null +++ b/hiring_module/hiring_app/tests/functionality/left_panel/__init__.py @@ -0,0 +1 @@ +from .left_panel_navitagion import * diff --git a/hiring_module/hiring_app/tests/functionality/left_panel/left_panel_navitagion.py b/hiring_module/hiring_app/tests/functionality/left_panel/left_panel_navitagion.py new file mode 100644 index 0000000..5795df0 --- /dev/null +++ b/hiring_module/hiring_app/tests/functionality/left_panel/left_panel_navitagion.py @@ -0,0 +1,98 @@ +from django.contrib.auth.models import User +from django.contrib.staticfiles.testing import StaticLiveServerTestCase +from selenium.webdriver.chrome.webdriver import WebDriver +from selenium.webdriver.common.keys import Keys +from selenium.webdriver.common.by import By +from selenium.common.exceptions import NoSuchElementException + +class LeftPanelNavigation(StaticLiveServerTestCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.selenium = WebDriver() + cls.selenium.implicitly_wait(10) + + @classmethod + def tearDownClass(cls): + cls.selenium.quit() + super().tearDownClass() + + + def test_admin_redirections(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + + password_input.send_keys(Keys.RETURN) + + user_list_button = self.selenium.find_element(By.ID, 'UserList') + + user_list_button.click() + + + self.assertIn('Lista de usuarios', self.selenium.title) + + control_pannel_button = self.selenium.find_element(By.ID, 'ControlPanel') + + control_pannel_button.click() + + self.assertIn('Panel de control', self.selenium.title) + + statistics_button = self.selenium.find_element(By.ID, 'Statistics') + + statistics_button.click() + + self.assertIn('Estadísticas', self.selenium.title) + + def test_leader_redirections(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1107838593') + password_input.send_keys('alejandrolondono123') + + + password_input.send_keys(Keys.RETURN) + + with self.assertRaises(NoSuchElementException): + user_list_button = self.selenium.find_element(By.ID, 'UserList') + + + statistics_button = self.selenium.find_element(By.ID, 'Statistics') + + statistics_button.click() + + self.assertIn('Estadísticas', self.selenium.title) + + control_pannel_button = self.selenium.find_element(By.ID, 'ControlPanel') + + control_pannel_button.click() + + self.assertIn('Panel de control', self.selenium.title) + + def test_external_user_redirections(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1106293874') + password_input.send_keys('mariagonzales123') + + password_input.send_keys(Keys.RETURN) + + with self.assertRaises(NoSuchElementException): + user_list_button = self.selenium.find_element(By.ID, 'UserList') + + with self.assertRaises(NoSuchElementException): + statistics_button = self.selenium.find_element(By.ID, 'Statistics') + + control_pannel_button = self.selenium.find_element(By.ID, 'ControlPanel') + + control_pannel_button.click() + + self.assertIn('Panel de control', self.selenium.title) diff --git a/hiring_module/hiring_app/tests/functionality/request_creation/create_hiring_request.py b/hiring_module/hiring_app/tests/functionality/request_creation/create_hiring_request.py index 6cca254..6b68496 100644 --- a/hiring_module/hiring_app/tests/functionality/request_creation/create_hiring_request.py +++ b/hiring_module/hiring_app/tests/functionality/request_creation/create_hiring_request.py @@ -5,6 +5,7 @@ from selenium.webdriver.common.by import By import os import time +from selenium.common.exceptions import NoSuchElementException class CreateHiringRequest(StaticLiveServerTestCase): @@ -208,3 +209,86 @@ def test_create_form_pos(self): self.assertEqual(notification_message, "La solicitud fue exitosa.") self.assertIn('Solicitudes de contratos POS', self.selenium.title) + + def test_create_form_monitoring_wrong_data(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME, 'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1106293874') + password_input.send_keys('mariagonzales123') + + password_input.send_keys(Keys.RETURN) + + button_create_monitoring_contract = self.selenium.find_element( + By.ID, 'create_monitoring_contract') + + button_create_monitoring_contract.click() + + self.selenium.find_element( + By.CSS_SELECTOR, 'button[type="submit"]').click() + + time.sleep(2) + + notification_message = self.selenium.find_element( + By.ID, "notificationMessage") + + self.assertEqual(notification_message.text, "") + + self.assertIn('Solicitudes de contratos de Monitoría', + self.selenium.title) + + def test_create_form_cex_wrong_data(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME, 'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1106293874') + password_input.send_keys('mariagonzales123') + + password_input.send_keys(Keys.RETURN) + + button_create_monitoring_contract = self.selenium.find_element( + By.ID, 'create_cex_contract') + + button_create_monitoring_contract.click() + + self.selenium.find_element( + By.CSS_SELECTOR, 'button[type="submit"]').click() + + time.sleep(2) + + notification_message = self.selenium.find_element( + By.ID, "notificationMessage") + + self.assertEqual(notification_message.text, "") + + self.assertIn('Solicitudes de contratos CEX', self.selenium.title) + + def test_create_form_pos_wrong_data(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME, 'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1106293874') + password_input.send_keys('mariagonzales123') + + password_input.send_keys(Keys.RETURN) + + button_create_pos_contract = self.selenium.find_element( + By.ID, 'create_pos_contract') + + button_create_pos_contract.click() + + self.selenium.find_element( + By.CSS_SELECTOR, 'button[type="submit"]').click() + + time.sleep(2) + + notification_message = self.selenium.find_element( + By.ID, "notificationMessage").text + + self.assertEqual(notification_message, "") + + self.assertIn('Solicitudes de contratos POS', self.selenium.title) + diff --git a/hiring_module/hiring_app/tests/functionality/request_hiring/request_hiring.py b/hiring_module/hiring_app/tests/functionality/request_hiring/request_hiring.py index 706144e..ee96d0f 100644 --- a/hiring_module/hiring_app/tests/functionality/request_hiring/request_hiring.py +++ b/hiring_module/hiring_app/tests/functionality/request_hiring/request_hiring.py @@ -18,6 +18,149 @@ def tearDownClass(cls): cls.selenium.quit() super().tearDownClass() + def test_search_request_hiring_by_id(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + id = first_result.find_element(By.XPATH, './td[1]').text + + search_input.send_keys(id) + + search_input.send_keys(Keys.RETURN) + + self.assertIn(id, self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]/td[1]').text) + + def test_search_request_hiring_by_solicitant(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + id = first_result.find_element(By.XPATH, './td[1]').text + + solicitant = first_result.find_element(By.XPATH, './td[2]').text + + search_input.send_keys(solicitant) + + search_input.send_keys(Keys.RETURN) + + self.assertIn(id, self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]/td[1]').text) + + def test_search_request_hiring_by_state(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + id = first_result.find_element(By.XPATH, './td[1]').text + + state = first_result.find_element(By.XPATH, './td[5]').text + + search_input.send_keys(state) + + search_input.send_keys(Keys.RETURN) + + self.assertIn(id, self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]/td[1]').text) + + def test_search_request_hiring_by_date(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + id = first_result.find_element(By.XPATH, './td[1]').text + + date = first_result.find_element(By.XPATH, './td[6]').text + + search_input.send_keys(date) + + search_input.send_keys(Keys.RETURN) + + self.assertIn(id, self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]/td[1]').text) + + def test_search_request_hiring_by_wrong_id(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + search_input.send_keys('abcdef-abcdef-abcdef') + + search_input.send_keys(Keys.RETURN) + + self.assertIn('No matching records found', self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr/td').text) + + def test_access_request_hiring(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + + first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + + + self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) + + def test_request_hiring_assing_leader(self): self.selenium.get(self.live_server_url) @@ -79,9 +222,64 @@ def test_request_hiring_assing_manager(self): self.assertIn('La solicitud fue exitosa.', self.selenium.find_element(By.ID, 'notificationMessage').text) + def test_request_hiring_change_status_pending_review_filled(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + search_input.send_keys("Pending") - def test_request_hiring_change_status(self): + search_input.send_keys(Keys.RETURN) + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + + first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + + + self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) + + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + # 1 = review + # 2 = incomplete + # 3 = Filed + # 4 = Cancelled + + select.select_by_index(1) + + + time.sleep(2) + + self.assertIn('50%', self.selenium.find_element(By.ID, 'ProgressBar').text) + + with self.assertRaises(NotImplementedError): + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + select.select_by_index(2) + + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + select.select_by_index(3) + + self.assertIn('100%', self.selenium.find_element(By.ID, 'ProgressBar').text) + + def test_request_hiring_change_status_pending_incomplete_cancelled(self): self.selenium.get(self.live_server_url) username_input = self.selenium.find_element(By.NAME,'id') @@ -92,6 +290,12 @@ def test_request_hiring_change_status(self): password_input.send_keys(Keys.RETURN) self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + search_input.send_keys("Pending") + + search_input.send_keys(Keys.RETURN) first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') @@ -105,17 +309,148 @@ def test_request_hiring_change_status(self): select = Select(select_element) + # 1 = review + # 2 = incomplete + # 3 = Filed + # 4 = Cancelled + select.select_by_index(2) - + self.selenium.find_element(By.NAME, 'reason').send_keys("Hola") - self.selenium.find_element(By.XPATH, '//input[@type="submit" and @value="Save changes"]').click() time.sleep(2) self.assertIn('75%', self.selenium.find_element(By.ID, 'ProgressBar').text) + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + select.select_by_index(4) + + self.selenium.find_element(By.NAME, 'reason').send_keys("Hola") + + self.selenium.find_element(By.XPATH, '//input[@type="submit" and @value="Save changes"]').click() + + self.assertIn('100%', self.selenium.find_element(By.ID, 'ProgressBar').text) + + + def test_request_hiring_change_status_pending_incomplete_review_cancelled(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + search_input.send_keys("Pending") + + search_input.send_keys(Keys.RETURN) + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + + first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + + self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) + + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + # 1 = review + # 2 = incomplete + # 3 = Filed + # 4 = Cancelled + + + with self.assertRaises(NotImplementedError): + select.select_by_index(3) + + select.select_by_index(2) + + self.selenium.find_element(By.NAME, 'reason').send_keys("Hola") + + self.selenium.find_element(By.XPATH, '//input[@type="submit" and @value="Save changes"]').click() + + self.assertIn('75%', self.selenium.find_element(By.ID, 'ProgressBar').text) + + with self.assertRaises(NotImplementedError): + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + select.select_by_index(3) + + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + select.select_by_index(1) + + self.assertIn('50%', self.selenium.find_element(By.ID, 'ProgressBar').text) + + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + select.select_by_index(4) + + self.selenium.find_element(By.NAME, 'reason').send_keys("Hola") + + self.selenium.find_element(By.XPATH, '//input[@type="submit" and @value="Save changes"]').click() + + self.assertIn('100%', self.selenium.find_element(By.ID, 'ProgressBar').text) + + def test_request_hiring_change_status_pending_cancelled(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + search_input = self.selenium.find_element(By.CSS_SELECTOR, 'input[type="search"]') + + search_input.send_keys("Pending") + + search_input.send_keys(Keys.RETURN) + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + + first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + + self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) + + select_element = self.selenium.find_element(By.ID, 'stateSelect') + + select = Select(select_element) + + # 1 = review + # 2 = incomplete + # 3 = Filed + # 4 = Cancelled + + select.select_by_index(4) + + self.selenium.find_element(By.NAME, 'reason').send_keys("Hola") + + self.selenium.find_element(By.XPATH, '//input[@type="submit" and @value="Save changes"]').click() + + self.assertIn('100%', self.selenium.find_element(By.ID, 'ProgressBar').text) def test_request_hiring_comment(self): @@ -180,6 +515,4 @@ def test_request_hiring_snapshot(self): info = self.selenium.find_element(By.ID, 'pending').text - print(info) - self.assertIn('Estado de la contratacion:\npending', info) diff --git a/hiring_module/hiring_app/tests/functionality/statistics/__init__.py b/hiring_module/hiring_app/tests/functionality/statistics/__init__.py new file mode 100644 index 0000000..a7d4d95 --- /dev/null +++ b/hiring_module/hiring_app/tests/functionality/statistics/__init__.py @@ -0,0 +1 @@ +from .statistics import * \ No newline at end of file diff --git a/hiring_module/hiring_app/tests/functionality/statistics/statistics.py b/hiring_module/hiring_app/tests/functionality/statistics/statistics.py new file mode 100644 index 0000000..43b5455 --- /dev/null +++ b/hiring_module/hiring_app/tests/functionality/statistics/statistics.py @@ -0,0 +1,160 @@ +from django.contrib.staticfiles.testing import StaticLiveServerTestCase +from selenium.webdriver.chrome.webdriver import WebDriver +from selenium.webdriver.common.keys import Keys +from selenium.webdriver.common.by import By +from datetime import datetime +from selenium.webdriver.support.select import Select +import time + +class StatisticsTest(StaticLiveServerTestCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.selenium = WebDriver() + cls.selenium.implicitly_wait(10) + + @classmethod + def tearDownClass(cls): + cls.selenium.quit() + super().tearDownClass() + + def test_date_range_statistics(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + statistics_button = self.selenium.find_element(By.ID, 'Statistics') + + statistics_button.click() + + self.assertIn('Estadísticas', self.selenium.title) + + # Get the current date + current_date = datetime.now().strftime('%m/%d/%Y') + + # Send the current date to the start_date field + start_date = self.selenium.find_element(By.ID, 'start_date') + start_date.send_keys(current_date) + + # Send the current date to the end_date field + end_date = self.selenium.find_element(By.ID, 'end_date') + end_date.send_keys(current_date) + + contratos_cex = self.selenium.find_element(By.ID, 'contratos_cex').text + self.assertIn('4', contratos_cex) + + def test_leader_statistics(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + + first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + + + self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) + + select_element = self.selenium.find_element(By.NAME, 'leader') + + select = Select(select_element) + + select.select_by_index(1) + + time.sleep(2) + + self.assertIn('La solicitud fue exitosa.', self.selenium.find_element(By.ID, 'notificationMessage').text) + + notificationCloseBtn = self.selenium.find_element(By.ID, 'notificationCloseBtn') + + notificationCloseBtn.click() + + statistics_button = self.selenium.find_element(By.ID, 'Statistics') + + statistics_button.click() + + self.assertIn('Estadísticas', self.selenium.title) + + select_element = self.selenium.find_element(By.ID, "data_leader_select") + + select = Select(select_element) + + select.select_by_index(0) + + solicitudes_por_validar_leader = self.selenium.find_element(By.ID, 'solicitudes_por_validar_leader').text + + self.assertIn('1', solicitudes_por_validar_leader) + + time.sleep(2) + + def test_manager_statistics(self): + self.selenium.get(self.live_server_url) + + username_input = self.selenium.find_element(By.NAME,'id') + password_input = self.selenium.find_element(By.NAME, 'password') + username_input.send_keys('1116070867') + password_input.send_keys('juandiaz123') + + password_input.send_keys(Keys.RETURN) + + self.assertIn('Panel de control de Administrador', self.selenium.title) + + first_result = self.selenium.find_element(By.XPATH, '//table[@id="dataTable"]/tbody/tr[1]') + + + first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + + + self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) + + select_element = self.selenium.find_element(By.NAME, 'manager') + + select = Select(select_element) + + select.select_by_index(1) + + time.sleep(2) + + self.assertIn('La solicitud fue exitosa.', self.selenium.find_element(By.ID, 'notificationMessage').text) + + notificationCloseBtn = self.selenium.find_element(By.ID, 'notificationCloseBtn') + + notificationCloseBtn.click() + + statistics_button = self.selenium.find_element(By.ID, 'Statistics') + + statistics_button.click() + + self.assertIn('Estadísticas', self.selenium.title) + + + select_element = self.selenium.find_element(By.ID, "data_manager_select") + + select = Select(select_element) + + select.select_by_index(0) + + solicitudes_por_validar_leader = self.selenium.find_element(By.ID, 'solicitudes_por_validar_manager').text + + self.assertIn('1', solicitudes_por_validar_leader) + + time.sleep(2) + + + + \ No newline at end of file diff --git a/hiring_module/hiring_app/views/request_hiring/change_state.py b/hiring_module/hiring_app/views/request_hiring/change_state.py index f95f18e..9ecd92b 100644 --- a/hiring_module/hiring_app/views/request_hiring/change_state.py +++ b/hiring_module/hiring_app/views/request_hiring/change_state.py @@ -33,8 +33,6 @@ def post(self, request, idContract): contract_request = utilities.getContract(idContract) new_state = request.POST.get('state') reason = request.POST.get('reason') - print(new_state) - print(reason) state_actions = { 'incomplete': { 'email_function': self.send_email_file From 06994a2513a0d67d8bd24a615f1935a70c8c84bc Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 12:10:40 -0500 Subject: [PATCH 02/16] FIX: fixing testing --- .../tests/functionality/statistics/statistics.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hiring_module/hiring_app/tests/functionality/statistics/statistics.py b/hiring_module/hiring_app/tests/functionality/statistics/statistics.py index 43b5455..441113a 100644 --- a/hiring_module/hiring_app/tests/functionality/statistics/statistics.py +++ b/hiring_module/hiring_app/tests/functionality/statistics/statistics.py @@ -34,6 +34,8 @@ def test_date_range_statistics(self): statistics_button.click() + time.sleep(2) + self.assertIn('Estadísticas', self.selenium.title) # Get the current date @@ -67,6 +69,7 @@ def test_leader_statistics(self): first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + time.sleep(2) self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) @@ -83,11 +86,16 @@ def test_leader_statistics(self): notificationCloseBtn = self.selenium.find_element(By.ID, 'notificationCloseBtn') notificationCloseBtn.click() + + time.sleep(2) + statistics_button = self.selenium.find_element(By.ID, 'Statistics') statistics_button.click() + time.sleep(2) + self.assertIn('Estadísticas', self.selenium.title) select_element = self.selenium.find_element(By.ID, "data_leader_select") @@ -119,6 +127,7 @@ def test_manager_statistics(self): first_cell_text = first_result.find_element(By.XPATH, './td[1]').click() + time.sleep(2) self.assertIn('Solicitud de contratación de', self.selenium.find_element(By.ID, 'titleRequestHiring').text) @@ -135,11 +144,15 @@ def test_manager_statistics(self): notificationCloseBtn = self.selenium.find_element(By.ID, 'notificationCloseBtn') notificationCloseBtn.click() + + time.sleep(2) statistics_button = self.selenium.find_element(By.ID, 'Statistics') statistics_button.click() + time.sleep(2) + self.assertIn('Estadísticas', self.selenium.title) @@ -153,7 +166,6 @@ def test_manager_statistics(self): self.assertIn('1', solicitudes_por_validar_leader) - time.sleep(2) From 6dda98a73f41c4ead1dd0ef7522aef1b59ccba91 Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 12:21:35 -0500 Subject: [PATCH 03/16] FIX: fixing testing --- hiring_module/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hiring_module/requirements.txt b/hiring_module/requirements.txt index 029d66c..2742c88 100644 --- a/hiring_module/requirements.txt +++ b/hiring_module/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.12 +Django==5.0.6 psycopg2-binary==2.9.9 python-dotenv asgiref From 6943af4557b18aa0cd9dd730687b1a45842d1ed2 Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 12:28:31 -0500 Subject: [PATCH 04/16] FIX: fixing testing --- hiring_module/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hiring_module/requirements.txt b/hiring_module/requirements.txt index 2742c88..029d66c 100644 --- a/hiring_module/requirements.txt +++ b/hiring_module/requirements.txt @@ -1,4 +1,4 @@ -Django==5.0.6 +Django==3.2.12 psycopg2-binary==2.9.9 python-dotenv asgiref From 782303df67561bcf9e2e219baaee8aa98d2ad65f Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 12:47:46 -0500 Subject: [PATCH 05/16] FIX: fixing testing --- .github/workflows/django.yml | 53 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 35a2351..513b68e 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -2,40 +2,39 @@ name: Django CI on: push: - branches: [ "main", "develop" ] + branches: ["main", "develop"] pull_request: - branches: [ "main", "develop"] + branches: ["main", "develop"] jobs: build: - runs-on: ubuntu-latest strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.12.2] steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install Dependencies - run: | - cd hiring_module - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Copy .env file - run: | - cd hiring_module - cp .example.env .env - - name: Run Tests - run: | - export DISPLAY=:99 - chromedriver --url-base=/wd/hub & - sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - cd hiring_module - python manage.py makemigrations hiring_app - python manage.py migrate - python manage.py test + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install Dependencies + run: | + cd hiring_module + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Copy .env file + run: | + cd hiring_module + cp .example.env .env + - name: Run Tests + run: | + export DISPLAY=:99 + chromedriver --url-base=/wd/hub & + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional + cd hiring_module + python manage.py makemigrations hiring_app + python manage.py migrate + python manage.py test From 1b129fd003bef8f47ce2e5bc2fa1d7d69358b8ba Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 12:53:01 -0500 Subject: [PATCH 06/16] FIX: fixing testing --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 513b68e..84b9277 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -12,7 +12,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.12.2] + python-version: [3.12, 3.11, 3.10, 3.9] steps: - uses: actions/checkout@v4 From 713e5e3e24155acbd3cfb813385273de25778dac Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 12:54:39 -0500 Subject: [PATCH 07/16] FIX: fixing testing --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 84b9277..0b6bb4b 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -12,7 +12,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.12, 3.11, 3.10, 3.9] + python-version: [3.12, 3.11, 3.10.14, 3.9] steps: - uses: actions/checkout@v4 From 251495b278ae6cea18e757cae53ab232e1599fca Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 13:17:04 -0500 Subject: [PATCH 08/16] FIX: fixing testing --- .github/workflows/django.yml | 55 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 0b6bb4b..c1b892a 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -2,39 +2,40 @@ name: Django CI on: push: - branches: ["main", "develop"] + branches: [ "main", "develop" ] pull_request: - branches: ["main", "develop"] + branches: [ "main", "develop"] jobs: build: + runs-on: ubuntu-latest strategy: - max-parallel: 4 + max-parallel: 1 matrix: - python-version: [3.12, 3.11, 3.10.14, 3.9] + python-version: python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install Dependencies - run: | - cd hiring_module - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Copy .env file - run: | - cd hiring_module - cp .example.env .env - - name: Run Tests - run: | - export DISPLAY=:99 - chromedriver --url-base=/wd/hub & - sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - cd hiring_module - python manage.py makemigrations hiring_app - python manage.py migrate - python manage.py test + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install Dependencies + run: | + cd hiring_module + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Copy .env file + run: | + cd hiring_module + cp .example.env .env + - name: Run Tests + run: | + export DISPLAY=:99 + chromedriver --url-base=/wd/hub & + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional + cd hiring_module + python manage.py makemigrations hiring_app + python manage.py migrate + python manage.py test From 6adeddc8d4b3a2c054f59e81ac0d3d3893ab64bc Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 13:32:39 -0500 Subject: [PATCH 09/16] FIX: fixing testing --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index c1b892a..db7abc3 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 4 matrix: python-version: python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] From 2e21768f1b6608561370c5d84b5a2a7e74e79652 Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 13:36:11 -0500 Subject: [PATCH 10/16] FIX: fixing testing --- .github/workflows/django.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index db7abc3..e44f5b4 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest strategy: - max-parallel: 4 + max-parallel: 1 matrix: - python-version: python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] + python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] steps: - uses: actions/checkout@v4 From 1657a510f40d4505595595fd86f271f8cca6edbe Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 13:40:17 -0500 Subject: [PATCH 11/16] FIX: fixing testing --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index e44f5b4..b98ad59 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 8 matrix: python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] From 3544b6f9736b32f01cf1627a37c3660e9119701c Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 13:44:38 -0500 Subject: [PATCH 12/16] FIX: fixing testing --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index b98ad59..c052e65 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: - max-parallel: 8 + max-parallel: 4 matrix: python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] From 8ef591850e4a278667034eded36775067ffb3a82 Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 14:28:23 -0500 Subject: [PATCH 13/16] FIX: fixing testing --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index c052e65..93609e6 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.12.2, 3.11.9, 3.10.14, 3.9.19] + python-version: [3.12.2, 3.11.9, 3.10.14] steps: - uses: actions/checkout@v4 From ca124d80478609689499d1a8fd33988f081cdf3b Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 14:45:06 -0500 Subject: [PATCH 14/16] FIX: fixing testing --- .github/workflows/django.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 93609e6..f3afc44 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -6,6 +6,8 @@ on: pull_request: branches: [ "main", "develop"] + + jobs: build: From 23ebe8d51a30807cb338f0a2bce82d4dbdbc5e62 Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 14:54:28 -0500 Subject: [PATCH 15/16] FIX: fixing testing --- .github/workflows/django.yml | 53 +++++++++++++++++------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index f3afc44..749c0b5 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -2,15 +2,12 @@ name: Django CI on: push: - branches: [ "main", "develop" ] + branches: ["main", "develop"] pull_request: - branches: [ "main", "develop"] - - + branches: ["main", "develop"] jobs: build: - runs-on: ubuntu-latest strategy: max-parallel: 4 @@ -18,26 +15,26 @@ jobs: python-version: [3.12.2, 3.11.9, 3.10.14] steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install Dependencies - run: | - cd hiring_module - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Copy .env file - run: | - cd hiring_module - cp .example.env .env - - name: Run Tests - run: | - export DISPLAY=:99 - chromedriver --url-base=/wd/hub & - sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - cd hiring_module - python manage.py makemigrations hiring_app - python manage.py migrate - python manage.py test + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install Dependencies + run: | + cd hiring_module + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Copy .env file + run: | + cd hiring_module + cp .example.env .env + - name: Run Tests + run: | + export DISPLAY=:99 + chromedriver --url-base=/wd/hub & + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional + cd hiring_module + python manage.py makemigrations hiring_app + python manage.py migrate + python manage.py test From 93bcb16d77e8c735a145853e9f1556897d54e6f2 Mon Sep 17 00:00:00 2001 From: "Sebastian._.411._" <84807030+Debug41@users.noreply.github.com> Date: Mon, 13 May 2024 15:07:47 -0500 Subject: [PATCH 16/16] FIX: fixing testing --- .../tests/functionality/admin_user/admin_user.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py b/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py index 6979ba2..f13144a 100644 --- a/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py +++ b/hiring_module/hiring_app/tests/functionality/admin_user/admin_user.py @@ -137,12 +137,10 @@ def test_delete_user(self): self.assertEqual('Lista de usuarios', self.selenium.title) self.selenium.find_element(By.ID, 'roleSelect_1109185879').send_keys('remove') + + time.sleep(2) - - try: - self.selenium.find_element(By.ID, 'addUser').click() - except StaleElementReferenceException: - self.selenium.find_element(By.ID, 'addUser').click() + self.selenium.find_element(By.ID, 'addUser').click() self.assertEqual('1109185879', self.selenium.find_element(By.ID, '1109185879_id').text)