Return-Path: 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 4837C200B89 for ; Wed, 21 Sep 2016 17:18:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 47279160AE8; Wed, 21 Sep 2016 15:18:56 +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 516A2160AEC for ; Wed, 21 Sep 2016 17:18:55 +0200 (CEST) Received: (qmail 87103 invoked by uid 500); 21 Sep 2016 15:18:54 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 85605 invoked by uid 99); 21 Sep 2016 15:18:53 -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; Wed, 21 Sep 2016 15:18:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2AFE9E056F; Wed, 21 Sep 2016 15:18:53 +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 Date: Wed, 21 Sep 2016 15:19:13 -0000 Message-Id: <7dff354d6e164b66b7e63d74b6ca4f21@git.apache.org> In-Reply-To: <110d4ab9069244b3896f97c915df459f@git.apache.org> References: <110d4ab9069244b3896f97c915df459f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/29] fauxton commit: updated refs/heads/new-replication to b0541e1 archived-at: Wed, 21 Sep 2016 15:18:56 -0000 more Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9bfc114d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9bfc114d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9bfc114d Branch: refs/heads/new-replication Commit: 9bfc114d6489835654b958e439f1a68663910c3b Parents: 56fba52 Author: Ben Keen Authored: Sun Aug 14 16:36:59 2016 -0700 Committer: Garren Smith Committed: Wed Sep 14 17:22:30 2016 +0200 ---------------------------------------------------------------------- .travis.yml | 2 +- app/addons/replication/tests/nightwatch/replication.js | 9 +-------- test/nightwatch_tests/custom-commands/helper.js | 4 ++++ 3 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9bfc114d/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index e9677d3..3b98a45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_script: - DIST=./dist/debug ./bin/fauxton & - sleep 30 script: - - ./node_modules/grunt-cli/bin/grunt nightwatch + - ./node_modules/grunt-cli/bin/grunt nightwatch --file=replication after_script: - npm run docker:down http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9bfc114d/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 a2f1d14..e7ef682 100644 --- a/app/addons/replication/tests/nightwatch/replication.js +++ b/app/addons/replication/tests/nightwatch/replication.js @@ -73,14 +73,7 @@ module.exports = { .checkForDatabaseCreated(replicatedDBName, longWaitTime) // lastly, check the doc was replicated as well - .url(baseUrl + '/' + newDatabaseName1 + '/' + docName1) - .waitForElementVisible('html', waitTime, false) - .getText('html', function (result) { - const data = result.value, - createdDocIsPresent = data.indexOf(docName1); - - this.verify.ok(createdDocIsPresent > 0, 'Checking doc exists.'); - }) + .checkForDocumentCreated(docName1, longWaitTime, replicatedDBName) .end(); }, http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9bfc114d/test/nightwatch_tests/custom-commands/helper.js ---------------------------------------------------------------------- diff --git a/test/nightwatch_tests/custom-commands/helper.js b/test/nightwatch_tests/custom-commands/helper.js index ead5ea0..e9ce835 100644 --- a/test/nightwatch_tests/custom-commands/helper.js +++ b/test/nightwatch_tests/custom-commands/helper.js @@ -30,6 +30,10 @@ exports.checkForDatabaseCreated = function checkForDatabaseCreated (couchUrl, da const intervalId = setInterval(() => { request(couchUrl + '/_all_dbs', function (er, res, body) { if (body) { + console.log('list of databases:'); + console.log(body); + console.log("_______________________"); + const reg = new RegExp('"' + databaseName + '"', 'g'); if (reg.test(body)) { clearTimeout(timeOutId);