Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2380411 by areke, hussainweb, GPrince17: Clean-up Text module test members - ensure property definition and use of camelCase naming convention

8.0.x
Alex Pott 2014-12-04 11:33:34 +00:00
parent 5e83b6c6e3
commit 86ced511f9
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/modules/field/src/Tests/String/StringFieldTest.php
View File

@ -33,13 +33,18 @@ class StringFieldTest extends WebTestBase {
*/
public static $modules = array('entity_test');
protected $web_user;
/**
* A user without any special permissions.
*
* @var \Drupal\user\UserInterface
*/
protected $webUser;
protected function setUp() {
parent::setUp();
$this->web_user = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
$this->drupalLogin($this->web_user);
$this->webUser = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
$this->drupalLogin($this->webUser);
}
// Test fields.

19
core/modules/text/src/Tests/TextFieldTest.php
View File

@ -18,12 +18,17 @@ use Drupal\field\Tests\String\StringFieldTest;
*/
class TextFieldTest extends StringFieldTest {
protected $admin_user;
/**
* A user with relevant administrative privileges.
*
* @var \Drupal\user\UserInterface
*/
protected $adminUser;
protected function setUp() {
parent::setUp();
$this->admin_user = $this->drupalCreateUser(array('administer filters'));
$this->adminUser = $this->drupalCreateUser(array('administer filters'));
}
// Test fields.
@ -106,13 +111,13 @@ class TextFieldTest extends StringFieldTest {
->save();
// Disable all text formats besides the plain text fallback format.
$this->drupalLogin($this->admin_user);
$this->drupalLogin($this->adminUser);
foreach (filter_formats() as $format) {
if (!$format->isFallbackFormat()) {
$this->drupalPostForm('admin/config/content/formats/manage/' . $format->format . '/disable', array(), t('Disable'));
}
}
$this->drupalLogin($this->web_user);
$this->drupalLogin($this->webUser);
// Display the creation form. Since the user only has access to one format,
// no format selector will be displayed.
@ -140,7 +145,7 @@ class TextFieldTest extends StringFieldTest {
// Create a new text format that does not escape HTML, and grant the user
// access to it.
$this->drupalLogin($this->admin_user);
$this->drupalLogin($this->adminUser);
$edit = array(
'format' => Unicode::strtolower($this->randomMachineName()),
'name' => $this->randomMachineName(),
@ -150,10 +155,10 @@ class TextFieldTest extends StringFieldTest {
$format = entity_load('filter_format', $edit['format']);
$format_id = $format->format;
$permission = $format->getPermissionName();
$roles = $this->web_user->getRoles();
$roles = $this->webUser->getRoles();
$rid = $roles[0];
user_role_grant_permissions($rid, array($permission));
$this->drupalLogin($this->web_user);
$this->drupalLogin($this->webUser);
// Display edition form.
// We should now have a 'text format' selector.