You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/08/22 09:33:42 UTC

svn commit: r1516378 - in /syncope/trunk: ./ console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java pom.xml

Author: ilgrosso
Date: Thu Aug 22 07:33:41 2013
New Revision: 1516378

URL: http://svn.apache.org/r1516378
Log:
Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1516187-1516377

Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1516378&r1=1516377&r2=1516378&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Thu Aug 22 07:33:41 2013
@@ -154,12 +154,6 @@ public class ConfigurationTestITCase ext
 
         selenium.click("//div[2]/form/div[3]/ul/li[2]/a/span");
 
-        selenium.select("//td[3]/select", "label=MEMBERSHIP");
-
-        selenium.waitForCondition("selenium.isElementPresent(\"//td[4]/select[option='8 otherchild']\");", "30000");
-
-        selenium.select("//td[4]/select", "label=8 otherchild");
-
         selenium.click("//div[2]/form/div[3]/ul/li[3]/a/span");
 
         selenium.click("//div[2]/form/div[3]/div[3]/span/span/div/div[2]/div/select/option");

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1516378&r1=1516377&r2=1516378&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Aug 22 07:33:41 2013
@@ -317,7 +317,7 @@ under the License.
         
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
 
-    <wicket.version>6.9.1</wicket.version>
+    <wicket.version>6.10.0</wicket.version>
 
     <groovy.version>2.1.6</groovy.version>