Merge pull request #338 from zanata/enable-manual-functional-test

Enable manual functional test
zanata · Jan 16, 2014 · a7b8835 · a7b8835
2 parents 5f71c7b + be8b3b0
commit a7b8835
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -339,19 +339,25 @@
           <plugin>
             <groupId>com.jcabi</groupId>
             <artifactId>jcabi-mysql-maven-plugin</artifactId>
+            <configuration>
+              <classifier>mysql.classifier</classifier>
+              <port>${mysql.port}</port>
+              <data>${project.build.directory}/mdb</data>
+            </configuration>
             <executions>
               <execution>
                 <id>mysql-test</id>
                 <goals>
                   <goal>classify</goal>
-                  <goal>start</goal>
                   <goal>stop</goal>
                 </goals>
-                <configuration>
-                  <classifier>mysql.classifier</classifier>
-                  <port>${mysql.port}</port>
-                  <data>${project.build.directory}/mdb</data>
-                </configuration>
+              </execution>
+              <execution>
+                <id>start-mysql</id>
+                <goals>
+                  <goal>start</goal>
+                </goals>
+                <phase>package</phase>
               </execution>
             </executions>
           </plugin>
@@ -377,7 +383,7 @@
                 <goals>
                   <goal>execute</goal>
                 </goals>
-                <phase>pre-integration-test</phase>
+                <phase>package</phase>
                 <configuration>
                   <sqlCommand>ALTER DATABASE ${ds.database} CHARACTER SET utf8 COLLATE utf8_general_ci;</sqlCommand>
                 </configuration>
@@ -575,7 +581,6 @@
               <target>
                 <echo>===== Properties that can be set for functional test =====</echo>
                 <echo>-Dfunctional-test : to activate functional test run</echo>
-                <echo>-Dcargo.wait : to ask cargo to start up then wait so that tests can be run manually</echo>
                 <echo>-Dzanata.target.version=version of zanata to deploy. Default is: ${project.parent.version}</echo>
                 <echo>-Dzanata.target.war=location of the war. Default is: ${basedir}/../zanata-war/target/zanata-${zanata.target.version}.war.</echo>
                 <echo>-Dzanata.instance.url=http://${cargo.host}:8080/${context.path}</echo>
@@ -589,6 +594,7 @@
                 <echo>-Dwebdriver.chrome.bin=full path to chrome binary.</echo>
                 <echo>-Dwebdriver.chrome.driver=full path to chromedriver binary.</echo>
                 <echo>==========================================================</echo>
+                <echo>to ask cargo to start up then wait so that tests can be run manually: mvn clean package cargo:run -Dfunctional-test -Dmysql.port=13306</echo>
               </target>
             </configuration>
           </execution>

diff --git a/functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java b/functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
@@ -87,7 +87,7 @@ public ProjectVersionPage saveVersion() {
     }
 
     public CreateVersionPage showLocalesOverride() {
-        getDriver().findElement(By.xpath("//*[@title='overrideLocales']"))
+        getDriver().findElement(By.id("iterationForm:overrideLocales"))
                 .click();
         waitForTenSec().until(new Predicate<WebDriver>() {
             @Override

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
@@ -66,7 +66,7 @@
 
   <s:div>
     <a4j:region>
-      <h:selectBooleanCheckbox title="overrideLocales"
+      <h:selectBooleanCheckbox title="overrideLocales" id="overrideLocales"
         value="#{projectIterationLocaleAction.setting}">
         <a4j:ajax event="change" render="languagelist"/>
       </h:selectBooleanCheckbox>