warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add single quote check to jshint and fix src files for that

Browse Source 
[fixes #522]
This commit is contained in:
Robin Böhm
2014-02-16 23:28:20 +01:00
committed by Greg Cobb and Sheel Choksi
parent 095b02ad83
commit 31d71ac22f
30 changed files with 384 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/matchers/matchersUtil.js
+6 -6
View File
@@ -11,7 +11,7 @@ getJasmineRequireObj().matchersUtil = function(j$) {
contains: function(haystack, needle, customTesters) {
customTesters = customTesters || [];
if (Object.prototype.toString.apply(haystack) === "[object Array]") {
if (Object.prototype.toString.apply(haystack) === '[object Array]') {
for (var i = 0; i < haystack.length; i++) {
if (eq(haystack[i], needle, [], [], customTesters)) {
return true;
@@ -30,21 +30,21 @@ getJasmineRequireObj().matchersUtil = function(j$) {
expected = args.slice(3),
englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
var message = "Expected " +
var message = 'Expected ' +
j$.pp(actual) +
(isNot ? " not " : " ") +
(isNot ? ' not ' : ' ') +
englishyPredicate;
if (expected.length > 0) {
for (var i = 0; i < expected.length; i++) {
if (i > 0) {
message += ",";
message += ',';
}
message += " " + j$.pp(expected[i]);
message += ' ' + j$.pp(expected[i]);
}
}
return message + ".";
return message + '.';
}
};
src/core/matchers/requireMatchers.js
+17 -17
View File
@@ -1,22 +1,22 @@
getJasmineRequireObj().requireMatchers = function(jRequire, j$) {
var availableMatchers = [
"toBe",
"toBeCloseTo",
"toBeDefined",
"toBeFalsy",
"toBeGreaterThan",
"toBeLessThan",
"toBeNaN",
"toBeNull",
"toBeTruthy",
"toBeUndefined",
"toContain",
"toEqual",
"toHaveBeenCalled",
"toHaveBeenCalledWith",
"toMatch",
"toThrow",
"toThrowError"
'toBe',
'toBeCloseTo',
'toBeDefined',
'toBeFalsy',
'toBeGreaterThan',
'toBeLessThan',
'toBeNaN',
'toBeNull',
'toBeTruthy',
'toBeUndefined',
'toContain',
'toEqual',
'toHaveBeenCalled',
'toHaveBeenCalledWith',
'toMatch',
'toThrow',
'toThrowError'
],
matchers = {};
src/core/matchers/toBeNaN.js
+2 -2
View File
@@ -8,9 +8,9 @@ getJasmineRequireObj().toBeNaN = function(j$) {
};
if (result.pass) {
result.message = "Expected actual not to be NaN.";
result.message = 'Expected actual not to be NaN.';
} else {
result.message = function() { return "Expected " + j$.pp(actual) + " to be NaN."; };
result.message = function() { return 'Expected ' + j$.pp(actual) + ' to be NaN.'; };
}
return result;
src/core/matchers/toHaveBeenCalled.js
+2 -2
View File
@@ -16,8 +16,8 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) {
result.pass = actual.calls.any();
result.message = result.pass ?
"Expected spy " + actual.and.identity() + " not to have been called." :
"Expected spy " + actual.and.identity() + " to have been called.";
'Expected spy ' + actual.and.identity() + ' not to have been called.' :
'Expected spy ' + actual.and.identity() + ' to have been called.';
return result;
}
src/core/matchers/toHaveBeenCalledWith.js
+3 -3
View File
@@ -13,15 +13,15 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) {
}
if (!actual.calls.any()) {
result.message = function() { return "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but it was never called."; };
result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but it was never called.'; };
return result;
}
if (util.contains(actual.calls.allArgs(), expectedArgs)) {
result.pass = true;
result.message = function() { return "Expected spy " + actual.and.identity() + " not to have been called with " + j$.pp(expectedArgs) + " but it was."; };
result.message = function() { return 'Expected spy ' + actual.and.identity() + ' not to have been called with ' + j$.pp(expectedArgs) + ' but it was.'; };
} else {
result.message = function() { return "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but actual calls were " + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + "."; };
result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but actual calls were ' + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + '.'; };
}
return result;
src/core/matchers/toThrow.js
+6 -6
View File
@@ -7,8 +7,8 @@ getJasmineRequireObj().toThrow = function(j$) {
threw = false,
thrown;
if (typeof actual != "function") {
throw new Error("Actual is not a Function");
if (typeof actual != 'function') {
throw new Error('Actual is not a Function');
}
try {
@@ -19,22 +19,22 @@ getJasmineRequireObj().toThrow = function(j$) {
}
if (!threw) {
result.message = "Expected function to throw an exception.";
result.message = 'Expected function to throw an exception.';
return result;
}
if (arguments.length == 1) {
result.pass = true;
result.message = function() { return "Expected function not to throw, but it threw " + j$.pp(thrown) + "."; };
result.message = function() { return 'Expected function not to throw, but it threw ' + j$.pp(thrown) + '.'; };
return result;
}
if (util.equals(thrown, expected)) {
result.pass = true;
result.message = function() { return "Expected function not to throw " + j$.pp(expected) + "."; };
result.message = function() { return 'Expected function not to throw ' + j$.pp(expected) + '.'; };
} else {
result.message = function() { return "Expected function to throw " + j$.pp(expected) + ", but it threw " + j$.pp(thrown) + "."; };
result.message = function() { return 'Expected function to throw ' + j$.pp(expected) + ', but it threw ' + j$.pp(thrown) + '.'; };
}
return result;
src/core/matchers/toThrowError.js
+25 -25
View File
@@ -12,8 +12,8 @@ getJasmineRequireObj().toThrowError = function(j$) {
name,
constructorName;
if (typeof actual != "function") {
throw new Error("Actual is not a Function");
if (typeof actual != 'function') {
throw new Error('Actual is not a Function');
}
extractExpectedParams.apply(null, arguments);
@@ -26,17 +26,17 @@ getJasmineRequireObj().toThrowError = function(j$) {
}
if (!threw) {
fail.message = "Expected function to throw an Error.";
fail.message = 'Expected function to throw an Error.';
return fail;
}
if (!(thrown instanceof Error)) {
fail.message = function() { return "Expected function to throw an Error, but it threw " + j$.pp(thrown) + "."; };
fail.message = function() { return 'Expected function to throw an Error, but it threw ' + j$.pp(thrown) + '.'; };
return fail;
}
if (arguments.length == 1) {
pass.message = "Expected function not to throw an Error, but it threw " + fnNameFor(thrown) + ".";
pass.message = 'Expected function not to throw an Error, but it threw ' + fnNameFor(thrown) + '.';
return pass;
}
@@ -47,54 +47,54 @@ getJasmineRequireObj().toThrowError = function(j$) {
if (errorType && message) {
if (thrown.constructor == errorType && util.equals(thrown.message, message)) {
pass.message = function() { return "Expected function not to throw " + name + " with message " + j$.pp(message) + "."; };
pass.message = function() { return 'Expected function not to throw ' + name + ' with message ' + j$.pp(message) + '.'; };
return pass;
} else {
fail.message = function() { return "Expected function to throw " + name + " with message " + j$.pp(message) +
", but it threw " + constructorName + " with message " + j$.pp(thrown.message) + "."; };
fail.message = function() { return 'Expected function to throw ' + name + ' with message ' + j$.pp(message) +
', but it threw ' + constructorName + ' with message ' + j$.pp(thrown.message) + '.'; };
return fail;
}
}
if (errorType && regexp) {
if (thrown.constructor == errorType && regexp.test(thrown.message)) {
pass.message = function() { return "Expected function not to throw " + name + " with message matching " + j$.pp(regexp) + "."; };
pass.message = function() { return 'Expected function not to throw ' + name + ' with message matching ' + j$.pp(regexp) + '.'; };
return pass;
} else {
fail.message = function() { return "Expected function to throw " + name + " with message matching " + j$.pp(regexp) +
", but it threw " + constructorName + " with message " + j$.pp(thrown.message) + "."; };
fail.message = function() { return 'Expected function to throw ' + name + ' with message matching ' + j$.pp(regexp) +
', but it threw ' + constructorName + ' with message ' + j$.pp(thrown.message) + '.'; };
return fail;
}
}
if (errorType) {
if (thrown.constructor == errorType) {
pass.message = "Expected function not to throw " + name + ".";
pass.message = 'Expected function not to throw ' + name + '.';
return pass;
} else {
fail.message = "Expected function to throw " + name + ", but it threw " + constructorName + ".";
fail.message = 'Expected function to throw ' + name + ', but it threw ' + constructorName + '.';
return fail;
}
}
if (message) {
if (thrown.message == message) {
pass.message = function() { return "Expected function not to throw an exception with message " + j$.pp(message) + "."; };
pass.message = function() { return 'Expected function not to throw an exception with message ' + j$.pp(message) + '.'; };
return pass;
} else {
fail.message = function() { return "Expected function to throw an exception with message " + j$.pp(message) +
", but it threw an exception with message " + j$.pp(thrown.message) + "."; };
fail.message = function() { return 'Expected function to throw an exception with message ' + j$.pp(message) +
', but it threw an exception with message ' + j$.pp(thrown.message) + '.'; };
return fail;
}
}
if (regexp) {
if (regexp.test(thrown.message)) {
pass.message = function() { return "Expected function not to throw an exception with a message matching " + j$.pp(regexp) + "."; };
pass.message = function() { return 'Expected function not to throw an exception with a message matching ' + j$.pp(regexp) + '.'; };
return pass;
} else {
fail.message = function() { return "Expected function to throw an exception with a message matching " + j$.pp(regexp) +
", but it threw an exception with message " + j$.pp(thrown.message) + "."; };
fail.message = function() { return 'Expected function to throw an exception with a message matching ' + j$.pp(regexp) +
', but it threw an exception with message ' + j$.pp(thrown.message) + '.'; };
return fail;
}
}
@@ -113,34 +113,34 @@ getJasmineRequireObj().toThrowError = function(j$) {
if (expected instanceof RegExp) {
regexp = expected;
} else if (typeof expected == "string") {
} else if (typeof expected == 'string') {
message = expected;
} else if (checkForAnErrorType(expected)) {
errorType = expected;
}
if (!(errorType || message || regexp)) {
throw new Error("Expected is not an Error, string, or RegExp.");
throw new Error('Expected is not an Error, string, or RegExp.');
}
} else {
if (checkForAnErrorType(arguments[1])) {
errorType = arguments[1];
} else {
throw new Error("Expected error type is not an Error.");
throw new Error('Expected error type is not an Error.');
}
if (arguments[2] instanceof RegExp) {
regexp = arguments[2];
} else if (typeof arguments[2] == "string") {
} else if (typeof arguments[2] == 'string') {
message = arguments[2];
} else {
throw new Error("Expected error message is not a string or RegExp.");
throw new Error('Expected error message is not a string or RegExp.');
}
}
}
function checkForAnErrorType(type) {
if (typeof type !== "function") {
if (typeof type !== 'function') {
return false;
}