Commit e55c9ffd e55c9ffdf2933c0194e3d99f6f582bdd364f9c09 by Nicolas Perriault

Merge remote-tracking branch 'starlocke/fix_189' into pr-190

2 parents 8d4083b9 26a85b0e
...@@ -248,7 +248,7 @@ var Tester = function Tester(casper, options) { ...@@ -248,7 +248,7 @@ var Tester = function Tester(casper, options) {
248 this.assertExists = this.assertExist = this.assertSelectorExists = this.assertSelectorExist = function assertExists(selector, message) { 248 this.assertExists = this.assertExist = this.assertSelectorExists = this.assertSelectorExist = function assertExists(selector, message) {
249 return this.assert(casper.exists(selector), message, { 249 return this.assert(casper.exists(selector), message, {
250 type: "assertExists", 250 type: "assertExists",
251 standard: f("Found an element matching %s", this.colorize(selector, 'COMMENT')), 251 standard: f("Found an element matching: %s", selector),
252 values: { 252 values: {
253 selector: selector 253 selector: selector
254 } 254 }
...@@ -266,7 +266,7 @@ var Tester = function Tester(casper, options) { ...@@ -266,7 +266,7 @@ var Tester = function Tester(casper, options) {
266 this.assertDoesntExist = this.assertNotExists = function assertDoesntExist(selector, message) { 266 this.assertDoesntExist = this.assertNotExists = function assertDoesntExist(selector, message) {
267 return this.assert(!casper.exists(selector), message, { 267 return this.assert(!casper.exists(selector), message, {
268 type: "assertDoesntExist", 268 type: "assertDoesntExist",
269 standard: f("No element matching selector %s is found", this.colorize(selector, 'COMMENT')), 269 standard: f("No element found matching selector: %s", selector),
270 values: { 270 values: {
271 selector: selector 271 selector: selector
272 } 272 }
...@@ -284,7 +284,7 @@ var Tester = function Tester(casper, options) { ...@@ -284,7 +284,7 @@ var Tester = function Tester(casper, options) {
284 var currentHTTPStatus = casper.currentHTTPStatus; 284 var currentHTTPStatus = casper.currentHTTPStatus;
285 return this.assert(this.testEquals(casper.currentHTTPStatus, status), message, { 285 return this.assert(this.testEquals(casper.currentHTTPStatus, status), message, {
286 type: "assertHttpStatus", 286 type: "assertHttpStatus",
287 standard: f("HTTP status code is %s", this.colorize(status, 'COMMENT')), 287 standard: f("HTTP status code is: %s", status),
288 values: { 288 values: {
289 current: currentHTTPStatus, 289 current: currentHTTPStatus,
290 expected: status 290 expected: status
...@@ -402,7 +402,7 @@ var Tester = function Tester(casper, options) { ...@@ -402,7 +402,7 @@ var Tester = function Tester(casper, options) {
402 var currentTitle = casper.getTitle(); 402 var currentTitle = casper.getTitle();
403 return this.assert(this.testEquals(currentTitle, expected), message, { 403 return this.assert(this.testEquals(currentTitle, expected), message, {
404 type: "assertTitle", 404 type: "assertTitle",
405 standard: f('Page title is "%s"', this.colorize(expected, 'COMMENT')), 405 standard: f('Page title is: "%s"', expected),
406 values: { 406 values: {
407 subject: currentTitle, 407 subject: currentTitle,
408 expected: expected 408 expected: expected
...@@ -441,7 +441,7 @@ var Tester = function Tester(casper, options) { ...@@ -441,7 +441,7 @@ var Tester = function Tester(casper, options) {
441 var actual = utils.betterTypeOf(subject); 441 var actual = utils.betterTypeOf(subject);
442 return this.assert(this.testEquals(actual, type), message, { 442 return this.assert(this.testEquals(actual, type), message, {
443 type: "assertType", 443 type: "assertType",
444 standard: f('Subject type is "%s"', this.colorize(type, 'COMMENT')), 444 standard: f('Subject type is: "%s"', type),
445 values: { 445 values: {
446 subject: subject, 446 subject: subject,
447 type: type, 447 type: type,
......