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/05/13 11:09:43 UTC

[1/2] fauxton commit: updated refs/heads/master to 2c9723a

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 <ro...@apache.org>
Authored: Wed May 13 10:48:08 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
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')


[2/2] fauxton commit: updated refs/heads/master to 2c9723a

Posted by ro...@apache.org.
Revert "DatabasePagination now supports passing custom URL prefix"

This reverts commit 860a808b49a1c536ee265a09ec573ace666630a6.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2c9723af
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2c9723af
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2c9723af

Branch: refs/heads/master
Commit: 2c9723af8cdafe414cefe7d4aa4493c306c9a8cf
Parents: 7f2c414
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed May 13 10:48:56 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Wed May 13 10:48:56 2015 +0200

----------------------------------------------------------------------
 app/addons/databases/components.react.jsx           |  9 +--------
 app/addons/databases/tests/componentsSpec.react.jsx | 15 ---------------
 2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2c9723af/app/addons/databases/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/databases/components.react.jsx b/app/addons/databases/components.react.jsx
index a40c74b..0bf290c 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -269,11 +269,6 @@ define([
   });
 
   var DatabasePagination = React.createClass({
-    getDefaultProps: function () {
-      return {
-        linkPath: '_all_dbs'
-      };
-    },
 
     getStoreState: function () {
       return {
@@ -301,12 +296,10 @@ define([
     render: function () {
       var page = this.state.page;
       var total = this.props.total || this.state.databaseNames.length;
-      var urlPrefix = '#/' + this.props.linkPath + '?page=';
-
       return (
         <footer className="all-db-footer pagination-footer">
           <div id="database-pagination">
-            <ComponentsReact.Pagination page={page} total={total} urlPrefix={urlPrefix} />
+            <ComponentsReact.Pagination page={page} total={total} urlPrefix="#/_all_dbs?page=" />
           </div>
         </footer>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2c9723af/app/addons/databases/tests/componentsSpec.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/componentsSpec.react.jsx b/app/addons/databases/tests/componentsSpec.react.jsx
index cebb194..5a790a4 100644
--- a/app/addons/databases/tests/componentsSpec.react.jsx
+++ b/app/addons/databases/tests/componentsSpec.react.jsx
@@ -186,20 +186,5 @@ define([
 
   });
 
-  describe('DatabasePagination', function () {
-    it ('uses custom URL prefix on the navigation if passed through props', function () {
-      var container = document.createElement('div');
-      var pagination = TestUtils.renderIntoDocument(<Views.DatabasePagination linkPath="_custom_path" />, container);
-
-      var links = $(pagination.getDOMNode()).find("a");
-      assert.equal(links.length, 3, "pagination contains links");
-
-      links.each(function () {
-        assert.include(this.href, '_custom_path', 'link contains custom path');
-      });
-    });
-
-  });
-
 });