Merge remote-tracking branch 'origin/smpAutomation' into smpAutomation
# Conflicts: # smp-ui-tests/src/main/java/pages/domain/DomainGrid.java # smp-ui-tests/src/main/java/pages/domain/DomainPopup.java # smp-ui-tests/src/main/java/pages/users/UserPopup.java # smp-ui-tests/src/main/java/pages/users/UsersPage.java # smp-ui-tests/src/test/java/ui/DomainPgTest.java # smp-ui-tests/src/test/java/ui/UsersPgTest.java
No related branches found
No related tags found
Showing
- smp-ui-tests/src/main/java/pages/domain/DomainGrid.java 116 additions, 117 deletionssmp-ui-tests/src/main/java/pages/domain/DomainGrid.java
- smp-ui-tests/src/main/java/pages/users/UserPopup.java 0 additions, 3 deletionssmp-ui-tests/src/main/java/pages/users/UserPopup.java
- smp-ui-tests/src/main/java/pages/users/UsersPage.java 1 addition, 2 deletionssmp-ui-tests/src/main/java/pages/users/UsersPage.java
- smp-ui-tests/src/test/java/ui/DomainPgTest.java 165 additions, 165 deletionssmp-ui-tests/src/test/java/ui/DomainPgTest.java
- smp-ui-tests/src/test/java/ui/UsersPgTest.java 234 additions, 238 deletionssmp-ui-tests/src/test/java/ui/UsersPgTest.java
This diff is collapsed.
Please register or sign in to comment