Merge branch 'development' into smp2022
# Conflicts: # smp-ui-tests/src/test/java/ui/DomainPgTest.java
No related branches found
No related tags found
Showing
- smp-ui-tests/pom.xml 129 additions, 125 deletionssmp-ui-tests/pom.xml
- smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java 7 additions, 13 deletions...ts/src/main/java/pages/components/ConfirmationDialog.java
- smp-ui-tests/src/main/java/pages/components/GenericSelect.java 24 additions, 24 deletions...i-tests/src/main/java/pages/components/GenericSelect.java
- smp-ui-tests/src/main/java/pages/components/Sidebar.java 20 additions, 26 deletionssmp-ui-tests/src/main/java/pages/components/Sidebar.java
- smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java 27 additions, 62 deletions...n/java/pages/components/baseComponents/PageComponent.java
- smp-ui-tests/src/main/java/pages/domain/DomainPopup.java 1 addition, 6 deletionssmp-ui-tests/src/main/java/pages/domain/DomainPopup.java
- smp-ui-tests/src/main/java/pages/keystore/KeyStoreEditDialog.java 31 additions, 35 deletions...ests/src/main/java/pages/keystore/KeyStoreEditDialog.java
- smp-ui-tests/src/main/java/pages/login/LoginPage.java 26 additions, 30 deletionssmp-ui-tests/src/main/java/pages/login/LoginPage.java
- smp-ui-tests/src/main/java/pages/properties/PropertiesPage.java 75 additions, 81 deletions...-tests/src/main/java/pages/properties/PropertiesPage.java
- smp-ui-tests/src/main/java/pages/service_groups/FilterArea.java 18 additions, 25 deletions...-tests/src/main/java/pages/service_groups/FilterArea.java
- smp-ui-tests/src/main/java/pages/service_groups/edit/EditPage.java 8 additions, 11 deletions...sts/src/main/java/pages/service_groups/edit/EditPage.java
- smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupPopup.java 56 additions, 58 deletions...ain/java/pages/service_groups/edit/ServiceGroupPopup.java
- smp-ui-tests/src/main/java/utils/DriverManager.java 16 additions, 6 deletionssmp-ui-tests/src/main/java/utils/DriverManager.java
- smp-ui-tests/src/main/java/utils/PROPERTIES.java 2 additions, 1 deletionsmp-ui-tests/src/main/java/utils/PROPERTIES.java
- smp-ui-tests/src/main/java/utils/TestDataProvider.java 1 addition, 1 deletionsmp-ui-tests/src/main/java/utils/TestDataProvider.java
- smp-ui-tests/src/main/java/utils/enums/SMPMessages.java 36 additions, 40 deletionssmp-ui-tests/src/main/java/utils/enums/SMPMessages.java
- smp-ui-tests/src/main/java/utils/rest/SMPPaths.java 1 addition, 2 deletionssmp-ui-tests/src/main/java/utils/rest/SMPPaths.java
- smp-ui-tests/src/main/java/utils/rest/SMPRestClient.java 435 additions, 426 deletionssmp-ui-tests/src/main/java/utils/rest/SMPRestClient.java
- smp-ui-tests/src/test/java/customReporter/ExcelTestReporter.java 39 additions, 19 deletions...tests/src/test/java/customReporter/ExcelTestReporter.java
- smp-ui-tests/src/test/java/customReporter/TestProgressReporter.java 2 additions, 2 deletions...ts/src/test/java/customReporter/TestProgressReporter.java
Loading