Merge remote-tracking branch 'origin/master'

Evolveum · Mar 31, 2020 · b6bc0e5 · b6bc0e5
2 parents 0f44c91 + e07596c
commit b6bc0e5
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 11 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
@@ -92,15 +92,6 @@ protected void onUpdatePerformed(AjaxRequestTarget target) {
                     }
                 }
 
-                PrismObjectWrapperFactory<TaskType> wrapperFactory = TaskBasicTabPanel.this.getPageBase().findObjectWrapperFactory(getTask().asPrismObject().getDefinition());
-                Task task = getPageBase().createSimpleTask(OPERATION_UPDATE_WRAPPER);
-                OperationResult result = task.getResult();
-                WrapperContext ctx = new WrapperContext(task, result);
-                try {
-                    wrapperFactory.updateWrapper(TaskBasicTabPanel.this.getModelObject(), ctx);
-                } catch (SchemaException e) {
-                    LOGGER.error("Unexpected problem occurs during updating wrapper. Reason: {}", e.getMessage(), e);
-                }
                 updateHandlerPerformed(target);
 
             }

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskHandlerSelectorPanel.html b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskHandlerSelectorPanel.html
@@ -22,10 +22,10 @@
     <div class="prism-properties">
         <div>
             <div class="stripe">
-                <div class="row prism-property">
+                <div class="row prism-property" style="margin-right: 0px; margin-left: 0px;">
                     <div class="col-lg-2 col-md-4 col-xs-12 prism-property-label " wicket:id="header"/>
                     <div class="col-lg-10 col-md-8 col-xs-12 prism-property-value" wicket:id="values">
-                        <div class="row">
+                        <div class="row" style="margin-right: 0px; margin-left: 0px;">
                             <div class="col-xs-10" wicket:id="valueContainer">
                                 <form wicket:id="form">
                                     <div wicket:id="input"/>

diff --git a/...dingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/TaskPageTest.java b/...dingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/TaskPageTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010-2019 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+package com.evolveum.midpoint.testing.schrodinger.page;
+
+import com.codeborne.selenide.Selenide;
+
+import com.evolveum.midpoint.schrodinger.component.AssignmentHolderBasicTab;
+import com.evolveum.midpoint.schrodinger.component.common.PrismForm;
+import com.evolveum.midpoint.schrodinger.page.AssignmentHolderDetailsPage;
+import com.evolveum.midpoint.schrodinger.page.task.ListTasksPage;
+import com.evolveum.midpoint.schrodinger.page.task.TaskPage;
+import com.evolveum.midpoint.schrodinger.page.user.ListUsersPage;
+import com.evolveum.midpoint.schrodinger.page.user.UserPage;
+import com.evolveum.midpoint.testing.schrodinger.AbstractSchrodingerTest;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author skublik
+ */
+
+public class TaskPageTest extends AbstractSchrodingerTest {
+
+    @Test
+    public void test001createNewTask() {
+
+        String name = "NewTest";
+        String handler = "http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/recompute/handler-3";
+        TaskPage task = basicPage.newTask();
+        task.selectTabBasic().form().addAttributeValue("handlerUri", handler);
+        Selenide.sleep(2000);
+        task.selectTabBasic()
+                .form()
+                    .addAttributeValue("name", name)
+                    .selectOption("recurrence","Single")
+                    .selectOption("objectType","User")
+                    .and()
+                .and()
+             .clickSave();
+
+        ListTasksPage tasksPage = basicPage.listTasks();
+        PrismForm<AssignmentHolderBasicTab<AssignmentHolderDetailsPage>> taskForm = tasksPage
+                .table()
+                .search()
+                .byName()
+                .inputValue(name)
+                .updateSearch()
+                .and()
+                .clickByName(name)
+                .selectTabBasic()
+                .form();
+
+        Assert.assertTrue(taskForm.compareInputAttributeValue("name", name));
+        Assert.assertTrue(taskForm.compareInputAttributeValue("handlerUri", handler));
+    }
+}
diff --git a/testing/schrodingertest/testng-integration.xml b/testing/schrodingertest/testng-integration.xml
@@ -103,4 +103,9 @@
             <class name="com.evolveum.midpoint.testing.schrodinger.page.HomePageTest"/>
         </classes>
     </test>
+    <test name="Schrodinger.page.TaskPageTest" preserve-order="true" parallel="false" verbose="3" enabled="true">
+        <classes>
+            <class name="com.evolveum.midpoint.testing.schrodinger.page.TaskPageTest"/>
+        </classes>
+    </test>
 </suite>