From 2faff0000e02232e52b3ac616ad89c0ae1a5ba93 Mon Sep 17 00:00:00 2001 From: David Majda Date: Mon, 12 Jan 2015 16:07:38 +0100 Subject: [PATCH] Behavior specs cleanup: Make |toParse| work without expected value This means we can assert just "this string parses" and ignore the returned value. --- .../generated-parser-behavior.spec.js | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/spec/behavior/generated-parser-behavior.spec.js b/spec/behavior/generated-parser-behavior.spec.js index 8cb4b22..0d89621 100644 --- a/spec/behavior/generated-parser-behavior.spec.js +++ b/spec/behavior/generated-parser-behavior.spec.js @@ -38,20 +38,24 @@ describe("generated parser behavior", function() { try { result = this.actual.parse(input, options); - this.message = function() { - return "Expected " + jasmine.pp(input) + " " - + "with options " + jasmine.pp(options) + " " - + (this.isNot ? "not " : "") - + "to parse as " + jasmine.pp(expected) + ", " - + "but it parsed as " + jasmine.pp(result) + "."; - }; + if (arguments.length > 1) { + this.message = function() { + return "Expected " + jasmine.pp(input) + " " + + "with options " + jasmine.pp(options) + " " + + (this.isNot ? "not " : "") + + "to parse as " + jasmine.pp(expected) + ", " + + "but it parsed as " + jasmine.pp(result) + "."; + }; - return this.env.equals_(result, expected); + return this.env.equals_(result, expected); + } else { + return true; + } } catch (e) { this.message = function() { return "Expected " + jasmine.pp(input) + " " + "with options " + jasmine.pp(options) + " " - + "to parse as " + jasmine.pp(expected) + ", " + + "to parse" + (arguments.length > 1 ? " as " + jasmine.pp(expected) : "") + ", " + "but it failed to parse with message " + jasmine.pp(e.message) + "."; };