add CustomCapabilities test 2295

epam · kamyshova · Nov 22, 2021 · Oct 29, 2021 · Oct 29, 2021 · Oct 30, 2021
commit a291befccdf97e8c81113bcfe727d8a50d58e762
diff --git a/docs/testcases/UI/Run_tools_in_sandbox/Launch_parameters/2295.md b/docs/testcases/UI/Run_tools_in_sandbox/Launch_parameters/2295.md
@@ -0,0 +1,34 @@
+# "Custom" capabilities with configured job parameters
+
+Test verifies that 
+- administrator shall be able to add params field to the capability - list of key/values. 
+- parameters are set as the parameters for a job.
+
+**Prerequisites**:
+- Admin user
+- Non-admin user
+- Test tool is available to the non-admin user
+
+| Steps | Actions | Expected results |
+| :---: | --- | --- |
+| 1 | Login as the admin user from the prerequisites | |
+| 2 | Open the **Settings** page | |
+| 3 | Open the **PREFERENCES** tab | |
+| 4 | Click the **Launch** tab | |
+| 5 | Find the **`launch.capabilities`** preference | |
+| 6 | Save the preference value, then clear and input the following json <ul> `{` <ul> `"testCapability1": {` <ul> `"description": "Custom test capability 1"`, <br> `"commands": [` <ul> `"echo testLine1"`, <br> `"echo 'testLine1' > ~/testFile1.txt"` </ul> `],` <br> `"params": {` <ul> `"MY_PARAM1": "MY_VALUE1"`, <br> `"MY_BOOLEAN_PARAM": true,` <br> `"MY_NUMBER_PARAM": 1` </ul> `}` </ul> `},` <br> `"testCapability2": {` <ul> `"description": "Custom test capability 2",` <br> `"commands": [` <ul> `"echo testLine2",` <br> `"echo 'testLine2' > ~/testFile1.txt"` </ul> `],` <br> `"params": {` <ul> `"MY_PARAM2": "MY_VALUE2"`, <br> `"MY_BOOLEAN_PARAM": false,` <br> `"MY_NUMBER_PARAM": 2` </ul> `}` </ul> `},` </ul> `}` </ul> `}` |
+| 7 | Click **Save** button | |
+| 8 | Login as the non-admin user from the prerequisites | |
+| 9 | Open the **Tools** page | |
+| 10 | Select the test tool | |
+| 11 | Run with custom settings | |
+| 12 | Expand **Exec environment** section | |
+| 13 | Click into the field near the ***Run capabilities*** label | Drop-down list of capabilities appears and contains ***testCapability1*** and ***testCapability2*** | 
+| 14 | Select ***testCapability1*** and ***testCapability2*** from list |  |
+| 15 | Launch the tool | |
+| 16 | At the **Runs** page, click the just-launched run | |
+| 17 | Expand the Parameters section | The Parameters section contains parameters <ul> *CP_CAP_CUSTOM_testCapability1: true* <br> *CP_CAP_CUSTOM_testCapability2: true* <br> *MY_PARAM1: MY_VALUE1* <br> *MY_PARAM2: MY_VALUE2* <br> *MY_BOOLEAN_PARAM: false* <br> *MY_NUMBER_PARAM: 2* |
+
+**After:**
+- Stop the run launched at step 15
+- Restore the value of the `launch.capabilities` preference to the previous value saved at step 6
diff --git a/e2e/gui/src/test/java/com/epam/pipeline/autotests/ToolsParametersTest.java b/e2e/gui/src/test/java/com/epam/pipeline/autotests/ToolsParametersTest.java
@@ -17,6 +17,7 @@
 
 import com.epam.pipeline.autotests.ao.RunsMenuAO;
 import com.epam.pipeline.autotests.ao.ToolTab;
+import com.epam.pipeline.autotests.mixins.Authorization;
 import com.epam.pipeline.autotests.mixins.Tools;
 import com.epam.pipeline.autotests.utils.C;
 import com.epam.pipeline.autotests.utils.TestCase;
@@ -40,14 +41,14 @@
 
 public class ToolsParametersTest
         extends AbstractSeveralPipelineRunningTest
-        implements Tools {
+        implements Authorization, Tools {
 
     private final String tool = C.TESTING_TOOL_NAME;
     private final String registry = C.DEFAULT_REGISTRY;
     private final String group = C.DEFAULT_GROUP;
     private final String invalidEndpoint = "8700";
     private final String launchCapabilities = "launch.capabilities";
-    private static final String CUSTOM_CAPABILITIES_JSON = "/customCapabilities.json";
+    private static final String CUSTOM_CAPABILITIES_1_JSON = "/customCapabilities1.json";
     private String prefInitialValue = "";
     private final String custCapability1 = "testCapability1";
     private final String custCapability2 = "testCapability2";
@@ -100,8 +101,10 @@ public void customCapabilitiesImplementation() {
                 .settings()
                 .switchToPreferences()
                 .clearAndSetJsonToPreference(launchCapabilities,
-                        readResourceFully(CUSTOM_CAPABILITIES_JSON), true)
+                        readResourceFully(CUSTOM_CAPABILITIES_1_JSON), true)
                 .saveIfNeeded();
+        logout();
+        loginAs(user);
         tools()
                 .perform(registry, group, tool, ToolTab::runWithCustomSettings)
                 .expandTab(EXEC_ENVIRONMENT)
@@ -134,4 +137,32 @@ public void customCapabilitiesImplementation() {
                         .assertOutputContains("testLine1", "testLine2")
                         .close());
     }
+
+    @Test
+    @TestCase(value = {"2295"})
+    public void customCapabilitiesWithConfiguredJobParameters() {
+        navigationMenu()
+                .settings()
+                .switchToPreferences()
+                .clearAndSetJsonToPreference(launchCapabilities,
+                        readResourceFully(CUSTOM_CAPABILITIES_1_JSON), true)
+                .saveIfNeeded();
+        logout();
+        loginAs(user);
+        tools()
+                .perform(registry, group, tool, ToolTab::runWithCustomSettings)
+                .expandTab(EXEC_ENVIRONMENT)
+                .selectValue(RUN_CAPABILITIES, custCapability1)
+                .click(RUN_CAPABILITIES)
+                .selectValue(RUN_CAPABILITIES, custCapability2)
+                .launch(this)
+                .showLog(getLastRunId())
+                .expandTab(PARAMETERS)
+                .ensure(configurationParameter(format("CP_CAP_CUSTOM_%s", custCapability1), "true"), exist)
+                .ensure(configurationParameter(format("CP_CAP_CUSTOM_%s", custCapability2), "true"), exist)
+                .ensure(configurationParameter("MY_PARAM1", "MY_VALUE1"), exist)
+                .ensure(configurationParameter("MY_PARAM2", "MY_VALUE2"), exist)
+                .ensure(configurationParameter("MY_BOOLEAN_PARAM", "false"), exist)
+                .ensure(configurationParameter("MY_NUMBER_PARAM", "2"), exist);
+    }
 }
diff --git a/...rc/test/resources/customCapabilities.json → ...c/test/resources/customCapabilities1.json b/...rc/test/resources/customCapabilities.json → ...c/test/resources/customCapabilities1.json
diff --git a/e2e/gui/src/test/resources/customCapabilities2.json b/e2e/gui/src/test/resources/customCapabilities2.json
@@ -0,0 +1,26 @@
+{
+  "testCapability1": {
+    "description": "Custom test capability 1",
+    "commands": [
+      "echo testLine1",
+      "echo 'testLine1' > ~/testFile1.txt"
+    ],
+    "params": {
+      "MY_PARAM1": "MY_VALUE1",
+      "MY_BOOLEAN_PARAM": true,
+      "MY_NUMBER_PARAM": 1
+    }
+  },
+  "testCapability2": {
+    "description": "Custom test capability 2",
+    "commands": [
+      "echo testLine2",
+      "echo 'testLine2' >> ~/testFile1.txt"
+    ],
+    "params": {
+      "MY_PARAM2": "MY_VALUE2",
+      "MY_BOOLEAN_PARAM": false,
+      "MY_NUMBER_PARAM": 2
+    }
+  }
+}