Return-Path: <commits-return-27654-archive-asf-public=cust-asf.ponee.io@couchdb.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 32BAD200BD4
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu,  1 Dec 2016 17:07:39 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 316E6160B0B; Thu,  1 Dec 2016 16:07:39 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 7B67A160B05
	for <archive-asf-public@cust-asf.ponee.io>; Thu,  1 Dec 2016 17:07:38 +0100 (CET)
Received: (qmail 88487 invoked by uid 500); 1 Dec 2016 16:07:37 -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 88478 invoked by uid 99); 1 Dec 2016 16:07:37 -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, 01 Dec 2016 16:07:37 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 98094E0A77; Thu,  1 Dec 2016 16:07:37 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: garren@apache.org
To: commits@couchdb.apache.org
Message-Id: <b138f2d3da6641fa9a87675f731365cf@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: fauxton commit: updated refs/heads/master to 2cec2e4
Date: Thu,  1 Dec 2016 16:07:37 +0000 (UTC)
archived-at: Thu, 01 Dec 2016 16:07:39 -0000

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 045a08d0a -> 2cec2e4d9


Fix two small issues

Improce replication nw test
Remove decoding in apibar


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

Branch: refs/heads/master
Commit: 2cec2e4d975446080247c53ccc8d50c6b6fcbcba
Parents: 045a08d
Author: Garren Smith <garren.smith@gmail.com>
Authored: Thu Dec 1 16:41:15 2016 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Thu Dec 1 17:32:40 2016 +0200

----------------------------------------------------------------------
 app/addons/components/components/apibar.js                     | 2 +-
 app/addons/replication/tests/nightwatch/replicationactivity.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2cec2e4d/app/addons/components/components/apibar.js
----------------------------------------------------------------------
diff --git a/app/addons/components/components/apibar.js b/app/addons/components/components/apibar.js
index 6967852..0dbc5f2 100644
--- a/app/addons/components/components/apibar.js
+++ b/app/addons/components/components/apibar.js
@@ -56,7 +56,7 @@ export const APIBar = React.createClass({
     if (!this.props.contentVisible) {
       return null;
     }
-    let endpoint = FauxtonAPI.url.decode(this.props.endpoint);
+    const {endpoint} = this.props;
     return (
       <TrayContents className="tray show-tray api-bar-tray">
         <div className="input-prepend input-append">

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2cec2e4d/app/addons/replication/tests/nightwatch/replicationactivity.js
----------------------------------------------------------------------
diff --git a/app/addons/replication/tests/nightwatch/replicationactivity.js b/app/addons/replication/tests/nightwatch/replicationactivity.js
index 2bb9b59..22bfbee 100644
--- a/app/addons/replication/tests/nightwatch/replicationactivity.js
+++ b/app/addons/replication/tests/nightwatch/replicationactivity.js
@@ -88,6 +88,7 @@ module.exports = {
       .waitForElementNotPresent('.global-notification .fonticon-cancel', waitTime, false)
       .url(baseUrl + '/#replication')
       .waitForElementNotPresent('.load-lines', waitTime, true)
+      .waitForElementVisible('.replication__filter-input', waitTime, true)
       .setValue('.replication__filter-input', 'filter1')
       .waitForElementNotPresent('a[href="#/database/_replicator/existing-doc-filter2"]', waitTime, true)
       .clearValue('.replication__filter-input')