refactor: #3569152 Move some test coverage to shortcut module (6e7257fe) · Commits · project / drupal

core/.phpstan-baseline.php

+48 −36

Original line number	Diff line number	Diff line
		@@ -22597,42 +22597,6 @@
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/src/Plugin/SectionStorage/NavigationSectionStorage.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertCacheContext\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertCacheMaxAge\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertCacheTags\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertNoCacheContext\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertPageCacheContextsAndTags\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:enablePageCaching\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\FunctionalJavascript\\\\NavigationBlockUiTest\\:\\:clickContextualLink\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		@@ -25897,6 +25861,42 @@
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/src/ShortcutSetStorageInterface.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertCacheContext\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertCacheMaxAge\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertCacheTags\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertNoCacheContext\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:assertPageCacheContextsAndTags\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\NavigationShortcutsBlockTest\\:\\:enablePageCaching\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/NavigationShortcutsBlockTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Functional\\\\Rest\\\\ShortcutJsonAnonTest\\:\\:assertAuthenticationEdgeCases\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		@@ -26077,6 +26077,18 @@
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\FunctionalJavascript\\\\NavigationBlockUiTest\\:\\:clickContextualLink\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/FunctionalJavascript/NavigationBlockUiTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\FunctionalJavascript\\\\NavigationBlockUiTest\\:\\:toggleContextualTriggerVisibility\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',
		'count' => 1,
		'path' => __DIR__ . '/modules/shortcut/tests/src/FunctionalJavascript/NavigationBlockUiTest.php',
		];
		$ignoreErrors[] = [
		'message' => '#^Method Drupal\\\\Tests\\\\shortcut\\\\Unit\\\\Menu\\\\ShortcutLocalTasksTest\\:\\:getShortcutPageRoutes\$\$ has no return type specified\\.$#',
		'identifier' => 'missingType.return',

core/modules/block/tests/src/Functional/BlockInstallTest.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ public function testCacheTagInvalidationUponInstallation(): void {
		$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'config:block_list');

		// Install the block module, and place the "Powered by Drupal" block.
		$this->container->get('module_installer')->install(['block', 'shortcut']);
		$this->container->get('module_installer')->install(['block']);
		$this->rebuildContainer();
		$this->drupalPlaceBlock('system_powered_by_block');

core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php

+0 −28

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		use Drupal\block_content\Entity\BlockContentType;
		use Drupal\filter\Entity\FilterFormat;
		use Drupal\language\Entity\ConfigurableLanguage;
		use Drupal\shortcut\Entity\ShortcutSet;
		use Drupal\taxonomy\Entity\Vocabulary;
		use Drupal\Tests\block_content\Traits\BlockContentCreationTrait;
		use Drupal\Tests\BrowserTestBase;
		@@ -36,7 +35,6 @@ class ConfigTranslationListUiTest extends BrowserTestBase {
		'field_ui',
		'menu_ui',
		'node',
		'shortcut',
		'taxonomy',
		'image',
		'responsive_image',
		@@ -72,7 +70,6 @@ protected function setUp(): void {
		'administer menu',
		'administer node fields',
		'administer permissions',
		'administer shortcuts',
		'administer site configuration',
		'administer taxonomy',
		'administer account settings',
		@@ -269,30 +266,6 @@ public function doFormatsListTest(): void {
		$this->assertSession()->responseContains('<th>Language</th>');
		}

		/**
		* Tests the shortcut listing for the translate operation.
		*/
		public function doShortcutListTest(): void {
		// Create a test shortcut to decouple looking for translate operations
		// link so this does not test more than necessary.
		$shortcut = ShortcutSet::create([
		'id' => $this->randomMachineName(16),
		'label' => $this->randomString(),
		]);
		$shortcut->save();

		// Get the shortcut listing.
		$this->drupalGet('admin/config/user-interface/shortcut');

		$translate_link = 'admin/config/user-interface/shortcut/manage/' . $shortcut->id() . '/translate';
		// Test if the link to translate the shortcut is on the page.
		$this->assertSession()->linkByHrefExists($translate_link);

		// Test if the link to translate actually goes to the translate page.
		$this->drupalGet($translate_link);
		$this->assertSession()->responseContains('<th>Language</th>');
		}

		/**
		* Tests the role listing for the translate operation.
		*/
		@@ -464,7 +437,6 @@ public function testTranslateOperationInListUi(): void {
		$this->doCustomContentTypeListTest();
		$this->doContentTypeListTest();
		$this->doFormatsListTest();
		$this->doShortcutListTest();
		$this->doUserRoleListTest();
		$this->doLanguageListTest();
		$this->doImageStyleListTest();

core/modules/filter/tests/src/Kernel/EntityLinksTest.php

+0 −35

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		use Drupal\media\Entity\Media;
		use Drupal\media\Entity\MediaType;
		use Drupal\menu_link_content\Entity\MenuLinkContent;
		use Drupal\shortcut\Entity\Shortcut;
		use Drupal\Tests\Traits\Core\PathAliasTestTrait;
		use PHPUnit\Framework\Attributes\CoversClass;
		use PHPUnit\Framework\Attributes\DataProvider;
		@@ -71,8 +70,6 @@ class EntityLinksTest extends KernelTestBase {
		// @see ::testMenuLinkContentEntity
		'link',
		'menu_link_content',
		// @see ::testShortcutEntity
		'shortcut',
		];

		/**
		@@ -102,10 +99,6 @@ protected function setUp(): void {
		// @see ::testMenuLinkContentEntity
		$this->installEntitySchema('menu_link_content');

		// @see ::testShortcutEntity
		$this->installEntitySchema('shortcut');
		$this->installConfig(['shortcut']);

		// Add Swedish, Danish and Finnish.
		ConfigurableLanguage::createFromLangcode('sv')->save();
		ConfigurableLanguage::createFromLangcode('da')->save();
		@@ -340,34 +333,6 @@ public function testMenuLinkContentEntity(): void {
		);
		}

		/**
		* @legacy-covers ::getUrl
		* @legacy-covers \Drupal\shortcut\Entity\ShortcutLinkTarget
		*/
		public function testShortcutEntity(): void {
		// cspell:disable-next-line
		$path = '/user/logout?token=fzL0Ox4jS6qafdt6gzGzjWGb_hsR6kJ8L8E0D4hC5Mo';
		$shortcut = Shortcut::create([
		'shortcut_set' => 'default',
		'title' => 'Comments',
		'weight' => -20,
		'link' => [
		'uri' => "internal:$path",
		],
		]);
		$shortcut->save();

		$this->assertFilterProcessResult(
		sprintf('<a data-entity-type="shortcut" data-entity-uuid="%s" href="something?query=string#fragment">Link text</a>', $shortcut->uuid()),
		'en',
		(new FilterProcessResult())
		->setProcessedText(sprintf('<a href="%s?query=string#fragment">Link text</a>', $path))
		->setCacheTags(['config:shortcut.set.default'])
		->setCacheContexts([])
		->setCacheMaxAge(Cache::PERMANENT)
		);
		}

		/**
		* Asserts an input string + langcode yield the expected FilterProcessResult.
		*

core/modules/jsonapi/tests/src/Functional/JsonApiFilterRegressionTest.php

+11 −15

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		use Drupal\Core\Field\FieldStorageDefinitionInterface;
		use Drupal\Core\Url;
		use Drupal\node\Entity\Node;
		use Drupal\shortcut\Entity\Shortcut;
		use Drupal\menu_link_content\Entity\MenuLinkContent;
		use Drupal\taxonomy\Entity\Term;
		use GuzzleHttp\RequestOptions;
		use PHPUnit\Framework\Attributes\Group;
		@@ -83,26 +83,22 @@ public function testBundleSpecificTargetEntityTypeFromIssue2953207(): void {
		*/
		public function testFilterByIdFromIssue3015759(): void {
		// Set up data model.
		$this->assertTrue($this->container->get('module_installer')->install(['shortcut'], TRUE), 'Installed modules.');
		$this->assertTrue($this->container->get('module_installer')->install(['menu_link_content'], TRUE), 'Installed modules.');
		$this->rebuildAll();

		// Create data.
		$shortcut = Shortcut::create([
		'shortcut_set' => 'default',
		$menu_link = MenuLinkContent::create([
		'title' => $this->randomMachineName(),
		'weight' => -20,
		'link' => [
		'uri' => 'internal:/user/logout',
		],
		'link' => ['uri' => 'internal:/user/login'],
		'menu_name' => 'main',
		]);
		$shortcut->save();
		$menu_link->save();

		// Test.
		$user = $this->drupalCreateUser([
		'access shortcuts',
		'customize shortcut links',
		'administer menu',
		]);
		$response = $this->request('GET', Url::fromUri('internal:/jsonapi/shortcut/default?filter[drupal_internal__id]=' . $shortcut->id()), [
		$response = $this->request('GET', Url::fromUri('internal:/jsonapi/menu_link_content/menu_link_content?filter[drupal_internal__id]=' . $menu_link->id()), [
		RequestOptions::AUTH => [
		$user->getAccountName(),
		$user->pass_raw,
		@@ -111,9 +107,9 @@ public function testFilterByIdFromIssue3015759(): void {
		$doc = $this->getDocumentFromResponse($response);
		$this->assertSame(200, $response->getStatusCode());
		$this->assertNotEmpty($doc['data']);
		$this->assertSame($doc['data'][0]['id'], $shortcut->uuid());
		$this->assertSame($doc['data'][0]['attributes']['drupal_internal__id'], (int) $shortcut->id());
		$this->assertSame($doc['data'][0]['attributes']['title'], $shortcut->label());
		$this->assertSame($doc['data'][0]['id'], $menu_link->uuid());
		$this->assertSame($doc['data'][0]['attributes']['drupal_internal__id'], (int) $menu_link->id());
		$this->assertSame($doc['data'][0]['attributes']['title'], $menu_link->label());
		}

		/**