1 files changed, 26 insertions, 22 deletions

diff --git a/test/js/tests.js b/test/js/tests.js
index d298cebe..cd4f9d58 100644
--- a/test/js/tests.js
+++ b/test/js/tests.js
@@ -1,53 +1,57 @@
-// To make the code more testable, we monkeypatch some of it.
-$.extend(coverage, {
-    line_elt: function(n) {
-        return $(coverage.fixture + " .t" + n);
-    },
-    num_elt: function(n) {
-        return $(coverage.fixture + " .n" + n);
-    },
-    scroll_to_selection: function() {}
-});
+// Tests of coverage.py HTML report chunk navigation.
 
 // Test helpers
 
 function selection_is(sel) {
-    equals(coverage.sel_begin, sel[0]);
-    equals(coverage.sel_end, sel[1]);
+    var beg = sel[0], end = sel[1];
+    equals(coverage.sel_begin, beg);
+    equals(coverage.sel_end, end);
+    equals(coverage.code_container().find(".highlight").length, end-beg);
+}
+
+function build_fixture(spec) {
+    $("#fixture-template").tmpl().appendTo("#qunit-fixture");
+    for (var i = 0; i < spec.length; i++) {
+        var data = {number: i+1, klass: spec.substr(i, 1)};
+        $("#lineno-template").tmpl(data).appendTo("#qunit-fixture .linenos");
+        $("#text-template").tmpl(data).appendTo("#qunit-fixture .text");
+    }
 }
 
 // Tests
 
 $.each([
-    ['rrwwrr', [1,3], [5,7]], 
+    ['rrwwrrrr', [1,3], [5,9]],
     ['rb', [1,2], [2,3]],
-    ['wrrwrrw', [2,4], [5,7]],
+    ['wrrwrrrrw', [2,4], [5,9]],
     ['rrrbbb', [1,4], [4,7]]
 ], function(i, params) {
 
+    // Each of these tests uses a fixture with two highlighted chunks.
+
     var id = params[0];
     var fixture = "#"+id;
     var c1 = params[1];
     var c2 = params[2];
 
     function setup() {
-        coverage.fixture = fixture;
+        build_fixture(id);
     };
 
-    test("first chunk on line 1 "+id, function() {
+    test("first chunk on line 1: "+id, function() {
         setup();
         coverage.to_first_chunk();
         selection_is(c1);
     });
 
-    test("move to next chunk "+id, function() {
+    test("move to next chunk: "+id, function() {
         setup();
         coverage.to_first_chunk();
         coverage.to_next_chunk();
         selection_is(c2);
     });
 
-    test("move to first chunk "+id, function() {
+    test("move to first chunk: "+id, function() {
         setup();
         coverage.to_first_chunk();
         coverage.to_next_chunk();
@@ -55,7 +59,7 @@ $.each([
         selection_is(c1);
     });
 
-    test("move to previous chunk "+id, function() {
+    test("move to previous chunk: "+id, function() {
         setup();
         coverage.to_first_chunk();
         coverage.to_next_chunk();
@@ -63,7 +67,7 @@ $.each([
         selection_is(c1);
     });
 
-    test("next doesn't move after last chunk "+id, function() {
+    test("next doesn't move after last chunk: "+id, function() {
         setup();
         coverage.to_first_chunk();
         coverage.to_next_chunk();
@@ -71,7 +75,7 @@ $.each([
         selection_is(c2);
     });
 
-    test("prev doesn't move before first chunk "+id, function() {
+    test("prev doesn't move before first chunk: "+id, function() {
         setup();
         coverage.to_first_chunk();
         coverage.to_next_chunk();
@@ -83,7 +87,7 @@ $.each([
 });
 
 test("jump from a line selected", function() {
-    coverage.fixture = "#rrwwrr";
+    build_fixture("rrwwrr");
     coverage.set_sel(3, 4);
     coverage.to_next_chunk();
     selection_is([5,7]);