Return-Path: 
 <commits-return-9498-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
X-Original-To: apmail-roller-commits-archive@www.apache.org
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3DBD71884E
	for <apmail-roller-commits-archive@www.apache.org>;
 Tue, 22 Sep 2015 02:26:02 +0000 (UTC)
Received: (qmail 83651 invoked by uid 500); 22 Sep 2015 02:26:02 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 83620 invoked by uid 500); 22 Sep 2015 02:26:02 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 83609 invoked by uid 99); 22 Sep 2015 02:26:02 -0000
Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2015 02:26:02 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org)
 with ESMTP id AEB83180981
	for <commits@roller.apache.org>; Tue, 22 Sep 2015 02:26:01 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 4.3
X-Spam-Level: ****
X-Spam-Status: No, score=4.3 tagged_above=-999 required=6.31
	tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1,
	RDNS_NONE=2.5] autolearn=disabled
Received: from mx1-us-east.apache.org ([10.40.0.8])
	by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new,
 port 10024)
	with ESMTP id cETonvxJwUpR for <commits@roller.apache.org>;
	Tue, 22 Sep 2015 02:26:00 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (unknown [209.188.14.139])
	by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with
 ESMTP id 2D8B14417C
	for <commits@roller.apache.org>; Tue, 22 Sep 2015 02:26:00 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
	by mailrelay1-us-west.apache.org (ASF Mail Server at
 mailrelay1-us-west.apache.org) with ESMTP id B8BC2E02E8
	for <commits@roller.apache.org>; Tue, 22 Sep 2015 02:25:59 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org)
 with ESMTP id B5E5D3A01E3
	for <commits@roller.apache.org>; Tue, 22 Sep 2015 02:25:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1704450 - in /roller/trunk/it-selenium: ./
 src/test/java/org/apache/roller/selenium/
 src/test/java/org/apache/roller/selenium/core/
 src/test/java/org/apache/roller/selenium/editor/
Date: Tue, 22 Sep 2015 02:25:59 -0000
To: commits@roller.apache.org
From: kohei@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150922022559.B5E5D3A01E3@svn01-us-west.apache.org>

Author: kohei
Date: Tue Sep 22 02:25:56 2015
New Revision: 1704450

URL: http://svn.apache.org/viewvc?rev=1704450&view=rev
Log:
Fix Selenium test

Modified:
    roller/trunk/it-selenium/pom.xml
    roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java
    roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
    roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java
    roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/editor/AbstractEntryPage.java

Modified: roller/trunk/it-selenium/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1704450&r1=1704449&r2=1704450&view=diff
==============================================================================
--- roller/trunk/it-selenium/pom.xml (original)
+++ roller/trunk/it-selenium/pom.xml Tue Sep 22 02:25:56 2015
@@ -33,7 +33,8 @@
     <packaging>war</packaging>
 
     <properties>
-        <selenium.version>2.39.0</selenium.version>
+        <selenium.version>2.47.1</selenium.version>
+        <javamail.version>1.4.7</javamail.version>
     </properties>
 
     <!-- Process to run Selenium tests (actually no tests right now, just a skeleton)
@@ -184,6 +185,11 @@
                         <artifactId>derbyclient</artifactId>
                         <version>${derby.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                        <version>${javamail.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>

Modified: roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java?rev=1704450&r1=1704449&r2=1704450&view=diff
==============================================================================
--- roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java (original)
+++ roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java Tue Sep 22 02:25:56 2015
@@ -21,6 +21,7 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
 
 /**
  * Abstract class holding functionality common to Selenium Page Objects
@@ -73,4 +74,9 @@ public abstract class AbstractRollerPage
     protected String getTextById(String fieldId) {
         return driver.findElement(By.id(fieldId)).getText();
     }
+
+    protected void selectOptionByVisibleText(String selectId, String visibleText) {
+        Select select = new Select(driver.findElement(By.id(selectId)));
+        select.selectByVisibleText(visibleText);
+    }
 }
\ No newline at end of file

Modified: roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java?rev=1704450&r1=1704449&r2=1704450&view=diff
==============================================================================
--- roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java (original)
+++ roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java Tue Sep 22 02:25:56 2015
@@ -35,6 +35,7 @@ import org.apache.roller.selenium.editor
 import org.apache.roller.selenium.editor.EntryEditPage;
 import org.apache.roller.selenium.view.BlogHomePage;
 import org.apache.roller.selenium.view.SingleBlogEntryPage;
+import org.openqa.selenium.firefox.FirefoxProfile;
 
 public class InitialLoginTestIT {
     private WebDriver driver;
@@ -44,7 +45,9 @@ public class InitialLoginTestIT {
 
     @Before
     public void setUp() throws Exception {
-        driver = new FirefoxDriver();
+        FirefoxProfile profile = new FirefoxProfile();
+        profile.setPreference("intl.accept_languages", "en_US");
+        driver = new FirefoxDriver(profile);
         baseUrl = "http://localhost:8080/roller/";
         driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
     }

Modified: roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java?rev=1704450&r1=1704449&r2=1704450&view=diff
==============================================================================
--- roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java (original)
+++ roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/CreateWeblogPage.java Tue Sep 22 02:25:56 2015
@@ -44,6 +44,7 @@ public class CreateWeblogPage extends Ab
         setName(name);
         setHandle(handle);
         setEmail(email);
+        setLocale("English");
         return createWeblog();
     }
 
@@ -63,4 +64,8 @@ public class CreateWeblogPage extends Ab
         setFieldValue("createWeblog_bean_emailAddress", value);
     }
 
+    public void setLocale(String value) {
+        selectOptionByVisibleText("createWeblog_bean_locale", value);
+    }
+
 }

Modified: roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/editor/AbstractEntryPage.java
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/editor/AbstractEntryPage.java?rev=1704450&r1=1704449&r2=1704450&view=diff
==============================================================================
--- roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/editor/AbstractEntryPage.java (original)
+++ roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/editor/AbstractEntryPage.java Tue Sep 22 02:25:56 2015
@@ -32,7 +32,7 @@ public abstract class AbstractEntryPage
     }
 
     public void setText(String value) {
-        setFieldValue("entry_bean_text", value);
+        setFieldValue("edit_content", value);
     }
 
     public void setSummary(String value) {
@@ -40,7 +40,7 @@ public abstract class AbstractEntryPage
     }
 
     public EntryEditPage postBlogEntry() {
-        clickById("entry_2");
+        clickById("entry_%{#mainAction}!publish");
         return new EntryEditPage(driver);
     }
 }