[3/4] fauxton commit: updated refs/heads/master to 246057e

[ro...@apache.org]

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/246057e6/app/addons/documents/tests/nightwatch/bulkSelect.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/bulkSelect.js b/app/addons/documents/tests/nightwatch/bulkSelect.js
deleted file mode 100644
index f0189f1..0000000
--- a/app/addons/documents/tests/nightwatch/bulkSelect.js
+++ /dev/null
@@ -1,34 +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 = {
-  // When I select all documents
-  // And there are less documents than I have set to display per page
-  // Then I want the select-all-button to be selected
-  'Bulk Documents: selector': function (client) {
-    var waitTime = client.globals.maxWaitTime,
-        newDatabaseName = client.globals.testDatabaseName,
-        newDocumentName1 = 'bulktest1',
-        newDocumentName2 = 'bulktest2',
-        baseUrl = client.globals.test_settings.launch_url;
-
-    client
-      .loginToGUI()
-      .createDocument(newDocumentName1, newDatabaseName)
-      .createDocument(newDocumentName2, newDatabaseName)
-      .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
-      .clickWhenVisible('.control-toggle-alternative-header')
-      .clickWhenVisible('.control-select-all')
-      .assert.attributeEquals('.control-select-all', 'disabled', 'true')
-      .end();
-  }
-};

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/246057e6/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 5a3a900..e3e7157 100644
--- a/app/addons/documents/tests/nightwatch/deletesDocuments.js
+++ b/app/addons/documents/tests/nightwatch/deletesDocuments.js
@@ -26,15 +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)
-      .waitForElementPresent('.control-select-all', waitTime, false)
-      .clickWhenVisible('.control-delete')
+      .clickWhenVisible('.bulk-actions 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)
-      .waitForElementPresent('.control-select-all', waitTime, false)
-      .clickWhenVisible('.control-delete')
+      .clickWhenVisible('.bulk-actions button.fonticon-trash', waitTime, false)
       .acceptAlert()
 
       .waitForElementVisible('.alert.alert-info', waitTime, false)

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/246057e6/app/addons/documents/tests/routeSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/routeSpec.js b/app/addons/documents/tests/routeSpec.js
index 31cc82c..4fa420b 100644
--- a/app/addons/documents/tests/routeSpec.js
+++ b/app/addons/documents/tests/routeSpec.js
@@ -33,26 +33,6 @@ define([
 
   });
 
-  var MangoRoute = Documents.RouteObjects[4];
-  describe('Mango Route', function () {
-
-    afterEach(function () {
-      testUtils.restore(HeaderActions.resetHeaderController);
-      testUtils.restore(IndexResultsActions.newMangoResultsList);
-    });
-
-    it('resets the header', function () {
-      var spy = sinon.spy(HeaderActions, 'resetHeaderController');
-      var stub = sinon.stub(IndexResultsActions, 'newMangoResultsList');
-
-      var routeObj = new MangoRoute(null, null, ['test']);
-
-      routeObj.findUsingIndex();
-      assert.ok(spy.calledOnce);
-    });
-
-  });
-
   //    until there is consensus on how to encode json responses
   //    https://issues.apache.org/jira/browse/COUCHDB-2748
   //    taking out this test for https://github.com/apache/couchdb-fauxton/pull/489