Index: modules/help/help.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.test,v
retrieving revision 1.2
diff -u -p -r1.2 help.test
--- modules/help/help.test	30 May 2008 07:30:51 -0000	1.2
+++ modules/help/help.test	28 Aug 2008 08:17:48 -0000
@@ -20,11 +20,9 @@ class HelpTestCase extends DrupalWebTest
    * Enable modules and create users with specific permissions.
    */
   function setUp() {
-    parent::setUp();
+    parent::setUp('blog', 'poll');
 
     // Loading these (and other?) modules will result in failures?
-//    $this->drupalModuleEnable('blog');
-//    $this->drupalModuleEnable('poll');
     $this->getModuleList();
 
     // Create users.
@@ -43,6 +41,19 @@ class HelpTestCase extends DrupalWebTest
     // Login the regular user.
     $user = $this->drupalLogin($this->any_user);
     $this->verifyHelp(403);
+
+    // Check for css on admin/help
+    $this->drupalLogin($this->big_user);
+    $this->drupalGet('admin/help');
+    $this->assertRaw(drupal_get_path('module', 'help') . '/help.css', t('CSS correctly added to admin/help'));
+
+    // Verify that help topics text appears
+    $this->assertRaw('<h2>' . t('Help topics') . '</h2><p>' . t('Help is available on the following items:') . '</p>', t('Help topics text correctly appears.'));
+
+    // Make sure links are properly added for modules implementing hook_help().
+    foreach ($this->modules as $module => $name) {
+      $this->assertRaw('<a href="/admin/help/' . $module . '">' . $name . '</a>', t('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
+    } 
   }
 
   /**
@@ -58,10 +69,6 @@ class HelpTestCase extends DrupalWebTest
       $this->drupalGet('admin/help/' . $module);
       $this->assertResponse($response);
       if ($response == 200) {
-        // NOTE: The asserts fail on blog and poll because the get returns the 'admin/help' node instead of the indicated node???
-//        if ($module == 'blog' || $module == 'poll') {
-//          continue;
-//        }
         $this->assertTitle($name . ' | Drupal', t('[' . $module . '] Title was displayed'));
         $this->assertRaw('<h2>' . t($name) . '</h2>', t('[' . $module . '] Heading was displayed'));
         $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'), t('[' . $module . '] Breadcrumbs were displayed'));