Remove list builder methods on document matchers

3 files changed, 5 insertions, 19 deletions

diff --git a/lib/document-matchers.js b/lib/document-matchers.js
index ae8a922..9f138ea 100644
--- a/lib/document-matchers.js
+++ b/lib/document-matchers.js
@@ -28,20 +28,6 @@ Matcher.prototype.matches = function(element) {
         (this._listIndex === undefined || isList(element, this._listIndex, this._listIsOrdered));
 };
 
-Matcher.prototype.orderedList = function(levelIndex) {
-    return this.list({isOrdered: true, levelIndex: levelIndex});
-};
-
-Matcher.prototype.unorderedList = function(levelIndex) {
-    return this.list({isOrdered: false, levelIndex: levelIndex});
-};
-
-Matcher.prototype.list = function(options) {
-    this._listIndex = options.levelIndex;
-    this._listIsOrdered = options.isOrdered;
-    return this;
-};
-
 function isList(element, levelIndex, isOrdered) {
     return element.numbering &&
         element.numbering.level == levelIndex &&
diff --git a/tests/document-matchers.tests.js b/tests/document-matchers.tests.js
index 070e0bf..bb51c69 100644
--- a/tests/document-matchers.tests.js
+++ b/tests/document-matchers.tests.js
@@ -20,7 +20,7 @@ describe("document-matchers", function() {
     });
     
     test("ordered-list(index) matches an ordered list with specified level index", function() {
-        var matcher = documentMatchers.paragraph().orderedList(1);
+        var matcher = documentMatchers.paragraph({list: {isOrdered: true, levelIndex: 1}});
         assert.ok(!matcher.matches(new Paragraph()));
         assert.ok(matcher.matches(new Paragraph([], {numbering: {level: 1, isOrdered: true}})));
         assert.ok(!matcher.matches(new Paragraph([], {numbering: {level: 0, isOrdered: true}})));
@@ -28,14 +28,14 @@ describe("document-matchers", function() {
     });
     
     test("unordered-list(index) matches an unordered list with specified level index", function() {
-        var matcher = documentMatchers.paragraph().unorderedList(1);
+        var matcher = documentMatchers.paragraph({list: {isOrdered: false, levelIndex: 1}});
         assert.ok(!matcher.matches(new Paragraph()));
         assert.ok(matcher.matches(new Paragraph([], {numbering: {level: 1, isOrdered: false}})));
         assert.ok(!matcher.matches(new Paragraph([], {numbering: {level: 1, isOrdered: true}})));
     });
     
     test("matchers for lists with index 0 do not match elements that are not lists", function() {
-        var matcher = documentMatchers.paragraph().orderedList(0);
+        var matcher = documentMatchers.paragraph({list: {isOrdered: true, levelIndex: 0}});
         assert.ok(!matcher.matches(new Paragraph()));
     });
 });
diff --git a/tests/style-reader.tests.js b/tests/style-reader.tests.js
index 50986e5..61ba28b 100644
--- a/tests/style-reader.tests.js
+++ b/tests/style-reader.tests.js
@@ -65,14 +65,14 @@ describe("styleReader.readDocumentMatcher", function() {
     test("reads p:ordered-list(1) as ordered list with index of 0", function() {
         assert.deepEqual(
             readDocumentMatcher("p:ordered-list(1)"),
-            documentMatchers.paragraph().orderedList(0)
+            documentMatchers.paragraph({list: {isOrdered: true, levelIndex: 0}})
         );
     });
     
     test("reads p:unordered-list(1) as unordered list with index of 0", function() {
         assert.deepEqual(
             readDocumentMatcher("p:unordered-list(1)"),
-            documentMatchers.paragraph().unorderedList(0)
+            documentMatchers.paragraph({list: {isOrdered: false, levelIndex: 0}})
         );
     });