Merge pull request #1833 from megawac/browser-testing

michaelficarra · michaelficarra · commit e1141980c3bb · 2014-09-03T10:47:51.000-07:00
Refactor collection nodelist tests
diff --git a/test/collections.js b/test/collections.js
@@ -79,14 +79,7 @@
     doubled = _([1, 2, 3]).map(function(num){ return num * 2; });
     deepEqual(doubled, [2, 4, 6], 'OO-style doubled numbers');
 
-    if (typeof document != 'undefined') {
-      var nodes = _.filter(document.getElementById('map-test').childNodes, _.isElement);
-      var ids = _.map(nodes, 'id');
-      equal(nodes.length, 2);
-      deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on NodeLists.');
-    }
-
-    ids = _.map({length: 2, 0: {id: '1'}, 1: {id: '2'}}, function(n){
+    var ids = _.map({length: 2, 0: {id: '1'}, 1: {id: '2'}}, function(n){
       return n.id;
     });
     deepEqual(ids, ['1', '2'], 'Can use collection methods on Array-likes.');
@@ -711,4 +704,26 @@
     }, predicate);
   });
 
+  if (typeof document != 'undefined') {
+    test('Can use various collection methods on NodeLists', function() {
+        var parent = document.createElement('div');
+        parent.innerHTML = '<span id=id1></span>textnode<span id=id2></span>';
+
+        var elementChildren = _.filter(parent.childNodes, _.isElement);
+        equal(elementChildren.length, 2);
+
+        deepEqual(_.map(elementChildren, 'id'), ['id1', 'id2']);
+        deepEqual(_.map(parent.childNodes, 'nodeType'), [1, 3, 1]);
+
+        ok(!_.every(parent.childNodes, _.isElement));
+        ok(_.some(parent.childNodes, _.isElement));
+
+        function compareNode(node) {
+          return _.isElement(node) ? node.id.charAt(2) : void 0;
+        }
+        equal(_.max(parent.childNodes, compareNode), _.last(parent.childNodes));
+        equal(_.min(parent.childNodes, compareNode), _.first(parent.childNodes));
+    });
+  }
+
 }());
diff --git a/test/index.html b/test/index.html
@@ -7,12 +7,6 @@
 </head>
 <body>
   <div id="qunit"></div>
-  <div id="qunit-fixture">
-    <div id="map-test">
-      <div id="id1"></div>
-      <div id="id2"></div>
-    </div>
-  </div>
   <script src="vendor/qunit.js"></script>
   <script src="../underscore.js"></script>
 
