Commit a2b248cc authored by Len Swaneveld's avatar Len Swaneveld Committed by Sascha Grossenbacher
Browse files

Issue #2753889 by Lendude, jmuzz, Berdir: Convert ParagraphsTestBase and the...

Issue #2753889 by Lendude, jmuzz, Berdir: Convert ParagraphsTestBase and the easy-to-convert tests extending it to BrowserTestBase
parent 91a50907
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@

namespace Drupal\paragraphs_demo\Tests;

use Drupal\paragraphs\Tests\Classic\ParagraphsCoreVersionUiTestTrait;
use Drupal\simpletest\WebTestBase;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\paragraphs\Traits\ParagraphsCoreVersionUiTestTrait;

/**
 * Tests the demo module for Paragraphs.
 *
 * @group paragraphs
 */
class ParagraphsDemoTest extends WebTestBase {
class ParagraphsDemoTest extends BrowserTestBase {

  use ParagraphsCoreVersionUiTestTrait;

@@ -37,7 +37,7 @@ class ParagraphsDemoTest extends WebTestBase {
  /**
   * Asserts demo paragraphs have been created.
   */
  protected function testConfigurationsAndCreation() {
  public function testConfigurationsAndCreation() {

    // Assert that the demo page is displayed to anymous users.
    $this->drupalGet('');
@@ -76,7 +76,7 @@ class ParagraphsDemoTest extends WebTestBase {

    // Set edit mode to open.
    $this->drupalGet('admin/structure/types/manage/paragraphed_content_demo/form-display');
    $this->drupalPostAjaxForm(NULL, [], "field_paragraphs_demo_settings_edit");
    $this->drupalPostForm(NULL, [], "field_paragraphs_demo_settings_edit");
    $edit = ['fields[field_paragraphs_demo][settings_edit_form][settings][edit_mode]' => 'open'];
    $this->drupalPostForm(NULL, $edit, t('Save'));

+16 −16
Original line number Diff line number Diff line
<?php

namespace Drupal\paragraphs_library\Tests;
namespace Drupal\Tests\paragraphs_library\Functional;

use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\paragraphs\Tests\Experimental\ParagraphsExperimentalTestBase;
use Drupal\Tests\paragraphs\Functional\Experimental\ParagraphsExperimentalTestBase;

/**
 * Tests paragraphs library multilingual functionality.
@@ -79,8 +79,8 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {
  public function testReuseTranslationForNestedParagraphFromLibrary() {
    // Add nested paragraph directly in library.
    $this->drupalGet('admin/content/paragraphs/add/default');
    $this->drupalPostAjaxForm(NULL, NULL, 'paragraphs_nested_paragraph_add_more');
    $this->drupalPostAjaxForm(NULL, NULL, 'paragraphs_0_subform_field_err_field_test_content_add_more');
    $this->drupalPostForm(NULL, NULL, 'paragraphs_nested_paragraph_add_more');
    $this->drupalPostForm(NULL, NULL, 'paragraphs_0_subform_field_err_field_test_content_add_more');
    $edit = [
      'label[0][value]' => 'En label Test nested paragraph',
      'paragraphs[0][subform][field_err_field][0][subform][field_paragraphs_text][0][value]' => 'En label Example text for test in nested paragraph.',
@@ -99,7 +99,7 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Create test content.
    $this->drupalGet('node/add/paragraphed_test');
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_from_library_add_more');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_from_library_add_more');
    $edit = [
      'title[0][value]' => 'En label Test node nested',
      'field_paragraphs[0][subform][field_reusable_paragraph][0][target_id]' => 'En label Test nested paragraph',
@@ -138,8 +138,8 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Add node with text paragraph.
    $this->drupalGet('node/add/paragraphed_test');
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_nested_paragraph_add_more');
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_0_subform_field_err_field_test_content_add_more');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_nested_paragraph_add_more');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_0_subform_field_err_field_test_content_add_more');
    $edit = [
      'title[0][value]' => 'En label Test node nested',
      'field_paragraphs[0][subform][field_err_field][0][subform][field_paragraphs_text][0][value]' => 'En label Example text for test in nested paragraph',
@@ -158,7 +158,7 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Convert translated paragraph to library.
    $this->drupalGet($node->toUrl('edit-form'));
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_0_promote_to_library');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_0_promote_to_library');
    $this->drupalPostForm(NULL, NULL, 'Save (this translation)');

    // Check translation.
@@ -181,8 +181,8 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Add paragraph directly in library.
    $this->drupalGet('admin/content/paragraphs/add/default');
    $this->drupalPostAjaxForm(NULL, NULL, 'paragraphs_nested_paragraph_add_more');
    $this->drupalPostAjaxForm(NULL, NULL, 'paragraphs_0_subform_field_err_field_test_content_add_more');
    $this->drupalPostForm(NULL, NULL, 'paragraphs_nested_paragraph_add_more');
    $this->drupalPostForm(NULL, NULL, 'paragraphs_0_subform_field_err_field_test_content_add_more');
    $edit = [
      'label[0][value]' => 'En label Test nested paragraph',
      'paragraphs[0][subform][field_err_field][0][subform][field_paragraphs_text][0][value]' => 'En label Example text for test.'
@@ -201,7 +201,7 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Create test content.
    $this->drupalGet('node/add/paragraphed_test');
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_from_library_add_more');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_from_library_add_more');
    $edit = [
      'title[0][value]' => 'En label Test node nested',
      'field_paragraphs[0][subform][field_reusable_paragraph][0][target_id]' => 'En label Test nested paragraph',
@@ -225,7 +225,7 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {
    $this->drupalGet('node/' . $node->id());
    $this->assertText('En label Example text for test.');
    $this->clickLink('Edit');
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_0_unlink_from_library');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_0_unlink_from_library');
    $this->assertText('En label Example text for test.');
  }

@@ -237,8 +237,8 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Add paragraph directly in library.
    $this->drupalGet('admin/content/paragraphs/add/default');
    $this->drupalPostAjaxForm(NULL, NULL, 'paragraphs_nested_paragraph_add_more');
    $this->drupalPostAjaxForm(NULL, NULL, 'paragraphs_0_subform_field_err_field_test_content_add_more');
    $this->drupalPostForm(NULL, NULL, 'paragraphs_nested_paragraph_add_more');
    $this->drupalPostForm(NULL, NULL, 'paragraphs_0_subform_field_err_field_test_content_add_more');
    $edit = [
      'label[0][value]' => 'En label Test nested paragraph',
      'paragraphs[0][subform][field_err_field][0][subform][field_paragraphs_text][0][value]' => 'En label Example text for test.'
@@ -257,12 +257,12 @@ class MultilingualBehaviorTest extends ParagraphsExperimentalTestBase {

    // Create test content.
    $this->drupalGet('node/add/paragraphed_test');
    $this->drupalPostAjaxForm(NULL, NULL, 'field_paragraphs_from_library_add_more');
    $this->drupalPostForm(NULL, NULL, 'field_paragraphs_from_library_add_more');
    $edit = [
      'title[0][value]' => 'En label Test node nested',
      'field_paragraphs[0][subform][field_reusable_paragraph][0][target_id]' => 'En label Test nested paragraph',
    ];
    $this->drupalPostAjaxForm(NULL, $edit, 'field_paragraphs_0_unlink_from_library');
    $this->drupalPostForm(NULL, $edit, 'field_paragraphs_0_unlink_from_library');
    $edit = [
      'title[0][value]' => 'En label Test node nested',
    ];
+5 −5
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@

namespace Drupal\paragraphs_type_permissions\Tests;

use Drupal\field_ui\Tests\FieldUiTestTrait;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\paragraphs\Tests\Classic\ParagraphsCoreVersionUiTestTrait;
use Drupal\simpletest\WebTestBase;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
use Drupal\Tests\paragraphs\FunctionalJavascript\ParagraphsTestBaseTrait;
use Drupal\Tests\paragraphs\Traits\ParagraphsCoreVersionUiTestTrait;
use Drupal\user\Entity\Role;

/**
@@ -14,7 +14,7 @@ use Drupal\user\Entity\Role;
 *
 * @group paragraphs
 */
class ParagraphsTypePermissionsTest extends WebTestBase {
class ParagraphsTypePermissionsTest extends BrowserTestBase {

  use FieldUiTestTrait, ParagraphsCoreVersionUiTestTrait, ParagraphsTestBaseTrait;

@@ -190,7 +190,7 @@ class ParagraphsTypePermissionsTest extends WebTestBase {

    // Set edit mode to open.
    $this->drupalGet('admin/structure/types/manage/paragraphed_content_demo/form-display');
    $this->drupalPostAjaxForm(NULL, [], "field_paragraphs_demo_settings_edit");
    $this->drupalPostForm(NULL, [], "field_paragraphs_demo_settings_edit");
    $edit = ['fields[field_paragraphs_demo][settings_edit_form][settings][edit_mode]' => 'open'];
    $this->drupalPostForm(NULL, $edit, t('Save'));

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ configure: entity.paragraphs_type.collection
dependencies:
  - entity_reference_revisions:entity_reference_revisions
  - drupal:file
  - 'drupal:system (>= 8.5)'
  - 'drupal:system (>= 8.7)'
test_dependencies:
  - diff:diff
  - replicate:replicate
+2 −11
Original line number Diff line number Diff line
<?php

namespace Drupal\Tests\paragraphs\Functional;
namespace Drupal\Tests\paragraphs\Functional\Classic;

use Drupal\field_ui\Tests\FieldUiTestTrait;
use Drupal\paragraphs\Tests\Classic\ParagraphsCoreVersionUiTestTrait;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\paragraphs\FunctionalJavascript\LoginAdminTrait;
use Drupal\Tests\paragraphs\FunctionalJavascript\ParagraphsTestBaseTrait;
use Drupal\Tests\paragraphs\Traits\ParagraphsLastEntityQueryTrait;

/**
@@ -15,12 +10,8 @@ use Drupal\Tests\paragraphs\Traits\ParagraphsLastEntityQueryTrait;
 *
 * @group paragraphs
 */
class ParagraphsClassicContentModerationTranslationsTest extends BrowserTestBase {
class ParagraphsClassicContentModerationTranslationsTest extends ParagraphsTestBase {

  use LoginAdminTrait;
  use FieldUiTestTrait;
  use ParagraphsTestBaseTrait;
  use ParagraphsCoreVersionUiTestTrait;
  use ParagraphsLastEntityQueryTrait;

  /**
Loading