Repository: couchdb-fauxton Updated Branches: refs/heads/master 21254ad12 -> 2c9723af8
Revert "Improvement to nightwatch tests" This reverts commit 21254ad12a1baf2f2733355e796d3778a3c3fa99. Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7f2c414f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7f2c414f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7f2c414f Branch: refs/heads/master Commit: 7f2c414fad9108a742c59aa3e1e1c438105079b1 Parents: 21254ad Author: Robert Kowalski <[email protected]> Authored: Wed May 13 10:48:08 2015 +0200 Committer: Robert Kowalski <[email protected]> Committed: Wed May 13 10:48:08 2015 +0200 ---------------------------------------------------------------------- .../tests/nightwatch/deletesDatabaseSpecialChars.js | 6 +++--- .../databases/tests/nightwatch/switchDatabase.js | 3 --- .../tests/nightwatch/deleteDatabaseModal.js | 16 ++++++++-------- .../documents/tests/nightwatch/viewSaveManyTimes.js | 1 - 4 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7f2c414f/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js ---------------------------------------------------------------------- diff --git a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js index b78bcd2..0ff4feb 100644 --- a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js +++ b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js @@ -21,11 +21,11 @@ module.exports = { .loginToGUI() .url(baseUrl + '/#/database/' + encodeURIComponent(newDatabaseName) + '/_all_docs') .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog', waitTime, false) - .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime, false) + .click("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog") .waitForElementPresent('#header-dropdown-menu .fonticon-trash', waitTime, false) - .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false) + .click('#header-dropdown-menu .fonticon-trash') .waitForElementVisible('#db_name', waitTime, false) - .clickWhenVisible('#db_name', waitTime, false) + .click('#db_name') .setValue('input#db_name', [newDatabaseName, client.Keys.ENTER] ) .waitForElementVisible('#global-notifications .alert.alert-info', waitTime, false) .url(baseUrl + '/_all_dbs') http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7f2c414f/app/addons/databases/tests/nightwatch/switchDatabase.js ---------------------------------------------------------------------- diff --git a/app/addons/databases/tests/nightwatch/switchDatabase.js b/app/addons/databases/tests/nightwatch/switchDatabase.js index 79f2e7c..137bb92 100644 --- a/app/addons/databases/tests/nightwatch/switchDatabase.js +++ b/app/addons/databases/tests/nightwatch/switchDatabase.js @@ -20,9 +20,6 @@ module.exports = { // wait for the DB name typeahead field to appear in the header .waitForElementPresent('#jump-to-db .search-autocomplete', waitTime, false) - - // wait for DBs to show up - .waitForElementPresent('a[href="#/database/' + newDatabaseName + '/_all_docs"]', waitTime, false) .setValue('#jump-to-db .search-autocomplete', [newDatabaseName, client.Keys.ENTER]) .waitForElementPresent('.index-pagination', waitTime, false) http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7f2c414f/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js index 935b2c4..973e455 100644 --- a/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js +++ b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js @@ -18,10 +18,10 @@ module.exports = { client .loginToGUI() .url(baseUrl + '/#/database/_replicator/_all_docs') - .waitForElementPresent("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime, false) - .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime, false) - .waitForElementPresent("#header-dropdown-menu .fonticon-trash", waitTime, false) - .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false) + .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog', waitTime, false) + .click("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog") + .waitForElementPresent('#header-dropdown-menu .fonticon-trash', waitTime, false) + .click('#header-dropdown-menu .fonticon-trash') .waitForElementVisible('#db_name', waitTime, false) .assert.elementPresent('.warning') .end(); @@ -35,10 +35,10 @@ module.exports = { client .loginToGUI() .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs') - .waitForElementPresent("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime, false) - .clickWhenVisible('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog', waitTime, false) - .waitForElementPresent("#header-dropdown-menu .fonticon-trash", waitTime, false) - .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false) + .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog', waitTime, false) + .click("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog") + .waitForElementPresent('#header-dropdown-menu .fonticon-trash', waitTime, false) + .click('#header-dropdown-menu .fonticon-trash') .waitForElementVisible('#db_name', waitTime, false) .assert.elementNotPresent('.warning') .end(); http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7f2c414f/app/addons/documents/tests/nightwatch/viewSaveManyTimes.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/tests/nightwatch/viewSaveManyTimes.js b/app/addons/documents/tests/nightwatch/viewSaveManyTimes.js index aad9409..6f6570d 100644 --- a/app/addons/documents/tests/nightwatch/viewSaveManyTimes.js +++ b/app/addons/documents/tests/nightwatch/viewSaveManyTimes.js @@ -27,7 +27,6 @@ module.exports = { .click(dropDownElement + ' a') .click(dropDownElement + ' a[href*="new_view"]') .waitForElementPresent('.editor-wrapper', waitTime, false) - .waitForElementPresent('#new-ddoc', waitTime, false) .setValue('#new-ddoc', 'test_design_doc-save-many-times') .clearValue('#index-name') .setValue('#index-name', 'multiple-saves')
