Unverified Commit 6cfb39aa authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3490493 by catch, dww, baysaa, jhodgdon, daffie: Test profiles should... 

Issue #3490493 by catch, dww, baysaa, jhodgdon, daffie: Test profiles should be in a tests directory

(cherry picked from commit 7f8c55c9)
parent 1c764a35

core/.phpstan-baseline.php

+2 −2
Original line number Diff line number Diff line
@@ -56269,13 +56269,13 @@ 
	// identifier: missingType.return

	'message' => '#^Method Drupal\\\\Tests\\\\drupal_system_listing_compatible_test\\\\Kernel\\\\SystemListingCrossProfileCompatibleTest\\:\\:testSystemListing\\(\\) has no return type specified\\.$#',

	'count' => 1,

	'path' => __DIR__ . '/profiles/testing/modules/drupal_system_listing_compatible_test/tests/src/Kernel/SystemListingCrossProfileCompatibleTest.php',

	'path' => __DIR__ . '/profiles/tests/testing/modules/drupal_system_listing_compatible_test/tests/src/Kernel/SystemListingCrossProfileCompatibleTest.php',

];

$ignoreErrors[] = [

	// identifier: missingType.return

	'message' => '#^Function testing_requirements_requirements\\(\\) has no return type specified\\.$#',

	'count' => 1,

	'path' => __DIR__ . '/profiles/testing_requirements/testing_requirements.install',

	'path' => __DIR__ . '/profiles/tests/testing_requirements/testing_requirements.install',

];

$ignoreErrors[] = [

	// identifier: missingType.return

core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public function setUpSite(): void { 
  protected function copyTestingOverrides(): void {

    $dest = $this->siteDirectory . '/profiles/testing_config_overrides';

    mkdir($dest, 0777, TRUE);

    $source = DRUPAL_ROOT . '/core/profiles/testing_config_overrides';

    $source = DRUPAL_ROOT . '/core/profiles/tests/testing_config_overrides';

    $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::SELF_FIRST);

    foreach ($iterator as $item) {

      if ($item->isDir()) {

core/modules/system/tests/src/Kernel/Common/SystemListingTest.php

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public function testDirectoryPrecedence(): void { 
      // When both copies of the module are compatible with Drupal core, the

      // copy in the profile directory takes precedence.

      'drupal_system_listing_compatible_test' => [

        'core/profiles/testing/modules',

        'core/profiles/tests/testing/modules',

        'core/modules/system/tests/modules',

      ],

    ];
@@ -42,7 +42,7 @@ public function testDirectoryPrecedence(): void { 
    // Now scan the directories and check that the files take precedence as

    // expected.

    $listing = new ExtensionDiscovery($this->root);

    $listing->setProfileDirectories(['core/profiles/testing']);

    $listing->setProfileDirectories(['core/profiles/tests/testing']);

    $files = $listing->scan('module');

    foreach ($expected_directories as $module => $directories) {

      $expected_directory = array_shift($directories);
@@ -57,7 +57,7 @@ public function testDirectoryPrecedence(): void { 
   */

  public function testFileScanIgnoreDirectory(): void {

    $listing = new ExtensionDiscovery($this->root, FALSE);

    $listing->setProfileDirectories(['core/profiles/testing']);

    $listing->setProfileDirectories(['core/profiles/tests/testing']);

    $files = $listing->scan('module');

    $this->assertArrayHasKey('drupal_system_listing_compatible_test', $files);
@@ -68,7 +68,7 @@ public function testFileScanIgnoreDirectory(): void { 


    $this->setSetting('file_scan_ignore_directories', ['drupal_system_listing_compatible_test']);

    $listing = new ExtensionDiscovery($this->root, FALSE);

    $listing->setProfileDirectories(['core/profiles/testing']);

    $listing->setProfileDirectories(['core/profiles/tests/testing']);

    $files = $listing->scan('module');

    $this->assertArrayNotHasKey('drupal_system_listing_compatible_test', $files);

  }

core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public function testUninstallProfileDependency(): void { 
    // @todo Remove as part of https://www.drupal.org/node/2186491

    $profile_list = \Drupal::service('extension.list.profile');

    assert($profile_list instanceof ProfileExtensionList);

    $profile_list->setPathname($profile, 'core/profiles/' . $profile . '/' . $profile . '.info.yml');

    $profile_list->setPathname($profile, 'core/profiles/tests/' . $profile . '/' . $profile . '.info.yml');

    $this->enableModules(['module_test', $profile]);



    $data = \Drupal::service('extension.list.module')->reset()->getList();
@@ -238,7 +238,7 @@ public function testProfileAllDependencies(): void { 
    // @todo Remove as part of https://www.drupal.org/node/2186491

    $profile_list = \Drupal::service('extension.list.profile');

    assert($profile_list instanceof ProfileExtensionList);

    $profile_list->setPathname($profile, 'core/profiles/' . $profile . '/' . $profile . '.info.yml');

    $profile_list->setPathname($profile, 'core/profiles/tests/' . $profile . '/' . $profile . '.info.yml');

    $this->enableModules(['module_test', $profile]);



    $data = \Drupal::service('extension.list.module')->reset()->getList();

core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public function testDependenciesResolution(): void { 
    // @todo Remove as part of https://www.drupal.org/node/2186491

    $profile_list = \Drupal::service('extension.list.profile');

    assert($profile_list instanceof ProfileExtensionList);

    $profile_list->setPathname('testing_missing_dependencies', 'core/profiles/testing_missing_dependencies/testing_missing_dependencies.info.yml');

    $profile_list->setPathname('testing_missing_dependencies', 'core/profiles/tests/testing_missing_dependencies/testing_missing_dependencies.info.yml');



    // Requires install.inc to be able to use drupal_verify_profile.

    require_once dirname(__FILE__, 7) . '/includes/install.inc';