');
// Disable Panelizer for the default display mode. This should bring back
// the field overview table at Manage Display and not display the link to
// edit the default Panelizer layout.
$this->unpanelize($this->bundle);
- $this->assertNoLinkByHref("admin/structure/panelizer/edit/{$this->entityTypeId}__{$this->bundle}__default");
- $this->assertRaw('
');
+ $this->assertSession()->linkByHrefNotExists("admin/structure/panelizer/edit/{$this->entityTypeId}__{$this->bundle}__default");
+ $this->assertSession()->responseContains('
');
}
/**
@@ -173,25 +173,25 @@ class PanelizerNodeTranslationsTest extends ContentTranslationTestBase {
],
]);
$out = $this->drupalGet('node/' . $node->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->verbose($out);
$elements = $this->xpath('//*[@id="panels-ipe-content"]');
if (is_array($elements)) {
- $this->assertIdentical(count($elements), 1);
+ $this->assertSame(count($elements), 1);
}
else {
$this->fail('Could not parse page content.');
}
// Check that the block we added is visible.
- $this->assertText('Panelizer test');
- $this->assertText('Abracadabra');
+ $this->assertSession()->pageTextContains('Panelizer test');
+ $this->assertSession()->pageTextContains('Abracadabra');
// Load the translation page.
$this->clickLink('Translate');
- $this->assertText('English (Original language)');
- $this->assertText('Published');
- $this->assertText('Not translated');
+ $this->assertSession()->pageTextContains('English (Original language)');
+ $this->assertSession()->pageTextContains('Published');
+ $this->assertSession()->pageTextContains('Not translated');
}
// @todo Confirm that the different languages of a translated node are loaded properly when using a default display.
diff --git a/tests/src/Functional/PanelizerTermFunctionalTest.php b/tests/src/Functional/PanelizerTermFunctionalTest.php
index c8ccd11..c94f19b 100644
--- a/tests/src/Functional/PanelizerTermFunctionalTest.php
+++ b/tests/src/Functional/PanelizerTermFunctionalTest.php
@@ -44,7 +44,7 @@ class PanelizerTermFunctionalTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
Vocabulary::create([
@@ -67,8 +67,8 @@ class PanelizerTermFunctionalTest extends BrowserTestBase {
'panelizer[enable]' => TRUE,
'panelizer[custom]' => TRUE,
];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->submitForm($edit, t('Save'));
+ $this->assertSession()->statusCodeEquals(200);
$this->rebuildAll();
}
@@ -92,19 +92,19 @@ class PanelizerTermFunctionalTest extends BrowserTestBase {
$term = $this->createTerm();
$out = $this->drupalGet('taxonomy/term/' . $term->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->verbose($out);
$elements = $this->xpath('//*[@id="panels-ipe-content"]');
if (is_array($elements)) {
- $this->assertIdentical(count($elements), 1);
+ $this->assertSame(count($elements), 1);
}
else {
$this->fail('Could not parse page content.');
}
// Check that the block we added is visible.
- $this->assertText('Panelizer test');
- $this->assertText('Abracadabra');
+ $this->assertSession()->pageTextContains('Panelizer test');
+ $this->assertSession()->pageTextContains('Abracadabra');
}
/**
diff --git a/tests/src/Functional/PanelizerUserFunctionalTest.php b/tests/src/Functional/PanelizerUserFunctionalTest.php
index a0aaec4..a830c66 100644
--- a/tests/src/Functional/PanelizerUserFunctionalTest.php
+++ b/tests/src/Functional/PanelizerUserFunctionalTest.php
@@ -41,7 +41,7 @@ class PanelizerUserFunctionalTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
// Create the admin user.
@@ -63,13 +63,13 @@ class PanelizerUserFunctionalTest extends BrowserTestBase {
// Enable Panelizer for this entity.
$this->drupalGet('admin/config/people/accounts/display');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'panelizer[enable]' => TRUE,
'panelizer[custom]' => TRUE,
];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->submitForm($edit, t('Save'));
+ $this->assertSession()->statusCodeEquals(200);
// Reload all caches.
$this->rebuildAll();
@@ -96,21 +96,21 @@ class PanelizerUserFunctionalTest extends BrowserTestBase {
// Check the user entity page.
$out = $this->drupalGet('user/' . $account->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->verbose($out);
// Verify that
$elements = $this->xpath('//*[@id="panels-ipe-content"]');
if (is_array($elements)) {
- $this->assertIdentical(count($elements), 1);
+ $this->assertSame(count($elements), 1);
}
else {
$this->fail('Could not parse page content.');
}
// Check that the block we added is visible.
- $this->assertText('Panelizer test');
- $this->assertText('Abracadabra');
+ $this->assertSession()->pageTextContains('Panelizer test');
+ $this->assertSession()->pageTextContains('Abracadabra');
}
}
diff --git a/tests/src/Functional/Update/PanelizerLayoutIDUpdateTest.php b/tests/src/Functional/Update/PanelizerLayoutIDUpdateTest.php
index 4c7ca09..d7fd728 100644
--- a/tests/src/Functional/Update/PanelizerLayoutIDUpdateTest.php
+++ b/tests/src/Functional/Update/PanelizerLayoutIDUpdateTest.php
@@ -30,13 +30,13 @@ class PanelizerLayoutIDUpdateTest extends UpdatePathTestBase {
$this->drupalLogin($this->rootUser);
$this->drupalGet('admin/structure/types/manage/article/display');
$this->clickLink('Edit', 1);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('node/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('node/2');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/tests/src/FunctionalJavascript/PanelizerIntegrationTest.php b/tests/src/FunctionalJavascript/PanelizerIntegrationTest.php
index 49f27d4..2a2b389 100644
--- a/tests/src/FunctionalJavascript/PanelizerIntegrationTest.php
+++ b/tests/src/FunctionalJavascript/PanelizerIntegrationTest.php
@@ -44,7 +44,7 @@ class PanelizerIntegrationTest extends WebDriverTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
// Create a user with appropriate permissions to use Panels IPE.
diff --git a/tests/src/Unit/PanelizerDefaultPanelsStorageTest.php b/tests/src/Unit/PanelizerDefaultPanelsStorageTest.php
index f0424de..468ff46 100644
--- a/tests/src/Unit/PanelizerDefaultPanelsStorageTest.php
+++ b/tests/src/Unit/PanelizerDefaultPanelsStorageTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\panelizer\Unit;
+use Prophecy\PhpUnit\ProphecyTrait;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageInterface;
@@ -23,6 +24,7 @@ use Drupal\Tests\UnitTestCase;
*/
class PanelizerDefaultPanelsStorageTest extends UnitTestCase {
+ use ProphecyTrait;
/**
* @var \Drupal\Core\Entity\EntityStorageInterface|\Prophecy\Prophecy\ProphecyInterface
*/
@@ -46,7 +48,7 @@ class PanelizerDefaultPanelsStorageTest extends UnitTestCase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->storage = $this->prophesize(EntityStorageInterface::class);
diff --git a/tests/src/Unit/PanelizerEntityViewBuilderTest.php b/tests/src/Unit/PanelizerEntityViewBuilderTest.php
index b934da9..e0f8392 100644
--- a/tests/src/Unit/PanelizerEntityViewBuilderTest.php
+++ b/tests/src/Unit/PanelizerEntityViewBuilderTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\panelizer\Unit;
+use Prophecy\PhpUnit\ProphecyTrait;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityTypeInterface;
@@ -29,6 +30,7 @@ use Drupal\Tests\UnitTestCase;
*/
class PanelizerEntityViewBuilderTest extends UnitTestCase {
+ use ProphecyTrait;
/**
* Information about the entity type.
*
@@ -74,7 +76,7 @@ class PanelizerEntityViewBuilderTest extends UnitTestCase {
/**
* The Panelizer entity view builder.
*
- * @var \Drupal\panelizer\PanelizerEntityViewBuilder|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\panelizer\PanelizerEntityViewBuilder|\PHPUnit\Framework\MockObject\MockObject
*/
protected $entityViewBuilder;
@@ -95,7 +97,7 @@ class PanelizerEntityViewBuilderTest extends UnitTestCase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->entityType = $this->prophesize(EntityTypeInterface::class);
diff --git a/tests/src/Unit/PanelizerFieldPanelsStorageTest.php b/tests/src/Unit/PanelizerFieldPanelsStorageTest.php
index b9e238a..440926a 100644
--- a/tests/src/Unit/PanelizerFieldPanelsStorageTest.php
+++ b/tests/src/Unit/PanelizerFieldPanelsStorageTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\panelizer\Unit;
+use Prophecy\PhpUnit\ProphecyTrait;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -23,6 +24,7 @@ use Drupal\Tests\UnitTestCase;
*/
class PanelizerFieldPanelsStorageTest extends UnitTestCase {
+ use ProphecyTrait;
/**
* @var \Drupal\Core\Entity\EntityStorageInterface|\Prophecy\Prophecy\ProphecyInterface
*/
@@ -46,7 +48,7 @@ class PanelizerFieldPanelsStorageTest extends UnitTestCase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->storage = $this->prophesize(EntityStorageInterface::class);