[pLog-svn] r6665 - plog/branches/lifetype-1.2/class/test/tests/ui

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2008-06-23 16:33:19 -0400 (Mon, 23 Jun 2008)
New Revision: 6665

Modified:
   plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php
   plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php
Log:
same new post check as rev 6664, working on permission test

Modified: plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php	2008-06-23 20:30:56 UTC (rev 6664)
+++ plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php	2008-06-23 20:33:19 UTC (rev 6665)
@@ -125,7 +125,7 @@
 							"op" => "blogSelect",
 							"blogId" => $this->blog->getId()
 						),
-						"expected" => "New Post",
+                        "expected" => "<b><a href=\"?op=newPost\">New Post",
 						"message" => "The blog could not be selected after the dashboard"
 					),
 					"logout" => Array(

Modified: plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php	2008-06-23 20:30:56 UTC (rev 6664)
+++ plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php	2008-06-23 20:33:19 UTC (rev 6665)
@@ -15,6 +15,7 @@
 		function setUp()
 		{
 			$this->user = TestTools::createAdminUser();
+
 			$this->blog = TestTools::createBlog( $this->user->getId());
 		}
 		
@@ -51,7 +52,7 @@
 							"op" => "blogSelect",
 							"blogId" => $this->blog->getId()
 						),
-						"expected" => "New Post",
+                        "expected" => "<b><a href=\"?op=newPost\">New Post",
 						"message" => "The blog could not be selected after the dashboard"
 					)
 				)
@@ -65,7 +66,7 @@
 						"type" => "get",
 						"params" => Array( "op" => "newPermission" ),
 						"expected" => "Unique name for the new permission",
-						"message" => "The form to input a new permission was not successfully displayed"						
+						"message" => "The form to input a new permission was not successfully displayed"
 					),
 					"create_permission" => Array(
 						"url" => $this->getAdminUrl(),
@@ -77,12 +78,13 @@
 				)
 			);
 			
-			// find the category in the db...
+			// find the permission in the db...
 			$perms = new Permissions();
 			$perm = $perms->getPermissionByName( $permName );
 			
 			if( !$perm ) {
-				die("FATAL: The permission was not successfully added and the test cannot continue" );
+                print "FATAL: The permission was not successfully added and the test cannot continue";
+                return;
 			}
 			
 			// ...and delete it via the UI
@@ -130,7 +132,7 @@
 							"op" => "blogSelect",
 							"blogId" => $this->blog->getId()
 						),
-						"expected" => "New Post",
+                        "expected" => "<b><a href=\"?op=newPost\">New Post",
 						"message" => "The blog could not be selected after the dashboard"
 					)
 				)
@@ -156,12 +158,13 @@
 				)
 			);
 			
-			// find the category in the db...
+			// find the permission in the db...
 			$perms = new Permissions();
 			$perm = $perms->getPermissionByName( $permName );
 			
 			if( !$perm ) {
-				die("FATAL: The permission was not successfully added and the test cannot continue" );
+				print "FATAL: The permission was not successfully added and the test cannot continue";
+                return;
 			}
 			
 			// ...and delete it via the UI