Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E9B3C17E17 for ; Mon, 30 Mar 2015 11:45:56 +0000 (UTC) Received: (qmail 23939 invoked by uid 500); 30 Mar 2015 11:45:53 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 23775 invoked by uid 500); 30 Mar 2015 11:45:53 -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 23626 invoked by uid 99); 30 Mar 2015 11:45: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; Mon, 30 Mar 2015 11:45:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78A25E0B3B; Mon, 30 Mar 2015 11:45:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Mon, 30 Mar 2015 11:45:54 -0000 Message-Id: In-Reply-To: <2fbef78344654fdb9fa5b1a15a593cc4@git.apache.org> References: <2fbef78344654fdb9fa5b1a15a593cc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] fauxton commit: updated refs/heads/master to 592638a tests: fix flaky tests PR: #322 PR-URL: https://github.com/apache/couchdb-fauxton/pull/322 Reviewed-By: garren smith Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6bf2ebf6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6bf2ebf6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6bf2ebf6 Branch: refs/heads/master Commit: 6bf2ebf62166485745690a07c2797ece9c25f553 Parents: 38544ab Author: Robert Kowalski Authored: Fri Mar 27 16:16:14 2015 +0100 Committer: Robert Kowalski Committed: Mon Mar 30 13:45:48 2015 +0200 ---------------------------------------------------------------------- app/addons/documents/tests/nightwatch/viewCreate.js | 1 + app/addons/documents/tests/nightwatch/viewCreateBadView.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6bf2ebf6/app/addons/documents/tests/nightwatch/viewCreate.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/tests/nightwatch/viewCreate.js b/app/addons/documents/tests/nightwatch/viewCreate.js index 8857af0..6fde887 100644 --- a/app/addons/documents/tests/nightwatch/viewCreate.js +++ b/app/addons/documents/tests/nightwatch/viewCreate.js @@ -28,6 +28,7 @@ var tests = { var editor = ace.edit("map-function");\ editor.getSession().setValue("function (doc) { emit(\'hasehase\'); }");\ ') + .execute('$(".save")[0].scrollIntoView();') .click('button.btn.btn-success.save') .waitForElementPresent('.prettyprint', waitTime, false) .assert.containsText('.prettyprint', 'hasehase') http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6bf2ebf6/app/addons/documents/tests/nightwatch/viewCreateBadView.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/tests/nightwatch/viewCreateBadView.js b/app/addons/documents/tests/nightwatch/viewCreateBadView.js index 9fda24d..a4847c8 100644 --- a/app/addons/documents/tests/nightwatch/viewCreateBadView.js +++ b/app/addons/documents/tests/nightwatch/viewCreateBadView.js @@ -12,7 +12,7 @@ module.exports = { - 'Edits a design doc - set new index name': function (client) { + 'Displays an error if reduce is not possible': function (client) { /*jshint multistr: true */ var waitTime = 10000, newDatabaseName = client.globals.testDatabaseName, @@ -36,6 +36,7 @@ module.exports = { ') .click('#reduce-function-selector') .keys(['\uE013', '\uE013', '\uE013', '\uE013', '\uE006']) + .execute('$(".save")[0].scrollIntoView();') .click('button.btn-success.save') .waitForElementVisible('.alert-error', waitTime, false) .assert.containsText('.alert-error', 'builtin _sum function requires map values to be numbers or lists of numbers')