Skip to content
Snippets Groups Projects
Commit 3a200f58 authored by project update bot's avatar project update bot Committed by Lee Rowlands
Browse files

Issue #3425252: Automated Drupal 11 compatibility fixes for forum

parent 30ed7b19
No related branches found
No related tags found
1 merge request!2Automated Project Update Bot fixes
Pipeline #166778 failed
Stage: build
Stage: validate
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 56 deletions
tests/src/Functional/ForumIndexUpdateTest.php
+ 5
− 0
View file @ 3a200f58
......@@ -14,6 +14,11 @@ use Drupal\FunctionalTests\Update\UpdatePathTestBase;
*/
final class ForumIndexUpdateTest extends UpdatePathTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* {@inheritdoc}
*/
......
tests/src/Functional/migrate_drupal/d6/NoMultilingualReviewPageTest.php
+ 5
− 0
View file @ 3a200f58
......@@ -11,6 +11,11 @@ use Drupal\Tests\migrate_drupal_ui\Functional\NoMultilingualReviewPageTestBase;
*/
class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* {@inheritdoc}
*/
......
tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php
+ 5
− 0
View file @ 3a200f58
......@@ -15,6 +15,11 @@ use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
*/
class Upgrade6Test extends MigrateUpgradeExecuteTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* {@inheritdoc}
*/
......
tests/src/Functional/migrate_drupal/d7/NoMultilingualReviewPageTest.php
+ 5
− 0
View file @ 3a200f58
......@@ -13,6 +13,11 @@ use Drupal\Tests\migrate_drupal_ui\Functional\NoMultilingualReviewPageTestBase;
*/
class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* {@inheritdoc}
*/
......
tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php
+ 5
− 0
View file @ 3a200f58
......@@ -15,6 +15,11 @@ use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
*/
class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* {@inheritdoc}
*/
......
tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+ 3
− 9
View file @ 3a200f58
......@@ -22,9 +22,7 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
protected function setUp(): void {
parent::setUp();
$cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
->disableOriginalConstructor()
->getMock();
$cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
$cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
$container = new Container();
$container->set('cache_contexts_manager', $cache_contexts_manager);
......@@ -75,13 +73,9 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
*/
public function testBuild() {
// Build all our dependencies, backwards.
$translation_manager = $this->getMockBuilder('Drupal\Core\StringTranslation\TranslationInterface')
->disableOriginalConstructor()
->getMock();
$translation_manager = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface');
$forum_manager = $this->getMockBuilder('Drupal\forum\ForumManagerInterface')
->disableOriginalConstructor()
->getMock();
$forum_manager = $this->createMock('Drupal\forum\ForumManagerInterface');
$prophecy = $this->prophesize('Drupal\taxonomy\VocabularyInterface');
$prophecy->label()->willReturn('Fora_is_the_plural_of_forum');
......
tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
+ 5
− 13
View file @ 3a200f58
......@@ -24,9 +24,7 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
protected function setUp(): void {
parent::setUp();
$cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
->disableOriginalConstructor()
->getMock();
$cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
$cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
$container = new Container();
$container->set('cache_contexts_manager', $cache_contexts_manager);
......@@ -77,9 +75,7 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
*/
public function providerTestApplies() {
// Send a Node mock, because NodeInterface cannot be mocked.
$mock_term = $this->getMockBuilder('Drupal\taxonomy\Entity\Term')
->disableOriginalConstructor()
->getMock();
$mock_term = $this->createMock('Drupal\taxonomy\Entity\Term');
return [
[
......@@ -115,9 +111,7 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
*/
public function testBuild() {
// Build all our dependencies, backwards.
$translation_manager = $this->getMockBuilder('Drupal\Core\StringTranslation\TranslationInterface')
->disableOriginalConstructor()
->getMock();
$translation_manager = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface');
$prophecy = $this->prophesize('Drupal\taxonomy\Entity\Term');
$prophecy->label()->willReturn('Something');
......@@ -135,7 +129,7 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
$prophecy->getCacheMaxAge()->willReturn(Cache::PERMANENT);
$term2 = $prophecy->reveal();
$term_storage = $this->getMockBuilder(TermStorageInterface::class)->getMock();
$term_storage = $this->createMock(TermStorageInterface::class);
$term_storage->expects($this->exactly(2))
->method('loadAllParents')
->willReturnOnConsecutiveCalls(
......@@ -157,9 +151,7 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
['forums', $prophecy->reveal()],
]);
$entity_type_manager = $this->getMockBuilder(EntityTypeManagerInterface::class)
->disableOriginalConstructor()
->getMock();
$entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
$entity_type_manager->expects($this->any())
->method('getStorage')
->willReturnMap([
......
tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
+ 7
− 19
View file @ 3a200f58
......@@ -24,9 +24,7 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
protected function setUp(): void {
parent::setUp();
$cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
->disableOriginalConstructor()
->getMock();
$cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
$cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
$container = new Container();
$container->set('cache_contexts_manager', $cache_contexts_manager);
......@@ -84,9 +82,7 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
*/
public function providerTestApplies() {
// Send a Node mock, because NodeInterface cannot be mocked.
$mock_node = $this->getMockBuilder('Drupal\node\Entity\Node')
->disableOriginalConstructor()
->getMock();
$mock_node = $this->createMock('Drupal\node\Entity\Node');
return [
[
......@@ -121,9 +117,7 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
*/
public function testBuild() {
// Build all our dependencies, backwards.
$translation_manager = $this->getMockBuilder('Drupal\Core\StringTranslation\TranslationInterface')
->disableOriginalConstructor()
->getMock();
$translation_manager = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface');
$prophecy = $this->prophesize('Drupal\taxonomy\Entity\Term');
$prophecy->label()->willReturn('Something');
......@@ -141,10 +135,8 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
$prophecy->getCacheMaxAge()->willReturn(Cache::PERMANENT);
$term2 = $prophecy->reveal();
$forum_manager = $this->getMockBuilder('Drupal\forum\ForumManagerInterface')
->disableOriginalConstructor()
->getMock();
$term_storage = $this->getMockBuilder(TermStorageInterface::class)->getMock();
$forum_manager = $this->createMock('Drupal\forum\ForumManagerInterface');
$term_storage = $this->createMock(TermStorageInterface::class);
$term_storage->expects($this->exactly(2))
->method('loadAllParents')
->willReturnOnConsecutiveCalls(
......@@ -165,9 +157,7 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
['forums', $prophecy->reveal()],
]);
$entity_type_manager = $this->getMockBuilder(EntityTypeManagerInterface::class)
->disableOriginalConstructor()
->getMock();
$entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
$entity_type_manager->expects($this->any())
->method('getStorage')
->willReturnMap([
......@@ -194,9 +184,7 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
$breadcrumb_builder->setStringTranslation($translation_manager);
// The forum node we need a breadcrumb back from.
$forum_node = $this->getMockBuilder('Drupal\node\Entity\Node')
->disableOriginalConstructor()
->getMock();
$forum_node = $this->createMock('Drupal\node\Entity\Node');
// Our data set.
$route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
......
tests/src/Unit/ForumManagerTest.php
+ 5
− 15
View file @ 3a200f58
......@@ -21,15 +21,11 @@ class ForumManagerTest extends UnitTestCase {
$entity_field_manager = $this->createMock(EntityFieldManagerInterface::class);
$entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
$storage = $this->getMockBuilder('\Drupal\taxonomy\VocabularyStorage')
->disableOriginalConstructor()
->getMock();
$storage = $this->createMock('\Drupal\taxonomy\VocabularyStorage');
$config_factory = $this->createMock('\Drupal\Core\Config\ConfigFactoryInterface');
$config = $this->getMockBuilder('\Drupal\Core\Config\Config')
->disableOriginalConstructor()
->getMock();
$config = $this->createMock('\Drupal\Core\Config\Config');
$config_factory->expects($this->once())
->method('get')
......@@ -50,17 +46,11 @@ class ForumManagerTest extends UnitTestCase {
->method('create')
->willReturn($term);
$connection = $this->getMockBuilder('\Drupal\Core\Database\Connection')
->disableOriginalConstructor()
->getMock();
$connection = $this->createMock('\Drupal\Core\Database\Connection');
$translation_manager = $this->getMockBuilder('\Drupal\Core\StringTranslation\TranslationManager')
->disableOriginalConstructor()
->getMock();
$translation_manager = $this->createMock('\Drupal\Core\StringTranslation\TranslationManager');
$comment_manager = $this->getMockBuilder('\Drupal\comment\CommentManagerInterface')
->disableOriginalConstructor()
->getMock();
$comment_manager = $this->createMock('\Drupal\comment\CommentManagerInterface');
$manager = $this->getMockBuilder('\Drupal\forum\ForumManager')
->onlyMethods(['getChildren'])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment