Commit 2fa8808d 2fa8808d2c5bff777ea562083dd13c0f9cfd474c by Nicolas Perriault

Merge branch 'pr-190'

2 parents cdc78cfa e55c9ffd
...@@ -272,7 +272,7 @@ var Tester = function Tester(casper, options) { ...@@ -272,7 +272,7 @@ var Tester = function Tester(casper, options) {
272 this.assertExists = this.assertExist = this.assertSelectorExists = this.assertSelectorExist = function assertExists(selector, message) { 272 this.assertExists = this.assertExist = this.assertSelectorExists = this.assertSelectorExist = function assertExists(selector, message) {
273 return this.assert(casper.exists(selector), message, { 273 return this.assert(casper.exists(selector), message, {
274 type: "assertExists", 274 type: "assertExists",
275 standard: f("Found an element matching %s", this.colorize(selector, 'COMMENT')), 275 standard: f("Found an element matching: %s", selector),
276 values: { 276 values: {
277 selector: selector 277 selector: selector
278 } 278 }
...@@ -290,7 +290,7 @@ var Tester = function Tester(casper, options) { ...@@ -290,7 +290,7 @@ var Tester = function Tester(casper, options) {
290 this.assertDoesntExist = this.assertNotExists = function assertDoesntExist(selector, message) { 290 this.assertDoesntExist = this.assertNotExists = function assertDoesntExist(selector, message) {
291 return this.assert(!casper.exists(selector), message, { 291 return this.assert(!casper.exists(selector), message, {
292 type: "assertDoesntExist", 292 type: "assertDoesntExist",
293 standard: f("No element matching selector %s is found", this.colorize(selector, 'COMMENT')), 293 standard: f("No element found matching selector: %s", selector),
294 values: { 294 values: {
295 selector: selector 295 selector: selector
296 } 296 }
...@@ -308,7 +308,7 @@ var Tester = function Tester(casper, options) { ...@@ -308,7 +308,7 @@ var Tester = function Tester(casper, options) {
308 var currentHTTPStatus = casper.currentHTTPStatus; 308 var currentHTTPStatus = casper.currentHTTPStatus;
309 return this.assert(this.testEquals(casper.currentHTTPStatus, status), message, { 309 return this.assert(this.testEquals(casper.currentHTTPStatus, status), message, {
310 type: "assertHttpStatus", 310 type: "assertHttpStatus",
311 standard: f("HTTP status code is %s", this.colorize(status, 'COMMENT')), 311 standard: f("HTTP status code is: %s", status),
312 values: { 312 values: {
313 current: currentHTTPStatus, 313 current: currentHTTPStatus,
314 expected: status 314 expected: status
...@@ -466,7 +466,7 @@ var Tester = function Tester(casper, options) { ...@@ -466,7 +466,7 @@ var Tester = function Tester(casper, options) {
466 var currentTitle = casper.getTitle(); 466 var currentTitle = casper.getTitle();
467 return this.assert(this.testEquals(currentTitle, expected), message, { 467 return this.assert(this.testEquals(currentTitle, expected), message, {
468 type: "assertTitle", 468 type: "assertTitle",
469 standard: f('Page title is "%s"', this.colorize(expected, 'COMMENT')), 469 standard: f('Page title is: "%s"', expected),
470 values: { 470 values: {
471 subject: currentTitle, 471 subject: currentTitle,
472 expected: expected 472 expected: expected
...@@ -505,7 +505,7 @@ var Tester = function Tester(casper, options) { ...@@ -505,7 +505,7 @@ var Tester = function Tester(casper, options) {
505 var actual = utils.betterTypeOf(subject); 505 var actual = utils.betterTypeOf(subject);
506 return this.assert(this.testEquals(actual, type), message, { 506 return this.assert(this.testEquals(actual, type), message, {
507 type: "assertType", 507 type: "assertType",
508 standard: f('Subject type is "%s"', this.colorize(type, 'COMMENT')), 508 standard: f('Subject type is: "%s"', type),
509 values: { 509 values: {
510 subject: subject, 510 subject: subject,
511 type: type, 511 type: type,
......