From 39c302eec0a64183207bbbf7cc6bb7adfae16ef7 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Tue, 2 Jun 2009 03:33:36 +0000 Subject: #475596 by emmajane, catch, yoroy, et al. Move default welcome message to help system. --- modules/simpletest/simpletest.test | 2 +- modules/simpletest/tests/common.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/simpletest') diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index 227aa13e7..45d2d15b4 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -45,7 +45,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { if (!$this->inCURL()) { $this->drupalGet('node'); $this->assertTrue($this->drupalGetHeader('Date'), t('An HTTP header was received.')); - $this->assertTitle(variable_get('site_name', 'Drupal'), t('Site title matches.')); + $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.')); $this->assertNoTitle('Foo', t('Site title does not match.')); // Make sure that we are locked out of the installer when prefixing // using the user-agent header. This is an important security check. diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index 284313725..9b91d5775 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -302,7 +302,7 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase { $result = drupal_http_request(url('node', array('absolute' => TRUE))); $this->assertEqual($result->code, 200, t('Fetched page successfully.')); $this->drupalSetContent($result->data); - $this->assertTitle(variable_get('site_name', 'Drupal'), t('Site title matches.')); + $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.')); // Test that code and status message is returned. $result = drupal_http_request(url('pagedoesnotexist', array('absolute' => TRUE))); -- cgit v1.2.3