Always create paragraph matcher with options object

3 files changed, 8 insertions, 12 deletions

diff --git a/lib/document-matchers.js b/lib/document-matchers.js
index 0846513..8ed5e80 100644
--- a/lib/document-matchers.js
+++ b/lib/document-matchers.js
@@ -6,10 +6,6 @@ exports.run = run;
 
 function paragraph(options) {
     options = options || {};
-    if (_.isString(options)) {
-        // TODO: this is deprecated, remove usages
-        options = {styleId: options};
-    }
     return new Matcher("paragraph", options);
 }
 
diff --git a/tests/document-matchers.tests.js b/tests/document-matchers.tests.js
index 581746c..070e0bf 100644
--- a/tests/document-matchers.tests.js
+++ b/tests/document-matchers.tests.js
@@ -6,17 +6,17 @@ var documents = require("../lib/documents");
 var Paragraph = documents.Paragraph;
 
 describe("document-matchers", function() {
-    test("paragraph with no style name matches any paragraph", function() {
+    test("paragraph with no options matches any paragraph", function() {
         var matcher = documentMatchers.paragraph();
         assert.ok(matcher.matches(new Paragraph()));
-        assert.ok(matcher.matches(paragraphWithStyle("Heading1")));
+        assert.ok(matcher.matches(paragraphWithStyleId("Heading1")));
     });
     
-    test("paragraph style name only matches paragraphs with that style", function() {
-        var matcher = documentMatchers.paragraph("Heading1");
+    test("paragraph style ID only matches paragraphs with that style ID", function() {
+        var matcher = documentMatchers.paragraph({styleId: "Heading1"});
         assert.ok(!matcher.matches(new Paragraph()));
-        assert.ok(matcher.matches(paragraphWithStyle("Heading1")));
-        assert.ok(!matcher.matches(paragraphWithStyle("Heading2")));
+        assert.ok(matcher.matches(paragraphWithStyleId("Heading1")));
+        assert.ok(!matcher.matches(paragraphWithStyleId("Heading2")));
     });
     
     test("ordered-list(index) matches an ordered list with specified level index", function() {
@@ -40,6 +40,6 @@ describe("document-matchers", function() {
     });
 });
 
-function paragraphWithStyle(styleId) {
+function paragraphWithStyleId(styleId) {
     return new Paragraph([], {styleId: styleId});
 }
diff --git a/tests/style-reader.tests.js b/tests/style-reader.tests.js
index 7fff059..50986e5 100644
--- a/tests/style-reader.tests.js
+++ b/tests/style-reader.tests.js
@@ -58,7 +58,7 @@ describe("styleReader.readDocumentMatcher", function() {
     test("reads paragraph with style ID", function() {
         assert.deepEqual(
             readDocumentMatcher("p.Heading1"),
-            documentMatchers.paragraph("Heading1")
+            documentMatchers.paragraph({styleId: "Heading1"})
         );
     });