Merge pull request #74 from itk-dev-rpa/feature/dependencies

Feature/dependencies

Author: ghbm-itk

changelog.md

@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - eflyt.eflyt_case.change_tab now checks if the tab needs to be changed before doing it.
+- Dependenices are now only locked to major versions.
+- Changed test for change sap password to use dotenv.
 
 ## [2.5.0] - 2024-08-14
 

pyproject.toml

@@ -18,11 +18,11 @@ classifiers = [
 ]
 dependencies = [
   "pywin32 >= 306",
-  "msal >= 1.24.1",
-  "requests >= 2.31.0",
-  "beautifulsoup4 >= 4.12.2",
-  "selenium==4.16.0",
-  "uiautomation == 2.0.18"
+  "msal == 1.*",
+  "requests == 2.*",
+  "beautifulsoup4 == 4.*",
+  "selenium == 4.*",
+  "uiautomation == 2.*"
 ]
 
 [project.urls]

tests/readme.md

@@ -38,12 +38,15 @@ mailpit --smtp-tls-cert cert.pem --smtp-tls-key key.pem
 ```
 
 ## Environment variables
-You need to setup a .env file in the root directory with the following parameters:
 
+You need to setup a .env file in the root directory with the following parameters:
 
 ### SAP
 
 SAP_LOGIN = 'login;password'
+SAP_NEW_PASSWORD = 'new password'
+
+If SAP_NEW_PASSWORD is not set, the change password test is skipped.
 
 ### GRAPH
 
@@ -74,4 +77,4 @@ CVR_CREDS = 'login;password'
 EFLYT_LOGIN = 'username,password'
 TEST_CPR = 'XXXXXXXXXX'
 TEST_CASE = '123456' # A test case with multiple current inhabitants, with relations registered
-TEST_CASE_NOONE = '56789' # A test case without any current inhabitants
+TEST_CASE_NOONE = '56789' # A test case without any current inhabitants

tests/test_sap/test_sap_login.py

@@ -2,7 +2,6 @@
 
 import os
 import unittest
-from tkinter import simpledialog
 
 from dotenv import load_dotenv, set_key
 
@@ -20,7 +19,6 @@ def setUpClass(cls) -> None:
         used in the following tests.
         """
         cls.username, cls.password = os.environ['SAP_LOGIN'].split(';')
-        cls.new_password = simpledialog.askstring("Enter new password", "Enter the new password to be used in testing the change SAP password function.\nRemember to write down the new password!\nLeave empty to skip test_change_password.")
 
     def setUp(self) -> None:
         sap_login.kill_sap()
@@ -44,17 +42,19 @@ def test_change_password(self):
         Due to a limit in SAP you can only run this function once per day.
         If no new_password is entered in the setup, test is skipped.
         """
-        if not self.new_password:
-            raise unittest.SkipTest("Test not run because new_password was missing.")
+        new_password = os.getenv('SAP_NEW_PASSWORD')
+        if not new_password:
+            raise unittest.SkipTest("Test skipped because SAP_NEW_PASSWORD was missing.")
+
+        sap_login.change_password(self.username, self.password, new_password)
 
-        sap_login.change_password(self.username, self.password, self.new_password)
         # Change password for all coming tests
-        self.password = self.new_password
-        os.environ['SAP_LOGIN'] = f"{self.username};{self.password}"
-        set_key(".env", 'SAP_LOGIN', self.password)
+        self.password = new_password
+        set_key(".env", 'SAP_LOGIN', f"{self.username};{self.password}")
+        set_key(".env", 'SAP_NEW_PASSWORD', '')
 
         with self.assertRaises(ValueError):
-            sap_login.change_password(self.username, "Foo", self.new_password)
+            sap_login.change_password(self.username, "Foo", new_password)
 
         with self.assertRaises(ValueError):
             sap_login.change_password(self.username, self.password, "")