couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [17/29] fauxton commit: updated refs/heads/new-replication to b0541e1
Date Wed, 21 Sep 2016 15:19:08 GMT
fix nightwatch tests


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

Branch: refs/heads/new-replication
Commit: 14114d558f82d21946d331aa24800efb0758aea9
Parents: 597fd8c
Author: Garren Smith <garren.smith@gmail.com>
Authored: Wed Sep 14 15:37:49 2016 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Wed Sep 14 17:22:30 2016 +0200

----------------------------------------------------------------------
 app/addons/replication/components/target.js      |  4 ++--
 .../replication/tests/nightwatch/replication.js  | 19 ++++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/14114d55/app/addons/replication/components/target.js
----------------------------------------------------------------------
diff --git a/app/addons/replication/components/target.js b/app/addons/replication/components/target.js
index 9364d7a..f4c7c30 100644
--- a/app/addons/replication/components/target.js
+++ b/app/addons/replication/components/target.js
@@ -36,7 +36,7 @@ const ReplicationTargetSelect = ({value, onChange}) => {
       <div className="replication-input-label">
         Replication Target:
       </div>
-      <div className="replication-input-select">
+      <div id="replication-target" className="replication-input-select">
         <StyledSelect
           selectContent={replicationTargetSourceOptions()}
           selectChange={(e) => onChange(e.target.value)}
@@ -75,7 +75,7 @@ RemoteTargetReplicationRow.propTypes = {
 const ExistingLocalTargetReplicationRow = ({onChange, value, databases}) => {
   const options = databases.map(db => ({value: db, label: db}));
   return (
-    <div className="replication-input-react-select">
+    <div id="replication-target-local" className="replication-input-react-select">
       <ReactSelect
         value={value}
         options={options}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/14114d55/app/addons/replication/tests/nightwatch/replication.js
----------------------------------------------------------------------
diff --git a/app/addons/replication/tests/nightwatch/replication.js b/app/addons/replication/tests/nightwatch/replication.js
index 708b96f..ebb02b5 100644
--- a/app/addons/replication/tests/nightwatch/replication.js
+++ b/app/addons/replication/tests/nightwatch/replication.js
@@ -52,15 +52,15 @@ module.exports = {
       // select LOCAL as the source
       .click('#replication-source')
       .keys(['\uE015', '\uE006'])
-      .waitForElementPresent('.replication-source-name-row', waitTime, true)
+      .waitForElementPresent('.replication-input-react-select', waitTime, true)
 
       // enter our source DB
-      .setValue('.replication-source-name-row .Select-input input', [newDatabaseName1, client.Keys.ENTER])
+      .setValue('.replication-input-react-select .Select-input input', [newDatabaseName1,
client.Keys.ENTER])
 
       // enter a new target name
       .waitForElementPresent('#replication-target', waitTime, true)
       .click('option[value="REPLICATION_TARGET_NEW_LOCAL_DATABASE"]')
-      .setValue('.new-local-db', replicatedDBName)
+      .setValue('.replication-new-input', replicatedDBName)
 
       .click('#replicate')
 
@@ -73,9 +73,6 @@ module.exports = {
       // now check the database was created
       .checkForDatabaseCreated(replicatedDBName, waitTime)
 
-      // lastly, check the doc was replicated as well
-      //I don't think we can do this. It could take some time before its replicated
-      //.checkForDocumentCreated(docName1, waitTime, replicatedDBName)
       .end();
   },
 
@@ -104,13 +101,13 @@ module.exports = {
       // select the LOCAL db as the source
       .click('#replication-source')
       .keys(['\uE015', '\uE006'])
-      .waitForElementPresent('.replication-source-name-row', waitTime, true)
-      .setValue('.replication-source-name-row .Select-input input', [newDatabaseName1, client.Keys.ENTER])
+      .waitForElementPresent('.replication-input-react-select', waitTime, true)
+      .setValue('.replication-input-react-select .Select-input input', [newDatabaseName1,
client.Keys.ENTER])
 
       // select existing local as the target
       .waitForElementPresent('#replication-target', waitTime, true)
       .click('#replication-target option[value="REPLICATION_TARGET_EXISTING_LOCAL_DATABASE"]')
-      .setValue('.replication-target-name-row .Select-input input', [newDatabaseName2, client.Keys.ENTER])
+      .setValue('#replication-target-local .Select-input input', [newDatabaseName2, client.Keys.ENTER])
 
       .getAttribute('#replicate', 'disabled', function (result) {
         // confirm it's not disabled
@@ -121,10 +118,6 @@ module.exports = {
       .waitForElementPresent('.enter-password-modal', waitTime, true)
       .setValue('.enter-password-modal input[type="password"]', password)
       .click('.enter-password-modal button.save')
-
-      // now check the target database contains the doc from the original db
-      //I don't think we can do this. It could take some time before its replicated
-      //.checkForDocumentCreated(docName1, waitTime, newDatabaseName2)
       .end();
   }
 };


Mime
View raw message