You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2015/10/21 20:09:53 UTC

[1/5] fauxton commit: updated refs/heads/master to b7dd66c

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master b76355f30 -> b7dd66cea


fix tests

integration tests were disabled accidentally this week


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

Branch: refs/heads/master
Commit: 8c268754aad3b3697b840cb8d1a95130e177d886
Parents: b76355f
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Oct 21 18:53:56 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Wed Oct 21 18:53:56 2015 +0200

----------------------------------------------------------------------
 app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js | 4 ++--
 app/addons/documents/tests/nightwatch/mangoIndex.js           | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8c268754/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
index f72beb7..ddb6b5f 100644
--- a/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
+++ b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
@@ -30,8 +30,8 @@ module.exports = {
       .click('#dashboard-content a[href="#/database/' + newDatabaseName + '/_all_docs"]')
 
       //this opens the alternative header
-      .clickWhenVisible('label[for="checkbox-' + newDocumentName + '"]', waitTime, false)
-      .clickWhenVisible('.control-delete', waitTime, false)
+      .clickWhenVisible('.bulk-action-component-panel input[type="checkbox"]')
+      .clickWhenVisible('.bulk-action-component-selector-group button.fonticon-trash', waitTime, false)
       .acceptAlert()
       .waitForElementVisible('#global-notifications .alert.alert-info', waitTime, false)
       .clickWhenVisible('#nav-links a[href="#/_all_dbs"]')

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8c268754/app/addons/documents/tests/nightwatch/mangoIndex.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/mangoIndex.js b/app/addons/documents/tests/nightwatch/mangoIndex.js
index dce4cb9..8c54d09 100644
--- a/app/addons/documents/tests/nightwatch/mangoIndex.js
+++ b/app/addons/documents/tests/nightwatch/mangoIndex.js
@@ -54,12 +54,9 @@ module.exports = {
       .populateDatabase(newDatabaseName)
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_index')
-      .waitForElementPresent('.control-toggle-alternative-header', waitTime, false)
-      .clickWhenVisible('.control-toggle-alternative-header')
       .assert.containsText('#dashboard-lower-content', 'ente_ente_mango_ananas')
-      .waitForElementPresent('.control-select-all', waitTime, false)
-      .clickWhenVisible('.control-select-all')
-      .clickWhenVisible('.control-delete')
+      .clickWhenVisible('.bulk-action-component-panel input[type="checkbox"]')
+      .clickWhenVisible('.bulk-action-component-selector-group button.fonticon-trash', waitTime, false)
       .acceptAlert()
 
       .checkForStringNotPresent(newDatabaseName + '/_index', '"name":"rocko-artischocko"')


[4/5] fauxton commit: updated refs/heads/master to b7dd66c

Posted by be...@apache.org.
remove dead css


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

Branch: refs/heads/master
Commit: 8032b1d252fe6aede01ddfe03eb0f6a763198fc5
Parents: cdd984d
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Oct 21 19:05:13 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Wed Oct 21 19:05:13 2015 +0200

----------------------------------------------------------------------
 .../components/assets/less/bulk-selector.less   | 25 --------------------
 1 file changed, 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8032b1d2/app/addons/components/assets/less/bulk-selector.less
----------------------------------------------------------------------
diff --git a/app/addons/components/assets/less/bulk-selector.less b/app/addons/components/assets/less/bulk-selector.less
index b1cd405..193a271 100644
--- a/app/addons/components/assets/less/bulk-selector.less
+++ b/app/addons/components/assets/less/bulk-selector.less
@@ -87,10 +87,6 @@
     height: 15px;
   }
 
-  .bulk-actions {
-    height: 27px;
-  }
-
   .bulk-action-component-selector-group {
 
     .fonticon {
@@ -120,25 +116,4 @@
       }
     }
   }
-
-  .bulk-actions {
-    margin-left: 10px;
-    width: 29px;
-
-    float: left;
-
-    .fonticon {
-      font-size: 11px;
-      border: 0;
-      background-color: transparent;
-      padding: 2px;
-      width: 13px;
-      margin-top: -5px;
-      color: @darkBorder;
-    }
-
-    button.disabled {
-      cursor: default;
-    }
-  }
 }


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

Posted by be...@apache.org.
fix changes


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

Branch: refs/heads/master
Commit: 05495ff1064739824509d775e524f7e67a66e077
Parents: 8c26875
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Oct 21 18:57:44 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Wed Oct 21 18:57:44 2015 +0200

----------------------------------------------------------------------
 app/addons/documents/tests/nightwatch/changes.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/05495ff1/app/addons/documents/tests/nightwatch/changes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/changes.js b/app/addons/documents/tests/nightwatch/changes.js
index e2de61b..59fab05 100644
--- a/app/addons/documents/tests/nightwatch/changes.js
+++ b/app/addons/documents/tests/nightwatch/changes.js
@@ -12,7 +12,7 @@
 
 module.exports = {
 
-  'Does not display the Select-all-button': function (client) {
+  'Does not display the View-Selector-Button': function (client) {
     var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
@@ -20,10 +20,10 @@ module.exports = {
     client
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
-      .waitForElementPresent('.control-toggle-alternative-header', waitTime, false)
+      .waitForElementPresent('.control-view', waitTime, false)
       .clickWhenVisible('#changes')
       .waitForElementPresent('.js-changes-view', waitTime, false)
-      .assert.elementNotPresent('.control-toggle-alternative-header')
+      .assert.elementNotPresent('.control-view')
       .end();
   },
 


[3/5] fauxton commit: updated refs/heads/master to b7dd66c

Posted by be...@apache.org.
fix paginateAll test


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

Branch: refs/heads/master
Commit: cdd984d1aac8030260f6f0d7a5c08e9aa98fc661
Parents: 05495ff
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Oct 21 18:59:30 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Wed Oct 21 18:59:30 2015 +0200

----------------------------------------------------------------------
 app/addons/documents/tests/nightwatch/paginateAllDocs.js | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cdd984d1/app/addons/documents/tests/nightwatch/paginateAllDocs.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/paginateAllDocs.js b/app/addons/documents/tests/nightwatch/paginateAllDocs.js
index d23ab30..44bf229 100644
--- a/app/addons/documents/tests/nightwatch/paginateAllDocs.js
+++ b/app/addons/documents/tests/nightwatch/paginateAllDocs.js
@@ -23,9 +23,6 @@ module.exports = {
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
 
-      // ensures the header has been rendered
-      .waitForElementPresent('.control-toggle-alternative-header', waitTime, false)
-
       // ensures the main body (results list) has been rendered
       .waitForElementPresent('.prettyprint', waitTime, false)
 
@@ -57,9 +54,6 @@ module.exports = {
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
 
-      // ensures the header is rendered
-      .waitForElementPresent('.control-toggle-alternative-header', waitTime, false)
-
       // ensures the main body (results list) has been rendered
       .waitForElementPresent('.prettyprint', waitTime, false)
 
@@ -84,7 +78,6 @@ module.exports = {
       .populateDatabase(newDatabaseName)
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
-      .waitForElementPresent('.control-toggle-alternative-header', waitTime, false)
 
       // ensures the main body (results list) has been rendered
       .waitForElementPresent('.prettyprint', waitTime, false)


[5/5] fauxton commit: updated refs/heads/master to b7dd66c

Posted by be...@apache.org.
more fixes


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

Branch: refs/heads/master
Commit: b7dd66cea48c27c223edb4e12f282711cecf7bfe
Parents: 8032b1d
Author: Robert Kowalski <ro...@apache.org>
Authored: Wed Oct 21 19:05:21 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Wed Oct 21 19:05:21 2015 +0200

----------------------------------------------------------------------
 app/addons/documents/tests/nightwatch/bulkDelete.js       | 2 +-
 app/addons/documents/tests/nightwatch/deletesDocuments.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b7dd66ce/app/addons/documents/tests/nightwatch/bulkDelete.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/bulkDelete.js b/app/addons/documents/tests/nightwatch/bulkDelete.js
index 4889d15..0721884 100644
--- a/app/addons/documents/tests/nightwatch/bulkDelete.js
+++ b/app/addons/documents/tests/nightwatch/bulkDelete.js
@@ -30,7 +30,7 @@ module.exports = {
       .waitForElementVisible('.prettyprint', waitTime, false)
 
       .clickWhenVisible('.bulk-action-component-selector-group input[type="checkbox"]')
-      .clickWhenVisible('.bulk-actions button.fonticon-trash', waitTime, false)
+      .clickWhenVisible('.bulk-action-component-selector-group button.fonticon-trash', waitTime, false)
       .acceptAlert()
       .waitForElementVisible('#global-notifications .alert.alert-info', waitTime, false)
       .waitForElementNotPresent('[data-id="' + newDocumentName1 + '"]', waitTime, false)

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b7dd66ce/app/addons/documents/tests/nightwatch/deletesDocuments.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/deletesDocuments.js b/app/addons/documents/tests/nightwatch/deletesDocuments.js
index e3e7157..2da8b26 100644
--- a/app/addons/documents/tests/nightwatch/deletesDocuments.js
+++ b/app/addons/documents/tests/nightwatch/deletesDocuments.js
@@ -26,13 +26,13 @@ module.exports = {
       .clickWhenVisible('#dashboard-content a[href="#/database/' + newDatabaseName + '/_all_docs"]', waitTime, false)
       .waitForElementVisible('label[for="checkbox-' + newDocumentName + '"]', waitTime, false)
       .clickWhenVisible('label[for="checkbox-' + newDocumentName + '"]', waitTime, false)
-      .clickWhenVisible('.bulk-actions button.fonticon-trash', waitTime, false)
+      .clickWhenVisible('.bulk-action-component-selector-group button.fonticon-trash', waitTime, false)
       .acceptAlert()
       .waitForElementVisible('.alert.alert-info', waitTime, false)
 
       .waitForElementVisible('label[for="checkbox-' + newDocumentName + '2' + '"]', waitTime, false)
       .clickWhenVisible('label[for="checkbox-' + newDocumentName + '2' + '"]', waitTime, false)
-      .clickWhenVisible('.bulk-actions button.fonticon-trash', waitTime, false)
+      .clickWhenVisible('.bulk-action-component-selector-group button.fonticon-trash', waitTime, false)
       .acceptAlert()
 
       .waitForElementVisible('.alert.alert-info', waitTime, false)