NameSpace Admin page locators actions and step definition addition. by rahuldash171 · Pull Request #225 · cdapio/cdap-e2e-tests

rahuldash171 · 2023-11-01T07:49:45Z

Namespace admin page FW changes for new locators , actions and step defs .

itsankit-google · 2023-11-20T17:18:56Z

src/main/java/io/cdap/e2e/pages/actions/CdfNameSpaceAdminActions.java

+   *                           keyValuePair as key
+   */
+  public static void enterKeyValuePreferences(String preferenceProperty, String keyValuePair) {
+    String pluginPropertyDataCyAttribute = PluginPropertyUtils.getPluginPropertyDataCyAttribute(


How is plugin being referenced on namespace admin page?

Hi Ankit , This plugin is for setting the nameSpace admin preferences which are key-value pairs present inside datacy properties file .

Plugin in CDAP is used for source/sink/transform/actions: https://cdap.atlassian.net/wiki/spaces/DOCS/pages/477790917/Introduction+to+data+pipelines#Plugins

Changed the naming to String dataCyAttribute .

…ors were removed which were common in Sys admin and Namespace admin . Sys admin FW PR is merged

itsankit-google · 2023-11-29T07:36:21Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  public static WebElement locateKeyProperty(String pluginProperty, int row) {
+    String xpath = "//*[@data-cy='" + pluginProperty + "" + row + "']//input[@placeholder='key']";
+    return SeleniumDriver.getDriver().findElement(By.xpath(xpath));
+  }
+
+  public static WebElement locateValueProperty(String pluginProperty, int row) {
+    String xpath = "//*[@data-cy='" + pluginProperty + "" + row + "']//input[@placeholder='value']";
+    return SeleniumDriver.getDriver().findElement(By.xpath(xpath));
+  }
+
+  public static WebElement locateAddRowButtonProperty(String pluginProperty, int row) {


Same comment applies to this file.

Ok ankit , I have done the necessary changes . Please have a look in the latest commit . Thanks .

itsankit-google · 2023-11-29T12:22:05Z

src/main/java/io/cdap/e2e/pages/actions/CdfNameSpaceAdminActions.java

+   *                           {@link ConstantsUtil#DEFAULT_PLUGIN_PROPERTIES_FILE} with
+   *                           keyValuePair as key
+   */
+  public static void enterKeyValuePreferences(String preferenceProperty, String keyValuePair) {


The same method already exists here:

cdap-e2e-tests/src/main/java/io/cdap/e2e/pages/actions/CdfPluginPropertiesActions.java

Line 946 in 44f61d8

public static void enterKeyValuePairsForProperty(String pluginProperty, String jsonKeyValuePairs) {

Please avoid code duplication.

Ankit , here the locators are different . The method which is present inside cdfPluginPropertiesActions is pointing to setting runtime arguments for a deployed pipline whereas my method is pointing to setting preferences inside namespace admin . The key and value tabs which are present here does not work with the old locators .

itsankit-google · 2023-11-29T12:24:33Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+/**
+ * Represents CdfNameSpaceAdminLocators
+ */
+public class CdfNameSpaceAdminLocators {


Please get a review on locators class from @GnsP from UI team.

GnsP · 2024-01-19T06:37:28Z

src/main/java/io/cdap/e2e/pages/actions/CdfNameSpaceAdminActions.java

+    String dataCyAttribute = PluginPropertyUtils.getPluginPropertyDataCyAttribute(
+        preferenceProperty);
+    if (dataCyAttribute == null) {
+      dataCyAttribute = preferenceProperty;
+    }
+    Map<String, String> properties =
+        JsonUtils.convertKeyValueJsonArrayToMap(PluginPropertyUtils.pluginProp(keyValuePair));
+    int index = 0;
+    for (Map.Entry<String, String> entry : properties.entrySet()) {
+      if (index != 0) {
+        ElementHelper.clickOnElement(CdfNameSpaceAdminLocators.locateAddRowButtonProperty(
+            dataCyAttribute, index - 1));
+      }
+      ElementHelper.sendKeys(CdfNameSpaceAdminLocators.locateKeyProperty(
+          dataCyAttribute, index), entry.getKey());
+      ElementHelper.sendKeys(CdfNameSpaceAdminLocators.locateValueProperty(
+          dataCyAttribute, index), entry.getValue());
+      index++;
+    }


The data-cy attributes are specific to tests written using cypress. Prefer using using a custom data- attribute for this action.

GnsP · 2024-01-19T06:39:48Z

src/main/java/io/cdap/e2e/pages/actions/CdfNameSpaceAdminActions.java

+        expectedNameSpace);
+  }
+
+  public static void verifyElementIsDisplayed() {


The method name seems to indicate that this method checks if any given element is displayed, where as it actually checks if the page header is displayed or not. Consider changing the method name to reflect its actual behavior.

GnsP · 2024-01-19T06:41:37Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+ */
+public class CdfNameSpaceAdminLocators {
+
+  @FindBy(how = How.XPATH, using = "//div[contains(text(),'Namespace Admin')]")


Finding elements using text / copy is generally not a good idea, as copy may change based on product requirements and this may result in breaking tests across multiple projects (as this locator is in the e2e framework). Prefer using a data-testid for locating elements.

GnsP · 2024-01-19T06:42:00Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  @FindBy(how = How.XPATH, using = "//div[contains(text(),'Namespace Admin')]")
+  public static WebElement namespaceAdminMenu;
+
+  @FindBy(how = How.XPATH, using = "//*[@data-cy='navbar-hamburger-icon']")


prefer data-testid over data-cy.

GnsP · 2024-01-19T06:43:21Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+    return SeleniumDriver.getDriver().findElement(By.xpath(path));
+  }
+
+  public static WebElement locateMenuLink(String menuLink) {


prefer data-testid over data-cy

GnsP · 2024-01-19T06:55:00Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  @FindBy(how = How.XPATH, using = "//span[contains(text(),'Add Connection')]")
+  public static WebElement addConnectionTab;
+
+  @FindBy(how = How.XPATH, using = "//span[contains(text(),'Import')]")


Locating elements based on text content is not a good idea, as explained in other comments.

GnsP · 2024-01-19T06:55:06Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  @FindBy(how = How.XPATH, using = "//span[contains(text(),'Import')]")
+  public static WebElement importConnectionTab;
+
+  @FindBy(how = How.XPATH, using = "//span[contains(text(),'Create Profile')]")


Locating elements based on text content is not a good idea, as explained in other comments.

GnsP · 2024-01-19T06:55:11Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  @FindBy(how = How.XPATH, using = "//span[contains(text(),'Create Profile')]")
+  public static WebElement createProfileInNamespaceAdmin;
+
+  @FindBy(how = How.XPATH, using = "//a[contains(text(),\"Switch to\")]")


Locating elements based on text content is not a good idea, as explained in other comments.

GnsP · 2024-01-19T06:55:28Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  @FindBy(how = How.XPATH, using = "//a[contains(text(),\"Switch to\")]")
+  public static WebElement switchToNameSpaceButton;
+
+  @FindBy(how = How.XPATH, using = "//div[@class=\"namespace-and-caret\"]")


Locating elements based on css classes is not a good idea, as explained in other comments.

GnsP · 2024-01-19T06:55:37Z

src/main/java/io/cdap/e2e/pages/locators/CdfNameSpaceAdminLocators.java

+  @FindBy(how = How.XPATH, using = "//div[@class=\"namespace-and-caret\"]")
+  public static WebElement namespaceText;
+
+  @FindBy(how = How.XPATH, using = "//*[@data-cy='feature-heading'][//div[contains(text(),'Namespace')]]")


Locating elements based on text content is not a good idea, as explained in other comments.

sau42shri requested a review from itsankit-google November 7, 2023 07:03

Vipinofficial11 added the build label Nov 9, 2023

itsankit-google reviewed Nov 20, 2023

View reviewed changes

rahuldash171 force-pushed the cdap_e2e_NameSpaceAdmin_FW branch from ca3dc6d to 86c646f Compare November 28, 2023 13:15

rahuldash171 added 3 commits November 28, 2023 19:06

NameSpace Admin page locators actions and step definition addition.

e15edd7

Addressed review comments

86c646f

Addressed review comments and most of the repeated actions/step/locat…

11d67de

…ors were removed which were common in Sys admin and Namespace admin . Sys admin FW PR is merged

itsankit-google reviewed Nov 29, 2023

View reviewed changes

Renamed the texts pluginProperty to correct naming .

c5b3b10

itsankit-google reviewed Nov 29, 2023

View reviewed changes

itsankit-google requested a review from GnsP November 29, 2023 12:24

GnsP requested changes Jan 19, 2024

View reviewed changes

Conversation

rahuldash171 commented Nov 1, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants