You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/08/19 20:57:21 UTC
fauxton commit: updated refs/heads/secondary-indexes to bfe55cd
Repository: couchdb-fauxton
Updated Branches:
refs/heads/secondary-indexes f10218e1e -> bfe55cd20
removed that one index spec because it seemed like a place holder? Fixed the paginate Spec to include the correct resources
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/bfe55cd2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/bfe55cd2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/bfe55cd2
Branch: refs/heads/secondary-indexes
Commit: bfe55cd20e8bbc9ee4071a3c355709375adf92dd
Parents: f10218e
Author: deathbearbrown <de...@gmail.com>
Authored: Tue Aug 19 14:57:20 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Tue Aug 19 14:57:20 2014 -0400
----------------------------------------------------------------------
app/addons/documents/tests/views-indexSpec.js | 33 ----------------------
app/addons/fauxton/tests/paginateSpec.js | 9 +++---
assets/less/pagination.less | 1 +
3 files changed, 6 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bfe55cd2/app/addons/documents/tests/views-indexSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-indexSpec.js b/app/addons/documents/tests/views-indexSpec.js
deleted file mode 100644
index 7012a04..0000000
--- a/app/addons/documents/tests/views-indexSpec.js
+++ /dev/null
@@ -1,33 +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.
-define([
- 'addons/documents/views-index',
- 'testUtils'
-], function (Views, testUtils) {
- var assert = testUtils.assert,
- ViewSandbox = testUtils.ViewSandbox,
- viewSandbox;
-
- describe('Documents Indexes', function () {
- var view;
- beforeEach(function () {
- viewSandbox = new ViewSandbox();
- viewSandbox.renderView(view);
- });
-
- afterEach(function () {
- viewSandbox.remove();
- });
- });
-});
-
-
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bfe55cd2/app/addons/fauxton/tests/paginateSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/paginateSpec.js b/app/addons/fauxton/tests/paginateSpec.js
index d336ea8..2974f61 100644
--- a/app/addons/fauxton/tests/paginateSpec.js
+++ b/app/addons/fauxton/tests/paginateSpec.js
@@ -13,9 +13,10 @@ define([
'app',
'addons/fauxton/components',
'addons/documents/resources',
+ 'addons/indexes/resources',
'testUtils',
'api'
-], function (app, Views, Models, testUtils, FauxtonAPI) {
+], function (app, Views, Models, IndexModels, testUtils, FauxtonAPI) {
var assert = testUtils.assert,
ViewSandbox = testUtils.ViewSandbox;
@@ -23,7 +24,7 @@ define([
describe('IndexPaginate', function () {
var viewSandbox, paginate, collection, navigateMock;
beforeEach(function () {
- collection = new Models.IndexCollection([{
+ collection = new IndexModels.IndexCollection([{
id:'myId1',
doc: 'num1'
},
@@ -43,7 +44,7 @@ define([
canShowNextfn: function () { return true;}
});
viewSandbox = new ViewSandbox();
- viewSandbox.renderView(paginate);
+ viewSandbox.renderView(paginate);
});
afterEach(function () {
@@ -55,7 +56,7 @@ define([
//do this so it doesn't throw an error on other unwired up components
FauxtonAPI.triggerRouteEvent = function () {};
//FauxtonAPI.triggerRouteEvent.restore && FauxtonAPI.triggerRouteEvent.restore();
- //FauxtonAPI.navigate.restore && FauxtonAPI.navigate.restore();
+ //FauxtonAPI.navigate.restore && FauxtonAPI.navigate.restore();
});
it('Should trigger routeEvent', function () {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bfe55cd2/assets/less/pagination.less
----------------------------------------------------------------------
diff --git a/assets/less/pagination.less b/assets/less/pagination.less
index df0740a..3911b90 100644
--- a/assets/less/pagination.less
+++ b/assets/less/pagination.less
@@ -11,6 +11,7 @@
* the License.
*/
footer.pagination-footer {
+ min-width: 600px;
position:fixed;
background-color:#fff;
bottom:0;