lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/folding/html_test.js in gollum-3.1.2 vs lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/folding/html_test.js in gollum-3.1.3

@@ -57,12 +57,12 @@
         assert.equal(session.getFoldWidget(1), "start");
         assert.equal(session.getFoldWidget(2), "");
         assert.equal(session.getFoldWidget(3), "end");
         assert.equal(session.getFoldWidget(4), "end");
         
-        assert.range(session.getFoldWidgetRange(0), 0, 8, 4, 0);
-        assert.range(session.getFoldWidgetRange(4), 0, 8, 4, 0);
+        assert.range(session.getFoldWidgetRange(0), 0, 31, 4, 0);
+        assert.range(session.getFoldWidgetRange(4), 0, 31, 4, 0);
         
         assert.range(session.getFoldWidgetRange(1), 1, 16, 3, 0);
         assert.range(session.getFoldWidgetRange(3), 1, 16, 3, 0);
     },
     
@@ -83,12 +83,12 @@
         assert.equal(session.getFoldWidget(1), "start");
         assert.equal(session.getFoldWidget(2), "");
         assert.equal(session.getFoldWidget(3), "end");
         assert.equal(session.getFoldWidget(4), "end");
         
-        assert.range(session.getFoldWidgetRange(0), 0, 7, 4, 0);
-        assert.range(session.getFoldWidgetRange(4), 0, 7, 4, 0);
+        assert.range(session.getFoldWidgetRange(0), 0, 23, 4, 0);
+        assert.range(session.getFoldWidgetRange(4), 0, 23, 4, 0);
         
         assert.range(session.getFoldWidgetRange(1), 1, 17, 3, 4);
         assert.range(session.getFoldWidgetRange(3), 1, 17, 3, 4);
     },
     
@@ -143,17 +143,41 @@
         var mode = new HtmlMode();
         session.setMode(mode);
         session.setFoldStyle("markbeginend");
         
         assert.equal(session.getFoldWidget(0), "start");
-        assert.equal(session.getFoldWidget(1), "");
+        assert.equal(session.getFoldWidget(1), "start");
         assert.equal(session.getFoldWidget(2), "");
-        assert.equal(session.getFoldWidget(3), "");
+        assert.equal(session.getFoldWidget(3), "start");
         assert.equal(session.getFoldWidget(4), "");
         assert.equal(session.getFoldWidget(5), "end");
         
         assert.range(session.getFoldWidgetRange(0), 0, 5, 5, 0);
         assert.range(session.getFoldWidgetRange(5), 0, 5, 5, 0);
+    },
+    
+    "test: fold multiple nested optional elements": function() {
+        var session = new EditSession([
+            '<p>',
+            '<li>',
+            '<p>juhu',
+            '<p>',
+            'kinners',
+            '</li>'
+        ]);
+        
+        var mode = new HtmlMode();
+        session.setMode(mode);
+        session.setFoldStyle("markbeginend");
+        
+        assert.equal(session.getFoldWidget(0), "start");
+        assert.equal(session.getFoldWidget(1), "start");
+        assert.equal(session.getFoldWidget(2), "start");
+        assert.equal(session.getFoldWidget(3), "start");
+        assert.equal(session.getFoldWidget(4), "");
+        assert.equal(session.getFoldWidget(5), "end");
+        
+        assert.range(session.getFoldWidgetRange(1), 1, 4, 5, 0);
     }
 };
 
 });