Comparing version 1.0.0-alpha.1 to 1.0.0-alpha.2
@@ -11,3 +11,3 @@ "use strict"; | ||
function ContentsMatchError(actualValue, expectedContent, shouldMatch) { | ||
_super.call(this, actualValue, expectedContent, "Expected " + actualValue + " " + (!shouldMatch ? "not " : "") + "to contain " + expectedContent + "."); | ||
_super.call(this, actualValue, expectedContent, "Expected " + JSON.stringify(actualValue) + " " + (!shouldMatch ? "not " : "") + "to contain " + JSON.stringify(expectedContent) + "."); | ||
} | ||
@@ -14,0 +14,0 @@ return ContentsMatchError; |
@@ -11,3 +11,3 @@ "use strict"; | ||
function RegexMatchError(actualValue, expectedRegex, shouldMatch) { | ||
_super.call(this, actualValue, expectedRegex, "Expected " + JSON.stringify(actualValue) + " " + (!shouldMatch ? "not " : "") + " to conform to to " + expectedRegex + "."); | ||
_super.call(this, actualValue, expectedRegex, "Expected " + JSON.stringify(actualValue) + " " + (!shouldMatch ? "not " : "") + "to conform to " + expectedRegex + "."); | ||
} | ||
@@ -14,0 +14,0 @@ return RegexMatchError; |
@@ -85,3 +85,3 @@ "use strict"; | ||
Matcher.prototype.toBeLessThan = function (upperLimit) { | ||
if (this._actualValue > upperLimit === this._shouldMatch) { | ||
if (this._actualValue < upperLimit !== this._shouldMatch) { | ||
throw new less_than_match_error_1.LessThanMatchError(this._actualValue, upperLimit, this._shouldMatch); | ||
@@ -91,3 +91,3 @@ } | ||
Matcher.prototype.toBeGreaterThan = function (lowerLimit) { | ||
if (this._actualValue < lowerLimit === this._shouldMatch) { | ||
if (this._actualValue > lowerLimit !== this._shouldMatch) { | ||
throw new greater_than_match_error_1.GreaterThanMatchError(this._actualValue, lowerLimit, this._shouldMatch); | ||
@@ -94,0 +94,0 @@ } |
@@ -11,2 +11,3 @@ "use strict"; | ||
this._currentTestCaseIndex = 0; | ||
this._testsFailed = false; | ||
this._getTestDescription = function (test, testCaseArguments) { | ||
@@ -78,2 +79,3 @@ var testDescription = _this._currentTestId + " - " + test.description; | ||
TestRunner.prototype._handleError = function (error, test, testCaseArguments) { | ||
this._testsFailed = true; | ||
process.stdout.write("not ok " + this._getTestDescription(test, testCaseArguments) + "\n"); | ||
@@ -104,3 +106,8 @@ if (error instanceof match_error_1.MatchError) { | ||
TestRunner.prototype._exit = function () { | ||
process.exit(0); | ||
if (this._testsFailed) { | ||
process.exit(1); | ||
} | ||
else { | ||
process.exit(0); | ||
} | ||
}; | ||
@@ -107,0 +114,0 @@ TestRunner.prototype._runNextTestFixture = function () { |
{ | ||
"name": "alsatian", | ||
"version": "1.0.0-alpha.1", | ||
"version": "1.0.0-alpha.2", | ||
"description": "TypeScript testing framework with test cases", | ||
@@ -12,6 +12,6 @@ "main": "./core/alsatian-core.js", | ||
"postinstall": "npm run build", | ||
"test": "node ./cli/alsatian-cli.js \"test/**/*.spec.js\"", | ||
"test": "npm run unit-tests", | ||
"test-dot": "node ./cli/alsatian-cli.js ./test/**/*.spec.js | tap-dot", | ||
"test-spec": "node ./cli/alsatian-cli.js ./test/**/*.spec.js | tap-spec", | ||
"test-cover": "istanbul cover ./cli/alsatian-cli.js ./test/**/*.spec.js && npm run remap-coverage", | ||
"unit-tests": "istanbul cover ./cli/alsatian-cli.js \"./test/**/*.spec.js\" && npm run remap-coverage", | ||
"remap-coverage": "remap-istanbul -i coverage/coverage.json --output coverage/report --type html" | ||
@@ -41,2 +41,3 @@ }, | ||
"devDependencies": { | ||
"codeclimate-test-reporter": "^0.3.3", | ||
"istanbul": "^0.4.3", | ||
@@ -43,0 +44,0 @@ "remap-istanbul": "^0.6.4", |
@@ -306,3 +306,3 @@ # alsatian | ||
### Focussing Tests | ||
### Focusing Tests | ||
@@ -309,0 +309,0 @@ You can run a single test or select tests using the ```FocusTest``` annotation |
@@ -63,4 +63,12 @@ { | ||
"./test/unit-tests/decorators/test.spec.ts", | ||
"./test/unit-tests/errors/contents-match-error.spec.ts", | ||
"./test/unit-tests/errors/equal-match-error.spec.ts", | ||
"./test/unit-tests/errors/error-match-error.spec.ts", | ||
"./test/unit-tests/errors/exact-match-error.spec.ts", | ||
"./test/unit-tests/errors/greater-than-match-error.spec.ts", | ||
"./test/unit-tests/errors/less-than-match-error.spec.ts", | ||
"./test/unit-tests/errors/regex-match-error.spec.ts", | ||
"./test/unit-tests/errors/truthy-match-error.spec.ts", | ||
"./test/unit-tests/expect-tests/to-be-defined.spec.ts", | ||
"./test/unit-tests/expect-tests/to-be-greater-than.spec.ts", | ||
"./test/unit-tests/expect-tests/to-be-null.spec.ts", | ||
@@ -67,0 +75,0 @@ "./test/unit-tests/expect-tests/to-be.spec.ts", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
575627
113
1722
5