Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating tests to reflect changes in default bake templates.

  • Loading branch information...
commit 382488a9a7e1c81f4043ba114d7e90066f086ed3 1 parent 7d4bc20
@markstory markstory authored
Showing with 13 additions and 13 deletions.
  1. +13 −13 cake/tests/cases/console/libs/tasks/view.test.php
View
26 cake/tests/cases/console/libs/tasks/view.test.php
@@ -165,10 +165,10 @@ function testGetContent() {
);
$result = $this->Task->getContent('view', $vars);
- $this->assertPattern('/Delete Test View Model/', $result);
- $this->assertPattern('/Edit Test View Model/', $result);
- $this->assertPattern('/List Test View Models/', $result);
- $this->assertPattern('/New Test View Model/', $result);
+ $this->assertPattern('/Delete .+Test View Model/', $result);
+ $this->assertPattern('/Edit .+Test View Model/', $result);
+ $this->assertPattern('/List .+Test View Models/', $result);
+ $this->assertPattern('/New .+Test View Model/', $result);
$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
@@ -197,10 +197,10 @@ function testGetContentWithAdminAction() {
);
$result = $this->Task->getContent('admin_view', $vars);
- $this->assertPattern('/Delete Test View Model/', $result);
- $this->assertPattern('/Edit Test View Model/', $result);
- $this->assertPattern('/List Test View Models/', $result);
- $this->assertPattern('/New Test View Model/', $result);
+ $this->assertPattern('/Delete .+Test View Model/', $result);
+ $this->assertPattern('/Edit .+Test View Model/', $result);
+ $this->assertPattern('/List .+Test View Models/', $result);
+ $this->assertPattern('/New .+Test View Model/', $result);
$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
@@ -264,7 +264,7 @@ function testBakeActions() {
));
$this->Task->expectAt(1, 'createFile', array(
TMP . 'view_task_comments' . DS . 'edit.ctp',
- new PatternExpectation('/Edit View Task Comment/')
+ new PatternExpectation('/Edit .+View Task Comment/')
));
$this->Task->expectAt(2, 'createFile', array(
TMP . 'view_task_comments' . DS . 'index.ctp',
@@ -390,11 +390,11 @@ function testExecuteInteractive() {
));
$this->Task->expectAt(2, 'createFile', array(
TMP . 'view_task_comments' . DS . 'add.ctp',
- new PatternExpectation('/Add View Task Comment/')
+ new PatternExpectation('/Add .+View Task Comment/')
));
$this->Task->expectAt(3, 'createFile', array(
TMP . 'view_task_comments' . DS . 'edit.ctp',
- new PatternExpectation('/Edit View Task Comment/')
+ new PatternExpectation('/Edit .+View Task Comment/')
));
$this->Task->execute();
@@ -445,11 +445,11 @@ function testExecuteInteractiveWithAdmin() {
));
$this->Task->expectAt(2, 'createFile', array(
TMP . 'view_task_comments' . DS . 'admin_add.ctp',
- new PatternExpectation('/Add View Task Comment/')
+ new PatternExpectation('/Add .+View Task Comment/')
));
$this->Task->expectAt(3, 'createFile', array(
TMP . 'view_task_comments' . DS . 'admin_edit.ctp',
- new PatternExpectation('/Edit View Task Comment/')
+ new PatternExpectation('/Edit .+View Task Comment/')
));
$this->Task->execute();
Please sign in to comment.
Something went wrong with that request. Please try again.