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.sm...@gmail.com>
Authored: Thu Dec 1 16:41:15 2016 +0200
Committer: Garren Smith <garren.sm...@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')

Reply via email to