This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git
The following commit(s) were added to refs/heads/master by this push:
new 33d52ca Use a more recent docker image (#908)
33d52ca is described below
commit 33d52cad9eb6bc85f8b602bb94597412c9504a23
Author: garren smith <[email protected]>
AuthorDate: Mon May 1 12:36:13 2017 +0200
Use a more recent docker image (#908)
This uses the docker image that is based off the new git repo
---
.../documents/tests/nightwatch/viewCreateBadView.js | 18 +++++++++++++-----
docker/dc.selenium.yml | 2 +-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/app/addons/documents/tests/nightwatch/viewCreateBadView.js
b/app/addons/documents/tests/nightwatch/viewCreateBadView.js
index 0cc2a6b..8f79e4e 100644
--- a/app/addons/documents/tests/nightwatch/viewCreateBadView.js
+++ b/app/addons/documents/tests/nightwatch/viewCreateBadView.js
@@ -16,7 +16,7 @@ module.exports = {
'Displays an error if reduce is not possible': function (client) {
/*jshint multistr: true */
- var waitTime = client.globals.maxWaitTime,
+ const waitTime = client.globals.maxWaitTime,
newDatabaseName = client.globals.testDatabaseName,
baseUrl = client.globals.test_settings.launch_url;
@@ -38,21 +38,29 @@ module.exports = {
')
.execute('$("#save-view")[0].scrollIntoView();')
.clickWhenVisible('#save-view')
- .waitForAttribute('#global-notifications', 'textContent', function
(docContents) {
+ .waitForElementNotPresent('.global-notification .fonticon-cancel',
waitTime, false)
+ .clickWhenVisible('.control-toggle-queryoptions', waitTime, false)
+ .clickWhenVisible('label[for="qoReduce"]', waitTime, false)
+ .clickWhenVisible('.query-options .btn-secondary', waitTime, false)
+ .waitForAttribute('.doc-item', 'textContent', function (docContents) {
return (/_sum function requires/).test(docContents);
})
.end();
},
'Visit url of broken view displays error': function (client) {
- var newDatabaseName = client.globals.testDatabaseName,
- baseUrl = client.globals.test_settings.launch_url;
+ const newDatabaseName = client.globals.testDatabaseName,
+ baseUrl = client.globals.test_settings.launch_url,
+ waitTime = client.globals.maxWaitTime;
client
.loginToGUI()
.populateDatabase(newDatabaseName)
.url(baseUrl + '/#/database/' + newDatabaseName +
'/_design/brokenview/_view/brokenview')
- .waitForAttribute('#global-notifications', 'textContent', function
(docContents) {
+ .clickWhenVisible('.control-toggle-queryoptions', waitTime, false)
+ .clickWhenVisible('label[for="qoReduce"]', waitTime, false)
+ .clickWhenVisible('.query-options .btn-secondary', waitTime, false)
+ .waitForAttribute('.doc-item', 'textContent', function (docContents) {
return (/_sum function requires/).test(docContents);
})
.end();
diff --git a/docker/dc.selenium.yml b/docker/dc.selenium.yml
index f65f284..bcac4a4 100644
--- a/docker/dc.selenium.yml
+++ b/docker/dc.selenium.yml
@@ -8,7 +8,7 @@ services:
couchdb:
container_name: couchdb
- image: klaemo/couchdb:2.0-dev
+ image: couchdbdev/debian-8-dev
command: '--with-haproxy -a tester:testerpass'
ports:
- "5984:5984"
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
