Verified Commit d15c4314 authored by Jess's avatar Jess
Browse files

Issue #3391786 by quietone, xjm, smustgrave: Fix spelling of words only...

Issue #3391786 by quietone, xjm, smustgrave: Fix spelling of words only misspelled in tests, variable names, part 5

(cherry picked from commit 6dc9ce0b)
parent 0f92317d
Loading
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ arrowthick
arrowthickstop
arrr
assertable
attrval
attrvals
authless
autocompletefocus
autocompleteselect
@@ -73,7 +71,6 @@ barchart
barqux
basefield
basepath
basestrings
basetheme
bazbaz
beatle
@@ -212,7 +209,6 @@ cweagans
cádiz
dailymotion
databasename
datas
datelist
daterange
datestamp
@@ -272,7 +268,6 @@ drivertext
dropbutton
dropbuttons
drudbal
drupaldatetime
drupaldevdays
drupalelementstyle
drupalelementstylecommand
@@ -380,7 +375,6 @@ functionaltest
funic
furchtbar
gabilondo
gethttpclient
gids
gloop
gnumeric
@@ -582,7 +576,6 @@ negotiatiors
newcol
newfieldinitial
newnode
newterm
newwin
nids
nightwatch
@@ -591,7 +584,6 @@ nikic
nmsgid
nmsgstr
nntp
noaccess
noadd
nocache
nocase
@@ -746,7 +738,6 @@ rasterizable
rasterizes
rawurlencoded
readmore
readonlydir
realpaths
realword
rebuilder
@@ -926,11 +917,8 @@ tabwidth
tappable
tarz
taskless
tbodies
tcomment
tempfile
templating
tempuser
tercera
testajax
testattribute
@@ -956,14 +944,12 @@ testload
testlogger
testname
testproject
teststring
testsuite
testsuites
textareas
textboxes
texte
textfields
textfile
textformat
textgroup
textwithsummary
+5 −5
Original line number Diff line number Diff line
@@ -826,14 +826,14 @@ protected function assertLogMessage(string $log_message, string $message): void
   */
  public function testTemporaryUser() {
    // Create a temporary user.
    $tempuser = $this->drupalCreateUser();
    $tempuser_uid = $tempuser->id();
    $temporary_user = $this->drupalCreateUser();
    $temporary_user_uid = $temporary_user->id();

    // Log in as the admin user.
    $this->drupalLogin($this->adminUser);

    // Generate a single watchdog entry.
    $this->generateLogEntries(1, ['user' => $tempuser, 'uid' => $tempuser_uid]);
    $this->generateLogEntries(1, ['user' => $temporary_user, 'uid' => $temporary_user_uid]);
    $query = Database::getConnection()->select('watchdog');
    $query->addExpression('MAX([wid])');
    $wid = $query->execute()->fetchField();
@@ -843,8 +843,8 @@ public function testTemporaryUser() {
    $this->assertSession()->pageTextContains('Dblog test log message');

    // Delete the user.
    $tempuser->delete();
    $this->drupalGet('user/' . $tempuser_uid);
    $temporary_user->delete();
    $this->drupalGet('user/' . $temporary_user_uid);
    $this->assertSession()->statusCodeEquals(404);

    // Check if the full message displays on the details page.
+3 −3
Original line number Diff line number Diff line
@@ -548,8 +548,8 @@ public function testErrorMessagesAreNotChanged() {
   * Tests that multiple validation errors are combined in one message.
   */
  public function testCombinedErrorMessages() {
    $textfile = current($this->drupalGetTestFiles('text'));
    $this->assertFileExists($textfile->uri);
    $text_file = current($this->drupalGetTestFiles('text'));
    $this->assertFileExists($text_file->uri);

    /** @var \Drupal\Core\File\FileSystemInterface $file_system */
    $file_system = \Drupal::service('file_system');
@@ -565,7 +565,7 @@ public function testCombinedErrorMessages() {
    ];
    $edit += $form->getPhpValues();
    $files['files']['file_test_upload'][0] = $file_system->realpath($this->phpfile->uri);
    $files['files']['file_test_upload'][1] = $file_system->realpath($textfile->uri);
    $files['files']['file_test_upload'][1] = $file_system->realpath($text_file->uri);
    $client->request($form->getMethod(), $form->getUri(), $edit, $files);
    $this->assertSession()->statusCodeEquals(200);
    $this->assertSession()->pageTextContains("Epic upload FAIL!");
+8 −8
Original line number Diff line number Diff line
@@ -36,18 +36,18 @@ public function getHTMLRestrictions() {

    // The configuration system stores FALSE as '0' and TRUE as '1'. Fix that.
    if (isset($restrictions['allowed'])) {
      foreach ($restrictions['allowed'] as $tag => $attrs_or_bool) {
        if (!is_array($attrs_or_bool)) {
          $restrictions['allowed'][$tag] = (bool) $attrs_or_bool;
      foreach ($restrictions['allowed'] as $tag => $attributes_or_bool) {
        if (!is_array($attributes_or_bool)) {
          $restrictions['allowed'][$tag] = (bool) $attributes_or_bool;
        }
        else {
          foreach ($attrs_or_bool as $attr => $attrvals_or_bool) {
            if (!is_array($attrvals_or_bool)) {
              $restrictions['allowed'][$tag][$attr] = (bool) $attrvals_or_bool;
          foreach ($attributes_or_bool as $attr => $attribute_values_or_bool) {
            if (!is_array($attribute_values_or_bool)) {
              $restrictions['allowed'][$tag][$attr] = (bool) $attribute_values_or_bool;
            }
            else {
              foreach ($attrvals_or_bool as $attrval => $bool) {
                $restrictions['allowed'][$tag][$attr][$attrval] = (bool) $bool;
              foreach ($attribute_values_or_bool as $attribute_value => $bool) {
                $restrictions['allowed'][$tag][$attr][$attribute_value] = (bool) $bool;
              }
            }
          }
+6 −6
Original line number Diff line number Diff line
@@ -240,13 +240,13 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s

      // Repeat this with a different file that we do not have access to and
      // make sure that access is denied.
      $file_noaccess = array_shift($files);
      $original_uri_noaccess = $file_system->copy($file_noaccess->uri, $scheme . '://', FileSystemInterface::EXISTS_RENAME);
      $generated_uri_noaccess = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . $file_system->basename($original_uri_noaccess);
      $this->assertFileDoesNotExist($generated_uri_noaccess);
      $generate_url_noaccess = $this->style->buildUrl($original_uri_noaccess);
      $file_no_access = array_shift($files);
      $original_uri_no_access = $file_system->copy($file_no_access->uri, $scheme . '://', FileSystemInterface::EXISTS_RENAME);
      $generated_uri_no_access = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . $file_system->basename($original_uri_no_access);
      $this->assertFileDoesNotExist($generated_uri_no_access);
      $generate_url_no_access = $this->style->buildUrl($original_uri_no_access);

      $this->drupalGet($generate_url_noaccess);
      $this->drupalGet($generate_url_no_access);
      $this->assertSession()->statusCodeEquals(403);
      // Verify that images are not appended to the response.
      // Currently this test only uses PNG images.
Loading