Verified Commit ba111c10 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3272354 by danflanagan8: Filter tests should not rely on Classy

parent 946d5a31

core/modules/filter/tests/src/Functional/FilterAdminTest.php

+10 −10
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class FilterAdminTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * A user with administration permissions.
@@ -178,7 +178,7 @@ public function testFormatAdmin() { 
    ];

    $this->drupalGet('admin/config/content/formats/add');

    $this->submitForm($edit, 'Save configuration');

    $this->assertSession()->pageTextContains('The machine-readable name is already in use. It must be unique.');

    $this->assertSession()->statusMessageContains('The machine-readable name is already in use. It must be unique.', 'error');



    // Attempt to create a format of the same human readable name as the

    // disabled format but with a different machine name.
@@ -188,7 +188,7 @@ public function testFormatAdmin() { 
    ];

    $this->drupalGet('admin/config/content/formats/add');

    $this->submitForm($edit, 'Save configuration');

    $this->assertSession()->pageTextContains("Text format names must be unique. A format named $name already exists.");

    $this->assertSession()->statusMessageContains("Text format names must be unique. A format named $name already exists.", 'error');

  }



  /**
@@ -266,7 +266,7 @@ public function testFilterAdmin() { 
    $this->drupalGet('admin/config/content/formats/add');

    $this->submitForm($edit, 'Save configuration');

    $this->assertSession()->addressEquals('admin/config/content/formats');

    $this->assertSession()->pageTextContains("Added text format {$edit['name']}.");

    $this->assertSession()->statusMessageContains("Added text format {$edit['name']}.", 'status');



    filter_formats_reset();

    $format = FilterFormat::load($edit['format']);
@@ -284,7 +284,7 @@ public function testFilterAdmin() { 
    $this->drupalGet('admin/config/content/formats/manage/' . $format->id() . '/disable');

    $this->submitForm([], 'Disable');

    $this->assertSession()->addressEquals('admin/config/content/formats');

    $this->assertSession()->pageTextContains("Disabled text format {$edit['name']}.");

    $this->assertSession()->statusMessageContains("Disabled text format {$edit['name']}.", 'status');

    \Drupal::entityTypeManager()->getStorage('user_role')->resetCache([RoleInterface::AUTHENTICATED_ID]);

    $role = Role::load(RoleInterface::AUTHENTICATED_ID);

    $this->assertFalse($role->hasPermission($format->getPermissionName()), 'The filter permission has been removed from the authenticated role');
@@ -297,7 +297,7 @@ public function testFilterAdmin() { 
    $this->drupalGet('admin/config/content/formats/manage/' . $full);

    $this->submitForm($edit, 'Save configuration');

    $this->assertSession()->addressEquals('admin/config/content/formats/manage/' . $full);

    $this->assertSession()->pageTextContains("The text format {$format->label()} has been updated.");

    $this->assertSession()->statusMessageContains("The text format {$format->label()} has been updated.", 'status');



    // Switch user.

    $this->drupalLogin($this->webUser);
@@ -316,10 +316,10 @@ public function testFilterAdmin() { 
    $edit['body[0][format]'] = $basic;

    $this->drupalGet('node/add/page');

    $this->submitForm($edit, 'Save');

    $this->assertSession()->pageTextContains('Basic page ' . $edit['title[0][value]'] . ' has been created.');

    $this->assertSession()->statusMessageContains('Basic page ' . $edit['title[0][value]'] . ' has been created.', 'status');



    // Verify that the creation message contains a link to a node.

    $this->assertSession()->elementExists('xpath', '//div[contains(@class, "messages")]//a[contains(@href, "node/")]');

    $this->assertSession()->elementExists('xpath', '//div[@aria-label="Status message"]//a[contains(@href, "node/")]');



    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);

    $this->assertNotEmpty($node, 'Node found in database.');
@@ -363,7 +363,7 @@ public function testFilterAdmin() { 
    $this->drupalGet('admin/config/content/formats/manage/' . $full);

    $this->submitForm($edit, 'Save configuration');

    $this->assertSession()->addressEquals('admin/config/content/formats/manage/' . $full);

    $this->assertSession()->pageTextContains("The text format {$format->label()} has been updated.");

    $this->assertSession()->statusMessageContains("The text format {$format->label()} has been updated.", 'status');

    $this->drupalGet('admin/config/content/formats/manage/' . $full);

    $this->assertSession()->fieldValueEquals('roles[' . RoleInterface::AUTHENTICATED_ID . ']', $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']']);
@@ -389,7 +389,7 @@ public function testUrlFilterAdmin() { 
    ];

    $this->drupalGet('admin/config/content/formats/manage/basic_html');

    $this->submitForm($edit, 'Save configuration');

    $this->assertSession()->pageTextNotContains("The text format Basic HTML has been updated.");

    $this->assertSession()->statusMessageNotContains('The text format Basic HTML has been updated.');

  }



  /**

core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php

+2 −2
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ public function testFormatWidgetPermissions() { 
    $edit['title[0][value]'] = $new_title;

    $this->drupalGet('node/' . $node->id() . '/edit');

    $this->submitForm($edit, 'Save');

    $this->assertSession()->pageTextContains('Text format field is required.');

    $this->assertSession()->statusMessageContains('Text format field is required.', 'error');

    $this->drupalGet('node/' . $node->id());

    $this->assertSession()->pageTextContains($old_title);

    $this->assertSession()->pageTextNotContains($new_title);
@@ -320,7 +320,7 @@ public function testFormatWidgetPermissions() { 
    $edit['title[0][value]'] = $new_title;

    $this->drupalGet('node/' . $node->id() . '/edit');

    $this->submitForm($edit, 'Save');

    $this->assertSession()->pageTextContains('Text format field is required.');

    $this->assertSession()->statusMessageContains('Text format field is required.', 'error');

    $this->drupalGet('node/' . $node->id());

    $this->assertSession()->pageTextContains($old_title);

    $this->assertSession()->pageTextNotContains($new_title);