You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2016/07/12 17:25:21 UTC
[6/7] fauxton commit: updated refs/heads/master to ced196a
remove blacklist tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e1e59475
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e1e59475
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e1e59475
Branch: refs/heads/master
Commit: e1e59475ddb2d3d615aa9869b3aea3203be6a981
Parents: 99802f3
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jul 12 16:38:19 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Jul 12 19:24:44 2016 +0200
----------------------------------------------------------------------
.../databases/tests/nightwatch/zeroclipboard.js | 47 --------------------
.../tests/nightwatch/navigateToNewView.js | 36 ---------------
.../tests/nightwatch/uploadAttachment.js | 39 ----------------
settings.json.default.json | 11 +----
4 files changed, 1 insertion(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e1e59475/app/addons/databases/tests/nightwatch/zeroclipboard.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/zeroclipboard.js b/app/addons/databases/tests/nightwatch/zeroclipboard.js
deleted file mode 100644
index 7970851..0000000
--- a/app/addons/databases/tests/nightwatch/zeroclipboard.js
+++ /dev/null
@@ -1,47 +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 os = require('os');
-
-module.exports = {
- 'ZeroClipboard copies' : function (client) {
- var waitTime = client.globals.maxWaitTime,
- newDatabaseName = client.globals.testDatabaseName,
- baseUrl = client.globals.test_settings.launch_url;
-
- var controlOrCommandKey = client.Keys.CONTROL;
- if (os.type() === 'Darwin') {
- controlOrCommandKey = client.Keys.COMMAND;
- }
-
- client
- .deleteDatabase(newDatabaseName)
- .loginToGUI()
- .url(baseUrl)
- .clickWhenVisible('.control-toggle-api-url')
- .pause(1000) // needed for reliability. The tray slides in from the top so the pos of the copy button changes
- .waitForElementVisible('.copy-button', waitTime, false)
- .moveToElement('.copy-button', 10, 10)
- .mouseButtonDown('left')
- .mouseButtonUp('left')
- .closeNotification()
- .clickWhenVisible('.search-autocomplete', waitTime, false)
- .setValue('.search-autocomplete', '')
- .pause(1)
- .keys([controlOrCommandKey, 'v'])
- .assert.value('.search-autocomplete', 'http://localhost:8000/_all_dbs')
-
- .end();
- }
-};
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e1e59475/app/addons/documents/tests/nightwatch/navigateToNewView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/navigateToNewView.js b/app/addons/documents/tests/nightwatch/navigateToNewView.js
deleted file mode 100644
index 813e4a6..0000000
--- a/app/addons/documents/tests/nightwatch/navigateToNewView.js
+++ /dev/null
@@ -1,36 +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.
-
-
-
-module.exports = {
-
- // this tests that the user is able to just navigate to and from the New View page without errors [it confirms
- // a bug fix for where the Ace Editor threw a JS error preventing the subsequent page from loading]
- 'Navigate to and from New View Page' : function (client) {
- var waitTime = client.globals.maxWaitTime,
- newDatabaseName = client.globals.testDatabaseName,
- baseUrl = client.globals.test_settings.launch_url;
-
- client
- .loginToGUI()
- .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
- .clickWhenVisible('#new-all-docs-button a')
- .clickWhenVisible('#new-all-docs-button a[href="#/database/' + newDatabaseName + '/new_view"]')
- .waitForElementPresent('.define-view', waitTime, false)
- .verify.urlEquals(baseUrl + '/#/database/' + newDatabaseName + '/new_view')
-
- // now redirect back to the database page and check it's loaded properly
- .clickWhenVisible('#nav-links a[href="#/_all_dbs"]')
- .waitForElementPresent('#dashboard-content .databases', waitTime, false);
- }
-};
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e1e59475/app/addons/documents/tests/nightwatch/uploadAttachment.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/uploadAttachment.js b/app/addons/documents/tests/nightwatch/uploadAttachment.js
deleted file mode 100644
index 3bc3ba4..0000000
--- a/app/addons/documents/tests/nightwatch/uploadAttachment.js
+++ /dev/null
@@ -1,39 +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.
-
-// add to ignore list for now since selenium is running in its own container
-// we cannot link to the file
-module.exports = {
- 'Uploading an attachment works': function (client) {
- /*jshint multistr: true */
- /*globals __dirname */
- var waitTime = client.globals.maxWaitTime,
- newDatabaseName = client.globals.testDatabaseName,
- baseUrl = client.globals.test_settings.launch_url;
-
- client
- .loginToGUI()
- .createDatabase(newDatabaseName)
- .createDocument('my_doc', newDatabaseName)
- .url(baseUrl + '/#/database/' + newDatabaseName + '/my_doc')
- .clickWhenVisible('.panel-button.upload')
- .waitForElementVisible('input[name="_attachments"]', waitTime)
- .setValue('input[name="_attachments"]', require('path').resolve(__dirname + '/uploadAttachment.js'))
- .clickWhenVisible('#upload-btn')
- .waitForElementVisible('.global-notification', waitTime, false)
- .getText('.global-notification', function (result) {
- var data = result.value;
- this.verify.ok(data, 'Document saved successfully.');
- })
- .end();
- }
-};
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e1e59475/settings.json.default.json
----------------------------------------------------------------------
diff --git a/settings.json.default.json b/settings.json.default.json
index a484d35..510f7f2 100644
--- a/settings.json.default.json
+++ b/settings.json.default.json
@@ -81,15 +81,6 @@
"db_port": "5984",
"custom_commands_path": ["test/nightwatch_tests/custom-commands", "test/nightwatch_tests/custom-commands/auth"],
"globals_path": "test/nightwatch_tests/helpers/helpers.js",
- "selenium_port": "4444",
- "testBlacklist": {
- "databases": [
- "zeroclipboard.js"
- ],
- "documents": [
- "uploadAttachment.js",
- "navigateToNewView.js"
- ]
- }
+ "selenium_port": "4444"
}
}