You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2015/03/30 13:45:53 UTC
[1/4] fauxton commit: updated refs/heads/master to 592638a
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 7552f24e9 -> 592638a10
tests: run on 2.0 on CI
this makes it possible to test new 2.0 features like mango or and
all other changes related to the 2.0 release.
PR: #322
PR-URL: https://github.com/apache/couchdb-fauxton/pull/322
Reviewed-By: garren smith <ga...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/38544abe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/38544abe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/38544abe
Branch: refs/heads/master
Commit: 38544abe7df4bf042b0a79bdb74cf343c97469d8
Parents: 7552f24
Author: Robert Kowalski <ro...@apache.org>
Authored: Tue Mar 17 15:37:16 2015 +0100
Committer: Robert Kowalski <ro...@apache.org>
Committed: Mon Mar 30 13:45:41 2015 +0200
----------------------------------------------------------------------
.travis.yml | 42 ++++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/38544abe/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0bab741..ded39f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,39 @@
-language: node_js
-node_js:
- - '0.10'
+language: erlang
+otp_release:
+ - 17.4
git:
depth: 10
-services:
- - couchdb
+
addons:
firefox: "34.0"
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq flashplugin-installer
+ - sudo apt-get -y install libicu-dev libmozjs-dev pkg-config help2man libcurl4-openssl-dev
+ - sudo apt-get -y install libtool automake autoconf autoconf-archive
+ - sudo apt-get -y install haproxy
+
+ - nvm install 0.10 && nvm use 0.10
+
+ - cd ..
+ - git clone --depth=1 https://github.com/apache/couchdb
+ - cd couchdb
+ - ./configure
+ - make
+ - ./dev/run --admin=tester:testerpass &
+ - haproxy -f rel/haproxy.cfg &
+ - cd .. && cd couchdb-fauxton
+ - npm install
+
- export DISPLAY=:99.0
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1400x900x16"
- - HOST="http://127.0.0.1:5984"
- - curl -X PUT $HOST/_config/admins/tester -d '"testerpass"'
+
before_script:
- - npm install -g grunt-cli
- - grunt test
- - grunt dev &
- - sleep 10
+ - ./node_modules/grunt-cli/bin/grunt test
+ - ./node_modules/grunt-cli/bin/grunt dev &
+ - sleep 25
script:
- - grunt nightwatch
+ - ./node_modules/grunt-cli/bin/grunt nightwatch
notifications:
irc:
channels:
@@ -30,3 +43,8 @@ notifications:
skip_join: true
on_success: "never"
on_failure: "change"
+
+cache: apt
+
+git:
+ depth: 1
[4/4] fauxton commit: updated refs/heads/master to 592638a
Posted by ro...@apache.org.
tests: try to fix flaky test on CI
PR: #322
PR-URL: https://github.com/apache/couchdb-fauxton/pull/322
Reviewed-By: garren smith <ga...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/592638a1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/592638a1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/592638a1
Branch: refs/heads/master
Commit: 592638a108c0bfda94f84428a73cafd891bbb979
Parents: db20167
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Fri Mar 27 23:15:40 2015 +0100
Committer: Robert Kowalski <ro...@apache.org>
Committed: Mon Mar 30 13:45:53 2015 +0200
----------------------------------------------------------------------
app/addons/documents/tests/nightwatch/viewCreate.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/592638a1/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 6fde887..f1b1692 100644
--- a/app/addons/documents/tests/nightwatch/viewCreate.js
+++ b/app/addons/documents/tests/nightwatch/viewCreate.js
@@ -64,10 +64,10 @@ var tests = {
editor.getSession().setValue("function (doc) { emit(\'enteente\', 1); }");\
')
.execute('$(".save")[0].scrollIntoView();')
- .click('button.btn-success.save')
+ .clickWhenVisible('button.btn-success.save')
+ .waitForElementPresent('.prettyprint', waitTime, false)
.url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
- .waitForElementPresent('[data-target="#testdesigndoc"]', waitTime, false)
- .click('[data-target="#testdesigndoc"]')
+ .clickWhenVisible('[data-target="#testdesigndoc"]')
.clickWhenVisible('[data-target="#testdesigndocviews"]', waitTime, false)
.clickWhenVisible('#testdesigndoc_testnewview', waitTime, false)
.waitForElementPresent('.prettyprint', waitTime, false)
[3/4] fauxton commit: updated refs/heads/master to 592638a
Posted by ro...@apache.org.
tests: fix test for 2.0
PR: #322
PR-URL: https://github.com/apache/couchdb-fauxton/pull/322
Reviewed-By: garren smith <ga...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/db20167e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/db20167e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/db20167e
Branch: refs/heads/master
Commit: db20167e425b41a0370e54cf61cca7042268358d
Parents: 6bf2ebf
Author: Robert Kowalski <ro...@apache.org>
Authored: Fri Mar 27 19:25:22 2015 +0100
Committer: Robert Kowalski <ro...@apache.org>
Committed: Mon Mar 30 13:45:51 2015 +0200
----------------------------------------------------------------------
.../documents/tests/nightwatch/viewCreateBadView.js | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/db20167e/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 a4847c8..d89edc6 100644
--- a/app/addons/documents/tests/nightwatch/viewCreateBadView.js
+++ b/app/addons/documents/tests/nightwatch/viewCreateBadView.js
@@ -22,11 +22,7 @@ module.exports = {
client
.loginToGUI()
.populateDatabase(newDatabaseName)
- .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
- .waitForElementPresent(dropDownElement, waitTime, false)
- .click(dropDownElement + ' a')
- .click(dropDownElement + ' a[href*="new_view"]')
- .waitForElementPresent('.editor-wrapper', waitTime, false)
+ .url(baseUrl + '/#/database/' + newDatabaseName + '/new_view')
.setValue('#new-ddoc', 'test_design_doc-selenium-bad-reduce')
.clearValue('#index-name')
.setValue('#index-name', 'hasenindex')
@@ -39,7 +35,7 @@ module.exports = {
.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')
+ .assert.containsText('.alert-error', '_sum function requires that map values be numbers')
.end();
},
@@ -53,7 +49,7 @@ module.exports = {
.populateDatabase(newDatabaseName)
.url(baseUrl + '/#/database/' + newDatabaseName + '/_design/brokenview/_view/brokenview')
.waitForElementVisible('.alert-error', waitTime, false)
- .assert.containsText('.alert-error', 'builtin _sum function requires map values to be numbers or lists of numbers')
+ .assert.containsText('.alert-error', '_sum function requires that map values be numbers')
.end();
}
[2/4] fauxton commit: updated refs/heads/master to 592638a
Posted by ro...@apache.org.
tests: fix flaky tests
PR: #322
PR-URL: https://github.com/apache/couchdb-fauxton/pull/322
Reviewed-By: garren smith <ga...@gmail.com>
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 <ro...@apache.org>
Authored: Fri Mar 27 16:16:14 2015 +0100
Committer: Robert Kowalski <ro...@apache.org>
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')