diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php index 9b3f1b8..441e9e7 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php @@ -38,22 +38,22 @@ class LanguageCustomLanguageConfigurationTest extends WebTestBase { public function testLanguageConfiguration() { global $base_url; - // User to add and remove language. + // Create user with permissions to add and remove languages. $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); $this->drupalLogin($admin_user); // Add custom language. - // Test validation on missing values. $edit = array( 'predefined_langcode' => 'custom', ); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + // Test validation on missing values. $this->assertText(t('!name field is required.', array('!name' => t('Language code')))); $this->assertText(t('!name field is required.', array('!name' => t('Language name')))); $this->assertText(t('!name field is required.', array('!name' => t('Direction')))); - $this->assertEqual($this->getUrl(), url('admin/config/regional/language/add', array('absolute' => TRUE)), t('Correct page redirection.')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/language/add', array('absolute' => TRUE)), 'Correct page redirection.'); - // Test validation off invalid values. + // Test validation of invalid values. $edit = array( 'predefined_langcode' => 'custom', 'langcode' => 'white space', @@ -63,29 +63,30 @@ class LanguageCustomLanguageConfigurationTest extends WebTestBase { $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); $this->assertRaw(t('%field may only contain characters a-z, underscores, or hyphens.', array('%field' => t('Language code')))); $this->assertRaw(t('%field cannot contain any markup.', array('%field' => t('Language name')))); - $this->assertEqual($this->getUrl(), url('admin/config/regional/language/add', array('absolute' => TRUE)), t('Correct page redirection.')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/language/add', array('absolute' => TRUE)), 'Correct page redirection.'); - // Test validation off existing language values. + // Test validation of existing language values. $edit = array( 'predefined_langcode' => 'custom', 'langcode' => 'de', 'name' => 'German', 'direction' => LANGUAGE_LTR, ); + // Add the language the first time. $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); $this->assertRaw(t( 'The language %language has been created and can now be used.', array('%language' => $edit['name']) )); - $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), 'Correct page redirection.'); - // Add the language a second time. + // Add the language a second time and confirm that this is not allowed. $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); $this->assertRaw(t( 'The language %language (%langcode) already exists.', array('%language' => $edit['name'], '%langcode' => $edit['langcode']) )); - $this->assertEqual($this->getUrl(), url('admin/config/regional/language/add', array('absolute' => TRUE)), t('Correct page redirection.')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/language/add', array('absolute' => TRUE)), 'Correct page redirection.'); } }