incorporated the review comments

cloudsufi · Nov 22, 2023 · f359c11 · f359c11
1 parent 89e0b88
commit f359c11
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 39 deletions.
diff --git a/cdap-e2e-tests/src/e2e-test/features/systemadmin/SysAdminDesignTime.feature b/cdap-e2e-tests/src/e2e-test/features/systemadmin/SysAdminDesignTime.feature
@@ -17,11 +17,13 @@
 @Sysadmin
 Feature: Sysadmin - Validate system admin page design time scenarios
 
-  @Sysadmin @SysAdminRequired
-  Scenario:Validate user is able to create new system preferences and able to delete the added system preferences successfully
+  Background:
     Given Open Datafusion Project to configure pipeline
     When Open "System Admin" menu
     Then Click on the Configuration link on the System admin page
+
+  @Sysadmin @SysAdminRequired
+  Scenario:Validate user is able to create new system preferences and able to delete the added system preferences successfully
     Then Select "systemPreferences" option from Configuration page
     Then Click on edit system preferences
     Then Set system preferences with key: "keyValue" and value: "systemPreferences1"
@@ -33,9 +35,6 @@ Feature: Sysadmin - Validate system admin page design time scenarios
     Then Verify the system admin page is navigated successfully
 
   Scenario:Validate user is able to add multiple system preferences inside system admin successfully
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Select "systemPreferences" option from Configuration page
     Then Click on edit system preferences
     Then Set system preferences with key: "keyValue" and value: "systemPreferences2"
@@ -47,17 +46,11 @@ Feature: Sysadmin - Validate system admin page design time scenarios
     Then Verify the system admin page is navigated successfully
 
   Scenario:Validate user is able to successfully reload system artifacts using reload
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on Reload System Artifacts from the System admin page
     Then Click on Reload button on popup to reload the System Artifacts successfully
     Then Verify the system admin page is navigated successfully
 
   Scenario:Validate user is able to open compute profile page and create a compute profile for selected provisioner
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on the Compute Profile from the System admin page
     Then Click on create compute profile button
     Then Select a provisioner: "remoteHadoopProvisioner" for the compute profile

diff --git a/cdap-e2e-tests/src/e2e-test/features/systemadmin/SysAdminDesignTimeValidation.feature b/cdap-e2e-tests/src/e2e-test/features/systemadmin/SysAdminDesignTimeValidation.feature
@@ -17,21 +17,20 @@
 @Sysadmin
 Feature: Sysadmin - Validate system admin page design time validation scenarios
 
-  @SysAdminRequired
-  Scenario:Validate user is able reset the system preferences added inside system admin successfully
+  Background:
     Given Open Datafusion Project to configure pipeline
     When Open "System Admin" menu
     Then Click on the Configuration link on the System admin page
+
+  @SysAdminRequired
+  Scenario:Validate user is able reset the system preferences added inside system admin successfully
     Then Select "systemPreferences" option from Configuration page
     Then Click on edit system preferences
     Then Set system preferences with key: "keyValue" and value: "systemPreferences1"
     Then Reset the preferences
     Then Verify the reset is successful for added preferences
 
   Scenario:To verify the validation error message with invalid cluster name
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on the Compute Profile from the System admin page
     Then Click on create compute profile button
     Then Select a provisioner: "existingDataProc" for the compute profile
@@ -42,9 +41,6 @@ Feature: Sysadmin - Validate system admin page design time validation scenarios
     Then Verify that the compute profile is displaying an error message: "errorInvalidClusterName" on the footer
 
   Scenario:To verify the validation error message with invalid profile name
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on the Compute Profile from the System admin page
     Then Click on create compute profile button
     Then Select a provisioner: "existingDataProc" for the compute profile
@@ -55,9 +51,6 @@ Feature: Sysadmin - Validate system admin page design time validation scenarios
     Then Verify that the compute profile is displaying an error message: "errorInvalidProfileName" on the footer
 
   Scenario:To verify the validation error message with invalid namespace name
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on Create New Namespace button
     Then Enter the New Namespace Name with value: "invalidNamespaceName"
     Then Enter the Namespace Description with value: "validNamespaceDescription"

diff --git a/cdap-e2e-tests/src/e2e-test/features/systemadmin/SysAdminRunTime.feature b/cdap-e2e-tests/src/e2e-test/features/systemadmin/SysAdminRunTime.feature
@@ -17,11 +17,13 @@
 @Sysadmin
 Feature: Sysadmin - Validate system admin page Run time scenarios
 
-  @Sysadmin
-  Scenario:To verify user should be able to create Namespace successfully in System Admin
+  Background:
     Given Open Datafusion Project to configure pipeline
     When Open "System Admin" menu
     Then Click on the Configuration link on the System admin page
+
+  @Sysadmin
+  Scenario:To verify user should be able to create Namespace successfully in System Admin
     Then Click on Create New Namespace button
     Then Enter the New Namespace Name with value: "namespaceName"
     Then Enter the Namespace Description with value: "validNamespaceDescription"
@@ -31,9 +33,6 @@ Feature: Sysadmin - Validate system admin page Run time scenarios
 
   @SysAdminRequired
   Scenario:To verify User should be able to add a secure key from Make HTTP calls successfully with PUT calls
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on Make HTTP calls from the System admin configuration page
     Then Select request dropdown property with option value: "httpPutMethod"
     Then Enter input plugin property: "requestPath" with value: "secureKey"
@@ -43,9 +42,6 @@ Feature: Sysadmin - Validate system admin page Run time scenarios
 
   @SysAdminRequired
   Scenario:To verify User should be able to fetch secure key from Make HTTP calls successfully with GET calls
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on Make HTTP calls from the System admin configuration page
     Then Select request dropdown property with option value: "httpGetMethod"
     Then Enter input plugin property: "requestPath" with value: "secureKey"
@@ -54,9 +50,6 @@ Feature: Sysadmin - Validate system admin page Run time scenarios
 
   @SysAdminRequired
   Scenario:To verify User should be able to delete secure key from Make HTTP calls successfully with DELETE calls
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on Make HTTP calls from the System admin configuration page
     Then Select request dropdown property with option value: "httpDeleteMethod"
     Then Enter input plugin property: "requestPath" with value: "secureKey"
@@ -65,9 +58,6 @@ Feature: Sysadmin - Validate system admin page Run time scenarios
 
   @BQ_SOURCE_TEST @BQ_SINK_TEST @SysAdminRequired
   Scenario:To verify user should be able to run a pipeline successfully using the System preferences created
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Select "systemPreferences" option from Configuration page
     Then Click on edit system preferences
     Then Set system preferences with key: "keyValue" and value: "systemPreferences2"
@@ -103,9 +93,6 @@ Feature: Sysadmin - Validate system admin page Run time scenarios
 
   @BQ_SOURCE_TEST @BQ_SINK_TEST @SysAdminRequired
   Scenario:To verify user should be able to run a pipeline successfully using existing System preferences and the Namespace preferences created
-    Given Open Datafusion Project to configure pipeline
-    When Open "System Admin" menu
-    Then Click on the Configuration link on the System admin page
     Then Click on Create New Namespace button
     Then Enter the New Namespace Name with value: "sampleNamespaceName"
     Then Enter the Namespace Description with value: "validNamespaceDescription"