Commit d2057005 authored by Nejc Koporec's avatar Nejc Koporec Committed by Jakob P
Browse files

Issue #3308288 by japerry: Fix broken tests

parent f9204db2

drupalci.yml

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ build: 
        sniff-all-files: true

        halt-on-fail: false

    testing:

      container_command:

        commands:

          - 'mkdir /var/www/html/vfs:'

          - 'chmod 0777 /var/www/html/vfs:'

      run_tests.standard:

        types: 'PHPUnit-Unit,PHPUnit-Kernel,PHPUnit-Functional'

        testgroups: '--all'

modules/purge_queuer_coretags/tests/src/Functional/QueuerConfigFormTest.php

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
namespace Drupal\Tests\purge_queuer_coretags\Functional;



use Drupal\purge_queuer_coretags\Form\ConfigurationForm;

use Drupal\Tests\purge_ui\Functional\Form\Config\QueuerConfigFormTestBase;

use Drupal\Tests\purge_ui\FunctionalJavascript\Form\Config\QueuerConfigFormTestBase;



/**

 * Tests \Drupal\purge_queuer_coretags\Form\ConfigurationForm.
@@ -55,7 +55,7 @@ class QueuerConfigFormTest extends QueuerConfigFormTestBase { 
    $this->assertSession()->responseContains('value="config:field.storage"');

    $this->assertSession()->responseContains('value="route_match"');

    $this->assertSession()->responseContains('value="routes"');

    $this->assertSession()->pageTextContains('Add prefix');

    $this->assertSession()->buttonExists('Add prefix');

    $this->assertSession()->pageTextContains('if you know what you are doing');

  }

modules/purge_ui/src/Form/ProcessorAddForm.php

+9 −7
Original line number Diff line number Diff line
@@ -76,13 +76,15 @@ class ProcessorAddForm extends ConfigFormBase { 
    ];



    // Update the buttons and bind callbacks.

    if (count($options)) {

      $form['actions']['submit'] = [

      '#access' => count($options),

        '#type' => 'submit',

        '#button_type' => 'primary',

        '#value' => $this->t("Add"),

        '#ajax' => ['callback' => '::addProcessor'],

      ];

    }



    $form['actions']['cancel'] = [

      '#type' => 'submit',

      '#value' => $this->t('Cancel'),

modules/purge_ui/src/Form/PurgerAddForm.php

+9 −7
Original line number Diff line number Diff line
@@ -81,13 +81,15 @@ class PurgerAddForm extends ConfigFormBase { 
    ];



    // Update the buttons and bind callbacks.

    if (count($plugins)) {

      $form['actions']['submit'] = [

      '#access' => (bool) count($plugins),

        '#type' => 'submit',

        '#button_type' => 'primary',

        '#value' => $this->t("Add"),

        '#ajax' => ['callback' => '::addPurger'],

      ];

    }



    $form['actions']['cancel'] = [

      '#type' => 'submit',

      '#value' => $this->t('Cancel'),

modules/purge_ui/src/Form/QueuerAddForm.php

+9 −7
Original line number Diff line number Diff line
@@ -76,13 +76,15 @@ class QueuerAddForm extends ConfigFormBase { 
    ];



    // Update the buttons and bind callbacks.

    if (count($options)) {

      $form['actions']['submit'] = [

      '#access' => count($options),

        '#type' => 'submit',

        '#button_type' => 'primary',

        '#value' => $this->t("Add"),

        '#ajax' => ['callback' => '::addQueuer'],

      ];

    }



    $form['actions']['cancel'] = [

      '#type' => 'submit',

      '#value' => $this->t('Cancel'),