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 3C9C0200C13 for ; Mon, 6 Feb 2017 17:06:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 378F0160B53; Mon, 6 Feb 2017 16:06:29 +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 82B77160B49 for ; Mon, 6 Feb 2017 17:06:28 +0100 (CET) Received: (qmail 10987 invoked by uid 500); 6 Feb 2017 16:06:27 -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 10972 invoked by uid 99); 6 Feb 2017 16:06:23 -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; Mon, 06 Feb 2017 16:06:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87BF5DFBE6; Mon, 6 Feb 2017 16:06:23 +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: <0cee18d71a1a4882bf65e46bef61e2d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: fauxton commit: updated refs/heads/master to 1471208 Date: Mon, 6 Feb 2017 16:06:23 +0000 (UTC) archived-at: Mon, 06 Feb 2017 16:06:29 -0000 Repository: couchdb-fauxton Updated Branches: refs/heads/master a88bad950 -> 14712080f Make db names more random Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/14712080 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/14712080 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/14712080 Branch: refs/heads/master Commit: 14712080f75c8ce42148b97557850e98f9d13dba Parents: a88bad9 Author: Garren Smith Authored: Mon Feb 6 17:10:18 2017 +0200 Committer: Garren Smith Committed: Mon Feb 6 17:11:12 2017 +0200 ---------------------------------------------------------------------- .../documents/tests/nightwatch/encodingSupport.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/14712080/app/addons/documents/tests/nightwatch/encodingSupport.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/tests/nightwatch/encodingSupport.js b/app/addons/documents/tests/nightwatch/encodingSupport.js index 8d92b43..5c00cfb 100644 --- a/app/addons/documents/tests/nightwatch/encodingSupport.js +++ b/app/addons/documents/tests/nightwatch/encodingSupport.js @@ -10,12 +10,10 @@ // License for the specific language governing permissions and limitations under // the License. - - module.exports = { 'mango supports encoding': function (client) { var waitTime = client.globals.maxWaitTime, - newDatabaseName = 'encoded/db', + newDatabaseName = 'encoded/db-' + client.globals.testDatabaseName, baseUrl = client.globals.test_settings.launch_url; client @@ -32,7 +30,7 @@ module.exports = { 'permissions supports encoding': function (client) { var waitTime = client.globals.maxWaitTime, - newDatabaseName = 'encoded/db', + newDatabaseName = 'encoded/db-' + client.globals.testDatabaseName, baseUrl = client.globals.test_settings.launch_url; client @@ -49,7 +47,7 @@ module.exports = { 'changes supports encoding': function (client) { var waitTime = client.globals.maxWaitTime, - newDatabaseName = 'encoded/db', + newDatabaseName = 'encoded/db-' + client.globals.testDatabaseName, baseUrl = client.globals.test_settings.launch_url; client @@ -65,7 +63,7 @@ module.exports = { }, 'views support encoding': function (client) { var waitTime = client.globals.maxWaitTime, - newDatabaseName = 'encoded/db', + newDatabaseName = 'encoded/db-' + client.globals.testDatabaseName, baseUrl = client.globals.test_settings.launch_url; client @@ -76,10 +74,11 @@ module.exports = { .url(baseUrl + '/#/database/' + encodeURIComponent(newDatabaseName) + '/_all_docs') .waitForElementPresent('.bulk-action-component-panel', waitTime, true) .clickWhenVisible('#nav-header-testdesigndoc', waitTime, true) - .clickWhenVisible('a[href="#/database/encoded%2Fdb/_design/testdesigndoc/_info"]', waitTime, true) + .clickWhenVisible('a[href="#/database/' + encodeURIComponent(newDatabaseName) + '/_design/testdesigndoc/_info"]', waitTime, true) .waitForElementPresent('.metadata-page', waitTime, true) .clickWhenVisible('#nav-design-function-testdesigndocviews', waitTime, true) .clickWhenVisible('#testdesigndoc_stubview', waitTime, true) + .waitForElementNotPresent('.loading-lines', waitTime, true) .waitForElementPresent('#doc-list', waitTime, true) .clickWhenVisible('.active .index-menu-toggle', waitTime, true) .clickWhenVisible('.fonticon-file-code-o')