Return-Path: 
 <commits-return-25987-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
X-Original-To: apmail-couchdb-commits-archive@www.apache.org
Delivered-To: apmail-couchdb-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 71A8A19905
	for <apmail-couchdb-commits-archive@www.apache.org>;
 Thu, 14 Apr 2016 13:44:47 +0000 (UTC)
Received: (qmail 2130 invoked by uid 500); 14 Apr 2016 13:44:47 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 2090 invoked by uid 500); 14 Apr 2016 13:44:47 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 2080 invoked by uid 99); 14 Apr 2016 13:44:47 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 13:44:47 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C4B1FDFC74; Thu, 14 Apr 2016 13:44:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: robertkowalski@apache.org
To: commits@couchdb.apache.org
Message-Id: <a495f2586d0449f58d817ab26ff0d004@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: fauxton commit: updated refs/heads/master to f21e761
Date: Thu, 14 Apr 2016 13:44:46 +0000 (UTC)

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 9e6937767 -> f21e7615a


fix failing testsuite

the username field in the login screen was not populated in some
cases.

PR: #702
PR-URL: https://github.com/apache/couchdb-fauxton/pull/702
Reviewed-By: garren smith <garren.smith@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/f21e7615
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/f21e7615
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/f21e7615

Branch: refs/heads/master
Commit: f21e7615a9c6662e23734897e001ff3a43d90a9c
Parents: 9e69377
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Thu Apr 14 13:53:32 2016 +0200
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Thu Apr 14 15:44:31 2016 +0200

----------------------------------------------------------------------
 app/addons/auth/components.react.jsx            | 30 +++++++++++---------
 .../custom-commands/auth/loginToGUI.js          | 12 ++++++--
 2 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f21e7615/app/addons/auth/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/auth/components.react.jsx b/app/addons/auth/components.react.jsx
index a90201c..fc9d29a 100644
--- a/app/addons/auth/components.react.jsx
+++ b/app/addons/auth/components.react.jsx
@@ -83,20 +83,22 @@ define([
 
     render: function () {
       return (
-        <div className="row-fluid">
-          <div className="span12">
-            <form id="login" onSubmit={this.submit}>
-              <p className="help-block">
-                Enter your username and password.
-              </p>
-              <input id="username" type="text" name="name" ref="username" placeholder="Username" size="24"
-                onChange={this.onInputChange} value={this.state.username} />
-              <br/>
-              <input id="password" type="password" name="password" ref="password" placeholder="Password" size="24"
-                onChange={this.onInputChange} value={this.state.password} />
-              <br/>
-              <button id="submit" className="btn btn-success" type="submit">Log In</button>
-            </form>
+        <div className="couch-login-wrapper">
+          <div className="row-fluid">
+            <div className="span12">
+              <form id="login" onSubmit={this.submit}>
+                <p className="help-block">
+                  Enter your username and password.
+                </p>
+                <input id="username" type="text" name="name" ref="username" placeholder="Username" size="24"
+                  onChange={this.onInputChange} value={this.state.username} />
+                <br/>
+                <input id="password" type="password" name="password" ref="password" placeholder="Password" size="24"
+                  onChange={this.onInputChange} value={this.state.password} />
+                <br/>
+                <button id="submit" className="btn btn-success" type="submit">Log In</button>
+              </form>
+            </div>
           </div>
         </div>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f21e7615/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/custom-commands/auth/loginToGUI.js b/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
index 317a5a4..ef67837 100644
--- a/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
+++ b/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
@@ -22,9 +22,15 @@ exports.command = function () {
     .url(baseUrl + '/#login')
     .waitForElementPresent('a[href="#login"]', waitTime, false)
     .click('a[href="#login"]')
-    .waitForElementPresent('#username', waitTime, false)
-    .setValue('#username', [username])
-    .setValue('#password', [password, client.Keys.ENTER])
+    .waitForElementVisible('.couch-login-wrapper', waitTime, false)
+    .waitForElementVisible('#username', waitTime, false)
+    .setValue('.couch-login-wrapper #username', [username])
+
+    .waitForElementVisible('#password', waitTime, false)
+    .setValue('.couch-login-wrapper #password', [password])
+
+    .clickWhenVisible('#submit')
+
     .closeNotification()
     .waitForElementPresent('#jump-to-db', waitTime, false)