diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php index 1bc89295b481..9c755941da4e 100644 --- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php @@ -115,16 +115,6 @@ class ComposerHookTest extends BuildTestBase { $this->assertDirectoryExists($sut); $this->assertStringContainsString('Scaffolding files for fixtures/drupal-drupal', $stdout); $this->assertScaffoldedFile($sut . '/index.php', FALSE, 'Test version of index.php from drupal/core'); - $topLevelProjectDir = 'composer-hooks-nothing-allowed-fixture'; - $sut = $this->fixturesDir . '/' . $topLevelProjectDir; - // Run composer install on an empty project. - $this->mustExec("composer install --no-ansi", $sut); - // Require a project that is not allowed to scaffold and confirm that we - // get a warning, and it does not scaffold. - $this->executeCommand("composer require --no-ansi --no-interaction fixtures/drupal-assets-fixture:dev-main fixtures/scaffold-override-fixture:dev-main", $sut); - $this->assertCommandSuccessful(); - $this->assertFileDoesNotExist($sut . '/sites/default/default.settings.php'); - $this->assertErrorOutputContains('See https://getcomposer.org/allow-plugins'); } /** diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt deleted file mode 100644 index a26bf8912fb8..000000000000 --- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt +++ /dev/null @@ -1 +0,0 @@ -# robots.txt fixture scaffolded from "file-mappings" in composer-hooks-fixture composer.json fixture. diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl deleted file mode 100644 index 33393c3f59cc..000000000000 --- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "fixtures/drupal-drupal", - "type": "project", - "minimum-stability": "dev", - "prefer-stable": true, - "repositories": { - "packagist.org": false, - "composer-scaffold": { - "type": "path", - "url": "__PROJECT_ROOT__", - "options": { - "symlink": true - } - }, - "drupal-core-fixture": { - "type": "path", - "url": "../drupal-core-fixture", - "options": { - "symlink": true - } - }, - "drupal-assets-fixture": { - "type": "path", - "url": "../drupal-assets-fixture", - "options": { - "symlink": true - } - }, - "scaffold-override-fixture": { - "type": "path", - "url": "../scaffold-override-fixture", - "options": { - "symlink": true - } - } - }, - "require": { - "drupal/core-composer-scaffold": "*", - "fixtures/drupal-core-fixture": "*" - }, - "extra": { - "drupal-scaffold": { - "locations": { - "web-root": "./" - }, - "symlink": __SYMLINK__, - "file-mapping": { - "[web-root]/.htaccess": false, - "[web-root]/robots.txt": "assets/robots-default.txt" - } - }, - "installer-paths": { - "core": ["type:drupal-core"], - "modules/contrib/{$name}": ["type:drupal-module"], - "modules/custom/{$name}": ["type:drupal-custom-module"], - "profiles/contrib/{$name}": ["type:drupal-profile"], - "profiles/custom/{$name}": ["type:drupal-custom-profile"], - "themes/contrib/{$name}": ["type:drupal-theme"], - "themes/custom/{$name}": ["type:drupal-custom-theme"], - "libraries/{$name}": ["type:drupal-library"], - "drush/Commands/contrib/{$name}": ["type:drupal-drush"] - } - } -}