Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Tasks_pt_BR.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Tasks_pt_BR.properties?rev=1604162&r1=1604161&r2=1604162&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Tasks_pt_BR.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Tasks_pt_BR.properties Fri Jun 20 12:32:03 2014 @@ -14,7 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -tab1=Propaga\u00E7\u00E3o de Tarefas -tab2=Tarefas de Notifica\u00E7\u00E3o -tab3=Sincroniza\u00E7\u00E3o de Tarefas -tab4=Tarefas Agendadas +tab1=Propaga\u00e7\u00e3o de Tarefas +tab2=Tarefas de Notifica\u00e7\u00e3o +tab3=Tarefas Agendadas +tab4=Sincroniza\u00e7\u00e3o de Tarefas +tab5=Push de Tarefas
Copied: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSyncTasksPanel.html (from r1603360, syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html) URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSyncTasksPanel.html?p2=syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSyncTasksPanel.html&p1=syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html&r1=1603360&r2=1604162&rev=1604162&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks.html (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSyncTasksPanel.html Fri Jun 20 12:32:03 2014 @@ -21,14 +21,13 @@ under the License. <div id="users-contain" class="ui-widget" style="width:auto"> <span wicket:id="container"> <span wicket:id="datatable">[datatable]</span> - </span> - - <span style="float:right"> - <form wicket:id="PaginatorForm" style="display:inline"> - <label><wicket:message key="displayRows"/></label> - <select class="text ui-widget-content ui-corner-all" - wicket:id="rowsChooser"/> - </form> + <span style="float:right"> + <form wicket:id="PaginatorForm" style="display:inline"> + <label><wicket:message key="displayRows"/></label> + <select class="text ui-widget-content ui-corner-all" + wicket:id="rowsChooser"/> + </form> + </span> </span> </div> <div wicket:id="taskWin"> Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/AccessTestITCase.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/AccessTestITCase.java?rev=1604162&r1=1604161&r2=1604162&view=diff ============================================================================== --- syncope/trunk/console/src/test/java/org/apache/syncope/console/AccessTestITCase.java (original) +++ syncope/trunk/console/src/test/java/org/apache/syncope/console/AccessTestITCase.java Fri Jun 20 12:32:03 2014 @@ -74,5 +74,7 @@ public class AccessTestITCase extends Ab selenium.click("//div[@id='tabs']/ul/li[2]/a/span"); selenium.click("//div[@id='tabs']/ul/li[3]/a/span"); + selenium.click("//div[@id='tabs']/ul/li[4]/a/span"); + selenium.click("//div[@id='tabs']/ul/li[5]/a/span"); } } Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java?rev=1604162&r1=1604161&r2=1604162&view=diff ============================================================================== --- syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java (original) +++ syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java Fri Jun 20 12:32:03 2014 @@ -33,13 +33,13 @@ public class TaskTestITCase extends Abst selenium.waitForCondition("selenium.isElementPresent(" + "\"//tr[4]/td[10]/div/span[6]/a/img\");", "30000"); - selenium.click("//tr[4]/td[10]/div/span[6]/a/img"); - + selenium.click("//tr[4]/td[10]/div/span[6]/a/img"); + selenium.waitForCondition("selenium.isTextPresent(\"Operation executed successfully\");", "30000"); selenium.waitForCondition("selenium.isElementPresent(" + "\"//tr[4]/td[10]/div/span[12]/a/img\");", "30000"); - + selenium.click("//tr[4]/td[10]/div/span[12]/a/img"); selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000"); @@ -51,7 +51,7 @@ public class TaskTestITCase extends Abst selenium.click("//div[2]/form/div[2]/ul/li[2]/a"); assertTrue(selenium.isElementPresent("//div[2]/form/div[2]/div[2]/span/table/tbody/tr/td[4]")); - + seleniumDriver.switchTo().defaultContent(); selenium.click("css=a.w_close"); @@ -92,4 +92,25 @@ public class TaskTestITCase extends Abst selenium.waitForCondition("selenium.isTextPresent(\"Id\");", "30000"); } + + @Test + public void issueSYNCOPE473() { + selenium.click("css=img[alt=\"Tasks\"]"); + + selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000"); + + selenium.click("//div[@id='tabs']/ul/li[5]/a/span"); + selenium.click("//div[5]/span/a"); + + selenium.waitForCondition( + "selenium.isElementPresent(\"//iframe\");", "30000"); + + selenium.selectFrame("index=0"); + + selenium.isElementPresent("//div[@id='userFilter']"); + + seleniumDriver.switchTo().defaultContent(); + + selenium.click("css=a.w_close"); + } }
