Index: modules/help/help.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.test,v
retrieving revision 1.6
diff -u -p -r1.6 help.test
--- modules/help/help.test	31 Mar 2009 01:49:52 -0000	1.6
+++ modules/help/help.test	2 Jun 2009 11:39:06 -0000
@@ -8,7 +8,7 @@ class HelpTestCase extends DrupalWebTest
   public static function getInfo() {
     return array(
       'name' => t('Help functionality'),
-      'description' => t('Verify help display and user access to help based on persmissions.'),
+      'description' => t('Verify help display and user access to help based on permissions.'),
       'group' => t('Help'),
     );
   }
@@ -17,11 +17,9 @@ class HelpTestCase extends DrupalWebTest
    * Enable modules and create users with specific permissions.
    */
   function setUp() {
-    parent::setUp();
+    parent::setUp('blog', 'poll', 'help_test');
 
     // Loading these (and other?) modules will result in failures?
-//    $this->drupalModuleEnable('blog');
-//    $this->drupalModuleEnable('poll');
     $this->getModuleList();
 
     // Create users.
@@ -40,6 +38,22 @@ class HelpTestCase extends DrupalWebTest
     // Login the regular 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('The help.css file is present in the HTML.'));
+
+    // Verify that introductory help text exists, goes for 100% module coverage.
+    $this->assertRaw(t('For more information, please refer to the specific topics listed in the next section, or the <a href="@drupal">online Drupal handbooks</a>.', array('@drupal' => 'http://drupal.org/handbooks')), 'Help intro text correctly appears.');
+
+    // 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->assertLink($name, 0, t('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
+    } 
   }
 
   /**
@@ -55,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'));