created common page with tabs, created pages for EditGroups.

domiSMP-ui-tests/src/main/java/ddsl/CommonCertificatePage.java

@@ -4,7 +4,7 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class CommonCertificatePage extends CommonPageWithGrid {
+public class CommonCertificatePage extends CommonPageWithTabsAndGrid {
     /**
      * Common page used for Keystore and Truststore
      */

domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithTabs.java

+package ddsl;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class CommonPageWithTabs extends DomiSMPPage {
+    private final static Logger LOG = LoggerFactory.getLogger(CommonPageWithTabs.class);
+
+    @FindBy(css = "[role = \"tab\"]")
+    private List<WebElement> tabList;
+
+    public CommonPageWithTabs(WebDriver driver) {
+        super(driver);
+    }
+
+    public void goToTab(String tabName) {
+        for (WebElement element : tabList) {
+            if (element.getText().contains(tabName)) {
+                element.click();
+                wait.forAttributeToContain(element, "aria-selected", "true");
+                LOG.debug("Domain tab {} is opened", tabName);
+            }
+        }
+    }
+
+    public String getAlertMessageAndClose() {
+
+        return getAlertArea().getAlertMessage();
+    }
+}

domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithGrid.java → domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithTabsAndGrid.java

@@ -9,10 +9,8 @@ import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
-public class CommonPageWithGrid extends DomiSMPPage {
-    private final static Logger LOG = LoggerFactory.getLogger(CommonPageWithGrid.class);
+public class CommonPageWithTabsAndGrid extends CommonPageWithTabs {
+    private final static Logger LOG = LoggerFactory.getLogger(CommonPageWithTabsAndGrid.class);
 
     /**
      * Generic page used for pages which have small grid in the right of the page. This element gives access to action buttons and elements of the page.
@@ -22,38 +20,17 @@ public class CommonPageWithGrid extends DomiSMPPage {
     public WebElement filterInput;
     @FindBy(css = "data-panel >div >div> mat-toolbar button:first-of-type")
     public WebElement addBtn;
-    @FindBy(css = "[class=smp-column-data]")
-    public WebElement dataPanel;
     @FindBy(css = "[class~=smp-column-label]")
     public WebElement rightPanel;
-    @FindBy(css = "[role = \"tab\"]")
-    private List<WebElement> tabList;
 
-    public CommonPageWithGrid(WebDriver driver) {
+    public CommonPageWithTabsAndGrid(WebDriver driver) {
         super(driver);
         PageFactory.initElements(new AjaxElementLocatorFactory(driver, data.getTIMEOUT()), this);
     }
 
-    public SmallGrid getGrid() {
+    public SmallGrid getLeftSideGrid() {
         return new SmallGrid(driver, rightPanel);
     }
 
-    public SmallGrid getDataPanelGrid() {
-        return new SmallGrid(driver, rightPanel);
-    }
 
-    public void goToTab(String tabName) {
-        for (WebElement element : tabList) {
-            if (element.getText().contains(tabName)) {
-                element.click();
-                wait.forAttributeToContain(element, "aria-selected", "true");
-                LOG.debug("Domain tab {} is opened", tabName);
-            }
-        }
-    }
-
-    public String getAlertMessageAndClose() {
-
-        return getAlertArea().getAlertMessage();
-    }
 }

domiSMP-ui-tests/src/main/java/ddsl/dcomponents/SideNavigationComponent.java

@@ -11,6 +11,7 @@ import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pages.administration.editDomainsPage.EditDomainsPage;
+import pages.administration.editGroupsPage.EditGroupsPage;
 import pages.systemSettings.TruststorePage;
 import pages.systemSettings.UsersPage;
 import pages.systemSettings.domainsPage.DomainsPage;
@@ -113,10 +114,12 @@ public class SideNavigationComponent extends DomiSMPPage {
             openSubmenu(administrationExpand, editDomainsLnk);
             return (T) new EditDomainsPage(driver);
         }
+        if (page == Pages.ADMINISTRATION_EDIT_GROUPS) {
+            openSubmenu(administrationExpand, editGroupsLnk);
+            return (T) new EditGroupsPage(driver);
+        }
+
 
-        //            case ADMINISTRATION_EDIT_GROUPS:
-        //                expandSection(administrationExpand);
-        //                return new DLink(driver, editGroupsLnk);
         //            case ADMINISTRATION_EDIT_RESOURCES:
         //                expandSection(administrationExpand);
         //                return new DLink(driver, editResourcesLnk);

domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/subcategoryTab/SubcategoryTabComponent.java

@@ -20,15 +20,15 @@ public class SubcategoryTabComponent extends DComponent {
     private WebElement resourceMembersBtn;
     @FindBy(id = "deleteButton")
     private WebElement deleteBtn;
-    @FindBy(css = "div smp-column-data")
-    private WebElement sidePanel;
+    @FindBy(css = "[class=smp-column-data]")
+    private WebElement rightSidePanel;
 
     public SubcategoryTabComponent(WebDriver driver) {
         super(driver);
     }
 
     public SmallGrid getGrid() {
-        return new SmallGrid(driver, sidePanel);
+        return new SmallGrid(driver, rightSidePanel);
     }
 
     public DComponent create() throws Exception {

domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/CreateGroupDetailsDialog.java

@@ -2,9 +2,40 @@ package pages.administration.editDomainsPage;
 
 import ddsl.dcomponents.DComponent;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
+import rest.models.GroupModel;
 
 public class CreateGroupDetailsDialog extends DComponent {
+    @FindBy(id = "name_id")
+    private WebElement groupNameLbl;
+    @FindBy(id = "description_id")
+    private WebElement groupDescriptionLbl;
+    @FindBy(id = "group_id")
+    private WebElement groupVisibilityDdl;
+    @FindBy(id = "saveButton")
+    private WebElement saveBtn;
     public CreateGroupDetailsDialog(WebDriver driver) {
         super(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, data.getTIMEOUT()), this);
+
+    }
+
+    public void fillGroupDetails(GroupModel group) {
+        groupNameLbl.sendKeys(group.getGroupName());
+        groupDescriptionLbl.sendKeys(group.getGroupDescription());
+        weToDSelect(groupVisibilityDdl).selectValue(group.getVisibility());
+    }
+
+    public Boolean tryClickOnSave() throws Exception {
+        wait.forElementToBeClickable(saveBtn);
+        if (weToDButton(saveBtn).isEnabled()) {
+            weToDButton(saveBtn).click();
+            return true;
+        } else {
+            return false;
+        }
     }
 }

domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/EditDomainsPage.java

 package pages.administration.editDomainsPage;
 
-import ddsl.CommonPageWithGrid;
+import ddsl.CommonPageWithTabsAndGrid;
 import org.openqa.selenium.WebDriver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class EditDomainsPage extends CommonPageWithGrid {
+public class EditDomainsPage extends CommonPageWithTabsAndGrid {
     /**
      * Page object for the Edit domains page. This contains the locators of the page and the methods for the behaviour of the page
      */
@@ -21,4 +21,10 @@ public class EditDomainsPage extends CommonPageWithGrid {
 
         return new DomainMembersTab(driver);
     }
+
+    public GroupTab getGroupTab() {
+
+        return new GroupTab(driver);
+    }
+
 }

domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/GroupTab.java

@@ -2,14 +2,18 @@ package pages.administration.editDomainsPage;
 
 import ddsl.dcomponents.commonComponents.subcategoryTab.SubcategoryTabComponent;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
 
 public class GroupTab extends SubcategoryTabComponent {
     public GroupTab(WebDriver driver) {
         super(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, data.getTIMEOUT()), this);
+
     }
 
-    @Override
-    public CreateGroupDetailsDialog create() {
+    public CreateGroupDetailsDialog clickOnCreateNewGroup() throws Exception {
+        create();
         return new CreateGroupDetailsDialog(driver);
     }
 }

domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/EditGroupsPage.java

+package pages.administration.editGroupsPage;
+
+import ddsl.CommonPageWithTabs;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EditGroupsPage extends CommonPageWithTabs {
+    /**
+     * Page object for the Edit groups page. This contains the locators of the page and the methods for the behaviour of the page
+     */
+    private final static Logger LOG = LoggerFactory.getLogger(EditGroupsPage.class);
+
+    @FindBy(id = "domain_id")
+    private WebElement domainDdl;
+    @FindBy(id = "group_id")
+    private WebElement groupDdl;
+
+    public EditGroupsPage(WebDriver driver) {
+        super(driver);
+        LOG.debug("Loading Edit groups page.");
+    }
+
+    public GroupMembersTab getDomainMembersTab() {
+        return new GroupMembersTab(driver);
+    }
+
+    public ResourceTab getGroupTab() {
+        return new ResourceTab(driver);
+    }
+
+}

domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/GroupMembersTab.java

+package pages.administration.editGroupsPage;
+
+import ddsl.dcomponents.commonComponents.members.MembersComponent;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
+
+public class GroupMembersTab extends MembersComponent {
+
+    public GroupMembersTab(WebDriver driver) {
+        super(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, data.getTIMEOUT()), this);
+    }
+}
+

domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/ResourceTab.java

+package pages.administration.editGroupsPage;
+
+import ddsl.dcomponents.commonComponents.subcategoryTab.SubcategoryTabComponent;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
+import pages.administration.editDomainsPage.CreateGroupDetailsDialog;
+
+public class ResourceTab extends SubcategoryTabComponent {
+    public ResourceTab(WebDriver driver) {
+        super(driver);
+        PageFactory.initElements(new AjaxElementLocatorFactory(driver, data.getTIMEOUT()), this);
+
+    }
+
+    public CreateGroupDetailsDialog clickOnCreateNewResource() throws Exception {
+        create();
+        return new CreateGroupDetailsDialog(driver);
+    }
+}

domiSMP-ui-tests/src/main/java/pages/systemSettings/UsersPage.java

 package pages.systemSettings;
 
-import ddsl.CommonPageWithGrid;
+import ddsl.CommonPageWithTabsAndGrid;
 import ddsl.dcomponents.commonComponents.UserDataCommonComponent;
 import ddsl.dobjects.DButton;
 import org.openqa.selenium.WebDriver;
@@ -10,7 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import rest.models.UserModel;
 
-public class UsersPage extends CommonPageWithGrid {
+public class UsersPage extends CommonPageWithTabsAndGrid {
     /**
      * Page object for the Users page. This contains the locators of the page and the methods for the behaviour of the page
      */

domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/DomainsPage.java

 package pages.systemSettings.domainsPage;
 
-import ddsl.CommonPageWithGrid;
+import ddsl.CommonPageWithTabsAndGrid;
 import ddsl.dobjects.DButton;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -8,7 +8,7 @@ import org.openqa.selenium.support.FindBy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DomainsPage extends CommonPageWithGrid {
+public class DomainsPage extends CommonPageWithTabsAndGrid {
     /**
      * Page object for the Users page. This contains the locators of the page and the methods for the behaviour of the page
      */

domiSMP-ui-tests/src/main/java/rest/models/GroupModel.java

+package rest.models;
+
+
+import utils.Generator;
+
+public class GroupModel {
+    private String groupName;
+    private String visibility;
+    private String groupDescription;
+
+    public static GroupModel generatePublicDomain() {
+        GroupModel groupModel = new GroupModel();
+        groupModel.groupName = ("AUT_groupName_" + Generator.randomAlphaNumeric(4)).toLowerCase();
+        groupModel.groupDescription = Generator.randomAlphaNumeric(10).toLowerCase();
+        groupModel.visibility = "PUBLIC";
+        return groupModel;
+    }
+
+    public static GroupModel generatePrivateDomain() {
+        GroupModel groupModel = new GroupModel();
+        groupModel.groupName = ("AUT_groupName_" + Generator.randomAlphaNumeric(4)).toLowerCase();
+        groupModel.groupDescription = Generator.randomAlphaNumeric(10).toLowerCase();
+        groupModel.visibility = "PRIVATE";
+        return groupModel;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getVisibility() {
+        return visibility;
+    }
+
+    public void setVisibility(String visibility) {
+        this.visibility = visibility;
+    }
+
+    public String getGroupDescription() {
+        return groupDescription;
+    }
+
+    public void setGroupDescription(String groupDescription) {
+        this.groupDescription = groupDescription;
+    }
+}

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/DomainsPgTests.java

@@ -44,7 +44,7 @@ public class DomainsPgTests extends SeleniumTest {
         String alert = domainsPage.getAlertMessageAndClose();
         soft.assertEquals(alert, "Domain: [" + domainModel.getDomainCode() + "] was created!");
 
-        domainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        domainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         soft.assertEquals(domainModel.getSignatureKeyAlias(), domainsPage.getDomainTab().getResponseSignatureCertificateSelectedValue());
         soft.assertEquals(domainModel.getVisibility(), domainsPage.getDomainTab().getVisibilityOfDomainSelectedValue());
         soft.assertEquals("To complete domain configuration, please select at least one resource type from the Resource Types tab", domainsPage.getDomainWarningMessage());
@@ -62,7 +62,7 @@ public class DomainsPgTests extends SeleniumTest {
         String alert = domainsPage.getAlertMessageAndClose();
         soft.assertEquals(alert, "Domain: [" + domainModel.getDomainCode() + "] was created!");
 
-        domainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        domainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         domainsPage.goToTab("SML integration");
         domainsPage.getSMLIntegrationTab().fillSMLIntegrationTab(domainModel);
         domainsPage.getSMLIntegrationTab().saveChanges();
@@ -104,14 +104,14 @@ public class DomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(normalUser.getUsername(), data.getNewPassword());
         EditDomainsPage editDomainsPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        WebElement domainElement = editDomainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
+        WebElement domainElement = editDomainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
         soft.assertNull(domainElement, "Domain found for user which doesn't have rights");
 
         homePage.logout();
         loginPage = homePage.goToLoginPage();
         loginPage.login(data.getAdminUser().get("username"), data.getAdminUser().get("password"));
         domainsPage = homePage.getSidebar().navigateTo(Pages.SYSTEM_SETTINGS_DOMAINS);
-        domainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        domainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         domainsPage.goToTab("Members");
         domainsPage.getMembersTab().changeRoleOfUser(normalUser.getUsername(), "ADMIN");
 
@@ -120,7 +120,7 @@ public class DomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(normalUser.getUsername(), data.getNewPassword());
         editDomainsPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        domainElement = editDomainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
+        domainElement = editDomainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
         soft.assertNotNull(domainElement, "Domain found for user which doesn't have rights");
 
 
@@ -129,7 +129,7 @@ public class DomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(data.getAdminUser().get("username"), data.getAdminUser().get("password"));
         domainsPage = homePage.getSidebar().navigateTo(Pages.SYSTEM_SETTINGS_DOMAINS);
-        domainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        domainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         domainsPage.goToTab("Members");
         domainsPage.getMembersTab().removeUser(normalUser.getUsername());
         userMemberElement = domainsPage.getMembersTab().getMembersGrid().searchAndGetElementInColumn("Username", normalUser.getUsername());
@@ -139,7 +139,7 @@ public class DomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(normalUser.getUsername(), data.getNewPassword());
         editDomainsPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        domainElement = editDomainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
+        domainElement = editDomainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
         soft.assertNull(domainElement, "Domain found for user which doesn't have rights");
 
         soft.assertAll();

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditDomainsPgTests.java

@@ -9,8 +9,11 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.testng.asserts.SoftAssert;
 import pages.LoginPage;
+import pages.administration.editDomainsPage.CreateGroupDetailsDialog;
 import pages.administration.editDomainsPage.EditDomainsPage;
+import pages.administration.editGroupsPage.EditGroupsPage;
 import rest.models.DomainModel;
+import rest.models.GroupModel;
 import rest.models.MemberModel;
 import rest.models.UserModel;
 
@@ -51,7 +54,7 @@ public class EditDomainsPgTests extends SeleniumTest {
         rest.users().createUser(memberUser);
 
         //Invite user as VIEW and check if he has admin rights for domain
-        editDomainPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         editDomainPage.getDomainMembersTab().getInviteMemberBtn().click();
         editDomainPage.getDomainMembersTab().getInviteMembersPopup().selectMember(memberUser.getUsername(), "VIEWER");
         WebElement userMemberElement = editDomainPage.getDomainMembersTab().getMembersGrid().searchAndGetElementInColumn("Username", memberUser.getUsername());
@@ -62,14 +65,14 @@ public class EditDomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(memberUser.getUsername(), data.getNewPassword());
         EditDomainsPage editDomainsPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        WebElement domainElement = editDomainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
+        WebElement domainElement = editDomainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
         soft.assertNull(domainElement, "Domain found for user which doesn't have rights");
 
         homePage.logout();
         loginPage = homePage.goToLoginPage();
         loginPage.login(adminUser.getUsername(), data.getNewPassword());
         editDomainPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        editDomainPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         editDomainPage.getDomainMembersTab().changeRoleOfUser(memberUser.getUsername(), "ADMIN");
 
         //check if user has admin rights to domain as Admin
@@ -77,7 +80,7 @@ public class EditDomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(memberUser.getUsername(), data.getNewPassword());
         editDomainsPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        domainElement = editDomainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
+        domainElement = editDomainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
         soft.assertNotNull(domainElement, "Domain found for user which doesn't have rights");
 
 
@@ -86,7 +89,7 @@ public class EditDomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(adminUser.getUsername(), data.getNewPassword());
         editDomainPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        editDomainPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+        editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
         editDomainPage.getDomainMembersTab().removeUser(memberUser.getUsername());
         userMemberElement = editDomainPage.getDomainMembersTab().getMembersGrid().searchAndGetElementInColumn("Username", memberUser.getUsername());
         soft.assertNull(userMemberElement, "Domain found for user which doesn't have rights");
@@ -95,9 +98,28 @@ public class EditDomainsPgTests extends SeleniumTest {
         homePage.goToLoginPage();
         loginPage.login(memberUser.getUsername(), data.getNewPassword());
         editDomainsPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_DOMAINS);
-        domainElement = editDomainsPage.getDataPanelGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
+        domainElement = editDomainsPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode());
         soft.assertNull(domainElement, "Domain found for user which doesn't have rights");
+        soft.assertAll();
+
+    }
+
+    @Test(description = "EDTDOM-02 Domain admins are able to create new groups")
+    public void DomainAdminsAreAbleToCreate() throws Exception {
+        GroupModel groupToBeCreated = GroupModel.generatePublicDomain();
+        editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
+
+        editDomainPage.goToTab("Group");
+
+        CreateGroupDetailsDialog createGroupDetailsDialog = editDomainPage.getGroupTab().clickOnCreateNewGroup();
+        createGroupDetailsDialog.fillGroupDetails(groupToBeCreated);
+        Boolean isSaveSuccesfully = createGroupDetailsDialog.tryClickOnSave();
+        soft.assertTrue(isSaveSuccesfully);
+
+        WebElement createGroup = editDomainPage.getGroupTab().getGrid().searchAndGetElementInColumn("Group name", groupToBeCreated.getGroupName());
+        soft.assertNotNull(createGroup);
 
+        EditGroupsPage editgroupPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_GROUPS);
         soft.assertAll();
 
     }

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/TrustorePgTests.java

@@ -55,7 +55,7 @@ public class TrustorePgTests extends SeleniumTest {
         String duplicatedCertificateALias = truststorepage.addCertificateAndReturnAlias(path);
         WebElement certificate = truststorepage.getCertificateGrid().searchAndGetElementInColumn("Alias", certificateALias);
         soft.assertNotNull(certificate);
-        truststorepage.getDataPanelGrid().searchAndGetElementInColumn("Alias", duplicatedCertificateALias);
+        truststorepage.getLeftSideGrid().searchAndGetElementInColumn("Alias", duplicatedCertificateALias);
 
         soft.assertNotNull(duplicatedCertificateALias);
         soft.assertEquals(truststorepage.getPublicKeyTypeLbl(), "RSA");

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/UsersPgTests.java

@@ -34,7 +34,7 @@ public class UsersPgTests extends SeleniumTest {
 
         usersPage.refreshPage();
         // usersPage.filter(adminNewUserData.getUsername());
-        WebElement newUser = usersPage.getDataPanelGrid().searchAndGetElementInColumn("Username", adminNewUserData.getUsername());
+        WebElement newUser = usersPage.getLeftSideGrid().searchAndGetElementInColumn("Username", adminNewUserData.getUsername());
         soft.assertNotNull(newUser);
         newUser.click();