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/08/11 18:17:59 UTC
[1/2] fauxton commit: updated refs/heads/master to 438dd32
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master d8c28d98f -> 438dd32f1
csrf: remove mismatch test
PR: #496
PR-URL: https://github.com/apache/couchdb-fauxton/pull/496
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/438dd32f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/438dd32f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/438dd32f
Branch: refs/heads/master
Commit: 438dd32f171b52c19880d9688761a7f162ffc55e
Parents: 747f3fc
Author: Robert Kowalski <ro...@apache.org>
Authored: Tue Aug 11 15:51:43 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Aug 11 18:17:50 2015 +0200
----------------------------------------------------------------------
app/addons/databases/tests/nightwatch/csrf.js | 59 ----------------------
1 file changed, 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/438dd32f/app/addons/databases/tests/nightwatch/csrf.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/csrf.js b/app/addons/databases/tests/nightwatch/csrf.js
deleted file mode 100644
index d83cd77..0000000
--- a/app/addons/databases/tests/nightwatch/csrf.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy of
-// the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-
-var newDatabaseName = 'fauxton-selenium-tests-db-create';
-var helpers = require('../../../../../test/nightwatch_tests/helpers/helpers.js');
-module.exports = {
-
- before: function (client, done) {
- var nano = helpers.getNanoInstance();
- nano.db.destroy(newDatabaseName, function (err, body, header) {
- done();
- });
- },
-
- after: function (client, done) {
- var nano = helpers.getNanoInstance();
- nano.db.destroy(newDatabaseName, function (err, body, header) {
- done();
- });
- },
-
- 'Creates a Database' : function (client) {
- var waitTime = client.globals.maxWaitTime,
- baseUrl = client.globals.test_settings.launch_url;
-
- client
- .loginToGUI()
- .checkForDatabaseDeleted(newDatabaseName, waitTime)
- .url(baseUrl)
-
- // ensure the page has fully loaded
- .waitForElementPresent('.databases.table', waitTime, false)
- .waitForElementPresent('#add-new-database', waitTime, false)
- .clickWhenVisible('#add-new-database', waitTime, false)
- .waitForElementVisible('#js-new-database-name', waitTime, false)
- .setValue('#js-new-database-name', [newDatabaseName])
- .clickWhenVisible('#js-create-database', waitTime, false)
- .checkForDatabaseCreated(newDatabaseName, waitTime)
- .url(baseUrl + '/_all_dbs')
- .waitForElementVisible('html', waitTime, false)
- .getText('html', function (result) {
- var data = result.value,
- createdDatabaseIsPresent = data.indexOf('mismatch');
-
- this.verify.ok(createdDatabaseIsPresent !== -1,
- 'CSRF token mismatch');
- })
- .end();
- }
-};
[2/2] fauxton commit: updated refs/heads/master to 438dd32
Posted by ro...@apache.org.
Revert "csrf: fix tests"
This reverts commit 4f0e092a214e11b0460b2bc9dad668b5d2614d12.
PR: #496
PR-URL: https://github.com/apache/couchdb-fauxton/pull/496
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/747f3fc3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/747f3fc3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/747f3fc3
Branch: refs/heads/master
Commit: 747f3fc35e29d097d2580b9d0103ef230754ce64
Parents: d8c28d9
Author: Robert Kowalski <ro...@apache.org>
Authored: Tue Aug 11 15:49:36 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Aug 11 18:17:50 2015 +0200
----------------------------------------------------------------------
app/addons/databases/tests/nightwatch/createsDatabase.js | 2 +-
app/addons/documents/tests/nightwatch/createsDocument.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/747f3fc3/app/addons/databases/tests/nightwatch/createsDatabase.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/createsDatabase.js b/app/addons/databases/tests/nightwatch/createsDatabase.js
index 97f7428..4f6b1ee 100644
--- a/app/addons/databases/tests/nightwatch/createsDatabase.js
+++ b/app/addons/databases/tests/nightwatch/createsDatabase.js
@@ -45,7 +45,7 @@ module.exports = {
.setValue('#js-new-database-name', [newDatabaseName])
.clickWhenVisible('#js-create-database', waitTime, false)
.checkForDatabaseCreated(newDatabaseName, waitTime)
- .url(baseUrl + '/#/_all_dbs')
+ .url(baseUrl + '/_all_dbs')
.waitForElementVisible('html', waitTime, false)
.getText('html', function (result) {
var data = result.value,
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/747f3fc3/app/addons/documents/tests/nightwatch/createsDocument.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/createsDocument.js b/app/addons/documents/tests/nightwatch/createsDocument.js
index 742a6b0..e16de06 100644
--- a/app/addons/documents/tests/nightwatch/createsDocument.js
+++ b/app/addons/documents/tests/nightwatch/createsDocument.js
@@ -34,7 +34,7 @@ module.exports = {
')
.clickWhenVisible('#doc-editor-actions-panel .save-doc')
.checkForDocumentCreated(newDocumentName)
- .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
+ .url(baseUrl + '/' + newDatabaseName + '/_all_docs')
.waitForElementPresent('body', waitTime, false)
.getText('body', function (result) {
var data = result.value,