From 1e0381a4956fd6fd60f221d39992cf853dd9e2a8 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Thu, 18 Feb 2016 09:31:31 -0800 Subject: [PATCH] Update describe error message to no longer assume errant args are `done` Fixes #896 --- lib/jasmine-core/jasmine.js | 2 +- spec/core/EnvSpec.js | 2 +- src/core/Env.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index ef7900bb..740ab3f9 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -795,7 +795,7 @@ getJasmineRequireObj().Env = function(j$) { this.describe = function(description, specDefinitions) { var suite = suiteFactory(description); if (specDefinitions.length > 0) { - throw new Error('describe does not expect a done parameter'); + throw new Error('describe does not expect any arguments'); } if (currentDeclarationSuite.markedPending) { suite.pend(); diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index 44bca7fd..896e5f56 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -31,7 +31,7 @@ describe("Env", function() { it("throws the error", function() { expect(function() { env.describe('done method', spec); - }).toThrow(new Error('describe does not expect a done parameter')); + }).toThrow(new Error('describe does not expect any arguments')); }); }); diff --git a/src/core/Env.js b/src/core/Env.js index c9db4e91..95c93d63 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -291,7 +291,7 @@ getJasmineRequireObj().Env = function(j$) { this.describe = function(description, specDefinitions) { var suite = suiteFactory(description); if (specDefinitions.length > 0) { - throw new Error('describe does not expect a done parameter'); + throw new Error('describe does not expect any arguments'); } if (currentDeclarationSuite.markedPending) { suite.pend();