From 54191fbf123c80754e470c21cd76f0f8b67601f8 Mon Sep 17 00:00:00 2001
From: David Majda <david@majda.cz>
Date: Mon, 12 Jan 2015 16:09:38 +0100
Subject: [PATCH] Behavior specs cleanup: Improve literal specs

---
 .../generated-parser-behavior.spec.js         | 75 +++++++++++--------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/spec/behavior/generated-parser-behavior.spec.js b/spec/behavior/generated-parser-behavior.spec.js
index 0d89621..1119b52 100644
--- a/spec/behavior/generated-parser-behavior.spec.js
+++ b/spec/behavior/generated-parser-behavior.spec.js
@@ -220,54 +220,63 @@ describe("generated parser behavior", function() {
     });
 
     describe("literal", function() {
-      it("matches empty literal correctly", function() {
-        var parser = PEG.buildParser('start = ""', options);
+      describe("matching", function() {
+        it("matches empty literals", function() {
+          var parser = PEG.buildParser('start = ""', options);
 
-        expect(parser).toParse("", "");
-      });
+          expect(parser).toParse("");
+        });
 
-      it("matches one-character literal correctly", function() {
-        var parser = PEG.buildParser('start = "a"', options);
+        it("matches one-character literals", function() {
+          var parser = PEG.buildParser('start = "a"', options);
 
-        expect(parser).toParse("a", "a");
-        expect(parser).toFailToParse("b");
-      });
+          expect(parser).toParse("a");
+          expect(parser).toFailToParse("b");
+        });
 
-      it("matches multi-character literal correctly", function() {
-        var parser = PEG.buildParser('start = "abcd"', options);
+        it("matches multi-character literals", function() {
+          var parser = PEG.buildParser('start = "abcd"', options);
 
-        expect(parser).toParse("abcd", "abcd");
-        expect(parser).toFailToParse("ebcd");
-        expect(parser).toFailToParse("afcd");
-        expect(parser).toFailToParse("abgd");
-        expect(parser).toFailToParse("abch");
-      });
+          expect(parser).toParse("abcd");
+          expect(parser).toFailToParse("efgh");
+        });
 
-      it("is case sensitive without the \"i\" flag", function() {
-        var parser = PEG.buildParser('start = "a"', options);
+        it("is case sensitive without the \"i\" flag", function() {
+          var parser = PEG.buildParser('start = "a"', options);
 
-        expect(parser).toParse("a", "a");
-        expect(parser).toFailToParse("A");
-      });
+          expect(parser).toParse("a");
+          expect(parser).toFailToParse("A");
+        });
 
-      it("is case insensitive with the \"i\" flag", function() {
-        var parser = PEG.buildParser('start = "a"i', options);
+        it("is case insensitive with the \"i\" flag", function() {
+          var parser = PEG.buildParser('start = "a"i', options);
 
-        expect(parser).toParse("a", "a");
-        expect(parser).toParse("A", "A");
+          expect(parser).toParse("a");
+          expect(parser).toParse("A");
+        });
       });
 
-      it("advances position on success", function() {
-        var parser = PEG.buildParser('start = "a" .', options);
+      describe("when it matches", function() {
+        it("returns the matched text", function() {
+          var parser = PEG.buildParser('start = "a"', options);
 
-        expect(parser).toParse("ab", ["a", "b"]);
+          expect(parser).toParse("a", "a");
+        });
+
+        it("advances parse position past the matched text", function() {
+          var parser = PEG.buildParser('start = "a" .', options);
+
+          expect(parser).toParse("ab");
+        });
       });
 
-      it("sets expectation correctly on failure", function() {
-        var parser = PEG.buildParser('start = "a"', options);
+      describe("when it doesn't match", function() {
+        it("reports match failure and records an expectation of type \"literal\"", function() {
+          var parser = PEG.buildParser('start = "a"', options);
 
-        expect(parser).toFailToParse("b", {
-          expected: [{ type: "literal", value: "a", description: '"a"' }]
+          expect(parser).toFailToParse("b", {
+            expected: [{ type: "literal", value: "a", description: '"a"' }]
+          });
         });
       });
     });