sorting test

12 years ago · 7b7eaa25c0
4 changed files with 80 additions and 56 deletions
--- a/notes.md
+++ b/notes.md
@ -8,20 +8,9 @@ manageStamp

 ## tests

-sortBy an array
-
-sortBy the history
-
 getSortData shorthand

 filter

-filter on init doesn't do transition
-
-sortAscending
-
-sortAscending for object
-
-
 ## bugs

--- a/test/index.html
+++ b/test/index.html
@ -27,7 +27,7 @@
 <script src="../layout-modes/fit-rows.js"></script>
 <script src="../layout-modes/masonry.js"></script>

-<script src="sorting1.js"></script>
+<script src="sorting.js"></script>

 </head>
 <body>
--- a/test/sorting.js
+++ b/test/sorting.js
@ -0,0 +1,79 @@
+( function() {
+
+'use strict';
+
+var docElem = document.documentElement;
+
+var getText = docElem.textContent ?
+  function( elem ) {
+    return elem.textContent;
+  } :
+  function( elem ) {
+    return elem.innerText;
+  };
+
+function getItemsText( iso ) {
+  var texts = [];
+  for ( var i=0, len = iso.filteredItems.length; i < len; i++ ) {
+    var item = iso.filteredItems[i];
+    texts.push( getText( item.element ) );
+  }
+  return texts.join(',');
+}
+
+test( 'sorting', function() {
+
+  // sorting with history
+  ( function() {
+    var iso = new Isotope( '#sorting1', {
+      layoutMode: 'fitRows',
+      transitionDuration: 0,
+      getSortData: {
+        letter: 'b',
+        number: 'i'
+      },
+      sortBy: 'number'
+    });
+
+    iso.layout({ sortBy: 'letter' });
+
+    var texts = getItemsText( iso );
+
+    equal( texts, 'A1,A2,A3,A4,B1,B2,B4', 'items sorted by letter, then number, via history' );
+
+    iso.destroy();
+  })();
+
+  // sorting with array
+  ( function() {
+    var iso = new Isotope( '#sorting1', {
+      layoutMode: 'fitRows',
+      transitionDuration: 0,
+      getSortData: {
+        letter: 'b',
+        number: 'i'
+      },
+      sortBy: [ 'letter', 'number' ]
+    });
+
+    equal( getItemsText( iso ), 'A1,A2,A3,A4,B1,B2,B4', 'sortBy array' );
+
+    iso.layout({
+      sortAscending: false
+    });
+    equal( getItemsText( iso ), 'B4,B2,B1,A4,A3,A2,A1', 'sortAscending false' );
+
+    iso.layout({
+      sortAscending: {
+        letter: true,
+        number: false
+      }
+    });
+    equal( getItemsText( iso ), 'A4,A3,A2,A1,B4,B2,B1', 'sortAscending with object' );
+
+    iso.destroy();
+  })();
+
+});
+
+})();
--- a/test/sorting1.js
+++ b/test/sorting1.js
@ -1,44 +0,0 @@
-( function() {
-
-'use strict';
-
-var docElem = document.documentElement;
-
-var getText = docElem.textContent ?
-  function( elem ) {
-    return elem.textContent;
-  } :
-  function( elem ) {
-    return elem.innerText;
-  };
-
-function getItemsText( iso ) {
-  var texts = [];
-  for ( var i=0, len = iso.filteredItems.length; i < len; i++ ) {
-    var item = iso.filteredItems[i];
-    texts.push( getText( item.element ) );
-  }
-  return texts.join(',');
-}
-
-test( 'sort uses history', function() {
-  var iso = new Isotope( '#sorting1', {
-    layoutMode: 'fitRows',
-    transitionDuration: 0,
-    getSortData: {
-      letter: 'b',
-      number: 'i'
-    },
-    sortBy: 'number'
-  });
-
-  iso.layout({ sortBy: 'letter' });
-
-  var texts = getItemsText( iso );
-
-  equal( texts, 'A1,A2,A3,A4,B1,B2,B4', 'items sorted by letter, then number, via history' );
-
-  iso.destroy();
-});
-
-})();