From ec07415be56e4df729e105cbe6de0bcea1fcc7fe Mon Sep 17 00:00:00 2001 From: phenaproxima <phenaproxima@205645.no-reply.drupal.org> Date: Mon, 14 Nov 2022 18:18:59 +0000 Subject: [PATCH] Issue #3305527 by yash.rode, omkar.podey, phenaproxima, tedbow: Rename test_theme to automatic_updates_extensions_test_theme --- ...tic_updates_extensions_test_theme.1.1.xml} | 36 +++++++++---------- .../vendor/composer/installed.json | 2 +- .../composer.json | 2 +- .../composer.lock | 0 .../vendor/composer/installed.json | 2 +- .../vendor/composer/installed.php | 6 ++-- ...pdates_extensions_test_theme.info.yml.hide | 1 + .../vendor/composer/installed.json | 2 +- .../test_theme/test_theme.info.yml.hide | 1 - .../vendor/composer/installed.json | 2 +- .../tests/fixtures/two_projects/composer.lock | 2 +- .../vendor/composer/installed.json | 2 +- .../vendor/composer/installed.php | 6 ++-- ...pdates_extensions_test_theme.info.yml.hide | 1 + .../test_theme/test_theme.info.yml.hide | 1 - .../tests/src/Functional/UpdaterFormTest.php | 4 +-- ...ic_updates_extensions_test_theme.info.yml} | 0 dictionary.txt | 1 + 18 files changed, 36 insertions(+), 35 deletions(-) rename automatic_updates_extensions/tests/fixtures/release-history/{test_theme.1.1.xml => automatic_updates_extensions_test_theme.1.1.xml} (65%) rename automatic_updates_extensions/tests/fixtures/stage_composer/{test_theme => automatic_updates_extensions_test_theme}/composer.json (57%) rename automatic_updates_extensions/tests/fixtures/stage_composer/{test_theme => automatic_updates_extensions_test_theme}/composer.lock (100%) rename automatic_updates_extensions/tests/fixtures/stage_composer/{test_theme => automatic_updates_extensions_test_theme}/vendor/composer/installed.json (88%) rename automatic_updates_extensions/tests/fixtures/stage_composer/{test_theme => automatic_updates_extensions_test_theme}/vendor/composer/installed.php (68%) create mode 100644 automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide delete mode 100644 automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/web/projects/test_theme/test_theme.info.yml.hide create mode 100644 automatic_updates_extensions/tests/fixtures/two_projects/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide delete mode 100644 automatic_updates_extensions/tests/fixtures/two_projects/web/projects/test_theme/test_theme.info.yml.hide rename automatic_updates_extensions/tests/themes/{test_theme/test_theme.info.yml => automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml} (100%) diff --git a/automatic_updates_extensions/tests/fixtures/release-history/test_theme.1.1.xml b/automatic_updates_extensions/tests/fixtures/release-history/automatic_updates_extensions_test_theme.1.1.xml similarity index 65% rename from automatic_updates_extensions/tests/fixtures/release-history/test_theme.1.1.xml rename to automatic_updates_extensions/tests/fixtures/release-history/automatic_updates_extensions_test_theme.1.1.xml index 536072afa2..3cfba31479 100644 --- a/automatic_updates_extensions/tests/fixtures/release-history/test_theme.1.1.xml +++ b/automatic_updates_extensions/tests/fixtures/release-history/automatic_updates_extensions_test_theme.1.1.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <project xmlns:dc="http://purl.org/dc/elements/1.1/"> - <title>Test theme</title> - <short_name>test_theme</short_name> + <title>Automatic Updates Extensions Test Theme</title> + <short_name>automatic_updates_extensions_test_theme</short_name> <dc:creator>drupal</dc:creator> <type>project_theme</type> <supported_branches>8.x-2.,3.0.</supported_branches> <project_status>published</project_status> - <link>http://example.com/project/test_theme</link> + <link>http://example.com/project/automatic_updates_extensions_test_theme</link> <terms> <term> <name>Projects</name> @@ -23,23 +23,23 @@ </terms> <releases> <release> - <name>test_theme 3.0.0</name> + <name>automatic_updates_extensions_test_theme 3.0.0</name> <version>3.0.0</version> <tag>3.0.0</tag> <status>published</status> - <release_link>http://example.com/test_theme/releases/3.0.0</release_link> - <download_link>http://example.com/test_theme-3.0.0.tar.gz</download_link> + <release_link>http://example.com/automatic_updates_extensions_test_theme/releases/3.0.0</release_link> + <download_link>http://example.com/automatic_updates_extensions_test_theme-3.0.0.tar.gz</download_link> <date>1597793786</date> <files> <file> - <url>http://example.com/test_theme-3.0.0.tar.gz</url> + <url>http://example.com/automatic_updates_extensions_test_theme-3.0.0.tar.gz</url> <archive_type>tar.gz</archive_type> <md5>43956be126b27d718ecffd0b17244aa1</md5> <size>196080</size> <filedate>1597793786</filedate> </file> <file> - <url>http://example.com/test_theme-3.0.0.zip</url> + <url>http://example.com/automatic_updates_extensions_test_theme-3.0.0.zip</url> <archive_type>zip</archive_type> <md5>5d24ec88ac4755af6ccbe6ef5ff8b3c9</md5> <size>200399</size> @@ -50,23 +50,23 @@ <core_compatibility>^8 || ^9</core_compatibility> </release> <release> - <name>test_theme 8.x-2.1</name> + <name>automatic_updates_extensions_test_theme 8.x-2.1</name> <version>8.x-2.1</version> <tag>8.x-2.1</tag> <status>published</status> - <release_link>http://example.com/test_theme/releases/8.x-2.1</release_link> - <download_link>http://example.com/test_theme-8.x-2.1.tar.gz</download_link> + <release_link>http://example.com/automatic_updates_extensions_test_theme/releases/8.x-2.1</release_link> + <download_link>http://example.com/automatic_updates_extensions_test_theme-8.x-2.1.tar.gz</download_link> <date>1597793786</date> <files> <file> - <url>http://example.com/test_theme-8.x-2.1.tar.gz</url> + <url>http://example.com/automatic_updates_extensions_test_theme-8.x-2.1.tar.gz</url> <archive_type>tar.gz</archive_type> <md5>43956be126b27d718ecffd0b17244aa1</md5> <size>196080</size> <filedate>1597793786</filedate> </file> <file> - <url>http://example.com/test_theme-8.x-2.1.zip</url> + <url>http://example.com/automatic_updates_extensions_test_theme-8.x-2.1.zip</url> <archive_type>zip</archive_type> <md5>5d24ec88ac4755af6ccbe6ef5ff8b3c9</md5> <size>200399</size> @@ -83,23 +83,23 @@ <core_compatibility>8.x</core_compatibility> </release> <release> - <name>test_theme 8.x-2.0</name> + <name>automatic_updates_extensions_test_theme 8.x-2.0</name> <version>8.x-2.0</version> <tag>8.x-2.0</tag> <status>published</status> - <release_link>http://example.com/test_theme/releases/8.x-2.0</release_link> - <download_link>http://example.com/test_theme-8.x-2.0.tar.gz</download_link> + <release_link>http://example.com/automatic_updates_extensions_test_theme/releases/8.x-2.0</release_link> + <download_link>http://example.com/automatic_updates_extensions_test_theme-8.x-2.0.tar.gz</download_link> <date>1597793786</date> <files> <file> - <url>http://example.com/test_theme-8.x-2.0.tar.gz</url> + <url>http://example.com/automatic_updates_extensions_test_theme-8.x-2.0.tar.gz</url> <archive_type>tar.gz</archive_type> <md5>43956be126b27d718ecffd0b17244aa1</md5> <size>196080</size> <filedate>1597793786</filedate> </file> <file> - <url>http://example.com/test_theme-8.x-2.0.zip</url> + <url>http://example.com/automatic_updates_extensions_test_theme-8.x-2.0.zip</url> <archive_type>zip</archive_type> <md5>5d24ec88ac4755af6ccbe6ef5ff8b3c9</md5> <size>200399</size> diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/aaa_update_test/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/stage_composer/aaa_update_test/vendor/composer/installed.json index 45d5a87edf..d4ac4a2ae2 100644 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/aaa_update_test/vendor/composer/installed.json +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/aaa_update_test/vendor/composer/installed.json @@ -20,7 +20,7 @@ "version": "2.1.0", "type": "drupal-module" },{ - "name": "drupal/test_theme", + "name": "drupal/automatic_updates_extensions_test_theme", "version": "2.0.0", "type": "drupal-theme" } diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/composer.json b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/composer.json similarity index 57% rename from automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/composer.json rename to automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/composer.json index 4ae6caae31..8ee895a7a8 100644 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/composer.json +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/composer.json @@ -2,7 +2,7 @@ "extra": { "_readme": [ "This fixture assumes that ../../two_projects is active directory for the test.", - "Simulates a stage directory in which test_theme is updated." + "Simulates a stage directory in which automatic_updates_extensions_test_theme is updated." ] } } diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/composer.lock b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/composer.lock similarity index 100% rename from automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/composer.lock rename to automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/composer.lock diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/vendor/composer/installed.json similarity index 88% rename from automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/vendor/composer/installed.json rename to automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/vendor/composer/installed.json index d350c2293d..1476749ab6 100644 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/vendor/composer/installed.json +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/vendor/composer/installed.json @@ -21,7 +21,7 @@ "type": "drupal-module" }, { - "name": "drupal/test_theme", + "name": "drupal/automatic_updates_extensions_test_theme", "version": "2.1.0", "type": "drupal-theme" } diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/vendor/composer/installed.php b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/vendor/composer/installed.php similarity index 68% rename from automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/vendor/composer/installed.php rename to automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/vendor/composer/installed.php index db86abf49f..ab1ddd069b 100644 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/vendor/composer/installed.php +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/vendor/composer/installed.php @@ -7,9 +7,9 @@ $projects_dir = __DIR__ . '/../../web/projects'; return [ 'versions' => [ - 'drupal/test_theme' => [ - 'type' => 'drupal-module', - 'install_path' => $projects_dir . '/test_theme', + 'drupal/automatic_updates_extensions_test_theme' => [ + 'type' => 'drupal-theme', + 'install_path' => $projects_dir . '/automatic_updates_extensions_test_theme', ], 'drupal/semver_test' => [ 'type' => 'drupal-module', diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide new file mode 100644 index 0000000000..0fe2d04a2c --- /dev/null +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/automatic_updates_extensions_test_theme/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide @@ -0,0 +1 @@ +project: automatic_updates_extensions_test_theme diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/semver_test/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/stage_composer/semver_test/vendor/composer/installed.json index 9de2f48ee7..feff2d82a9 100644 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/semver_test/vendor/composer/installed.json +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/semver_test/vendor/composer/installed.json @@ -21,7 +21,7 @@ "type": "drupal-module" }, { - "name": "drupal/test_theme", + "name": "drupal/automatic_updates_extensions_test_theme", "version": "2.0.0", "type": "drupal-theme" } diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/web/projects/test_theme/test_theme.info.yml.hide b/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/web/projects/test_theme/test_theme.info.yml.hide deleted file mode 100644 index 95e64c8aff..0000000000 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/test_theme/web/projects/test_theme/test_theme.info.yml.hide +++ /dev/null @@ -1 +0,0 @@ -project: test_theme diff --git a/automatic_updates_extensions/tests/fixtures/stage_composer/two_projects/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/stage_composer/two_projects/vendor/composer/installed.json index ce3af23e5c..19944c3255 100644 --- a/automatic_updates_extensions/tests/fixtures/stage_composer/two_projects/vendor/composer/installed.json +++ b/automatic_updates_extensions/tests/fixtures/stage_composer/two_projects/vendor/composer/installed.json @@ -21,7 +21,7 @@ "type": "drupal-module" }, { - "name": "drupal/test_theme", + "name": "drupal/automatic_updates_extensions_test_theme", "version": "2.0.0", "type": "drupal-theme" } diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock b/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock index 023d4040da..57457e08cd 100644 --- a/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock +++ b/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock @@ -16,7 +16,7 @@ "version": "9.8.1" }, { - "name": "drupal/test_theme", + "name": "drupal/automatic_updates_extensions_test_theme", "version": "9.8.1" } ] diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json index 3416572c34..436721dfab 100644 --- a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json +++ b/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json @@ -21,7 +21,7 @@ "type": "drupal-module" }, { - "name": "drupal/test_theme", + "name": "drupal/automatic_updates_extensions_test_theme", "version": "2.0.0", "type": "drupal-theme" } diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php b/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php index db86abf49f..ab1ddd069b 100644 --- a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php +++ b/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php @@ -7,9 +7,9 @@ $projects_dir = __DIR__ . '/../../web/projects'; return [ 'versions' => [ - 'drupal/test_theme' => [ - 'type' => 'drupal-module', - 'install_path' => $projects_dir . '/test_theme', + 'drupal/automatic_updates_extensions_test_theme' => [ + 'type' => 'drupal-theme', + 'install_path' => $projects_dir . '/automatic_updates_extensions_test_theme', ], 'drupal/semver_test' => [ 'type' => 'drupal-module', diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide b/automatic_updates_extensions/tests/fixtures/two_projects/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide new file mode 100644 index 0000000000..0fe2d04a2c --- /dev/null +++ b/automatic_updates_extensions/tests/fixtures/two_projects/web/projects/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml.hide @@ -0,0 +1 @@ +project: automatic_updates_extensions_test_theme diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/web/projects/test_theme/test_theme.info.yml.hide b/automatic_updates_extensions/tests/fixtures/two_projects/web/projects/test_theme/test_theme.info.yml.hide deleted file mode 100644 index 95e64c8aff..0000000000 --- a/automatic_updates_extensions/tests/fixtures/two_projects/web/projects/test_theme/test_theme.info.yml.hide +++ /dev/null @@ -1 +0,0 @@ -project: test_theme diff --git a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php index c65ba293a5..10b2988dd1 100644 --- a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php +++ b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php @@ -58,7 +58,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { FALSE, 'aaa_update_test', 'AAA Update test', '8.x-2.0', '8.x-2.1', ], 'maintenance mode off, legacy theme' => [ - FALSE, 'test_theme', 'Test theme', '8.x-2.0', '8.x-2.1', + FALSE, 'automatic_updates_extensions_test_theme', 'Automatic Updates Extensions Test Theme', '8.x-2.0', '8.x-2.1', ], ]; } @@ -155,7 +155,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { // By default, the Update module only checks for updates of installed // modules and themes. The two modules we're testing here (semver_test and // aaa_update_test) are already installed by static::$modules. - $this->container->get('theme_installer')->install(['test_theme']); + $this->container->get('theme_installer')->install(['automatic_updates_extensions_test_theme']); $this->useFixtureDirectoryAsStaged(__DIR__ . '/../../fixtures/stage_composer/' . $project_name); $this->setReleaseMetadata(__DIR__ . '/../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml'); $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/' . $project_name . '.1.1.xml'); diff --git a/automatic_updates_extensions/tests/themes/test_theme/test_theme.info.yml b/automatic_updates_extensions/tests/themes/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml similarity index 100% rename from automatic_updates_extensions/tests/themes/test_theme/test_theme.info.yml rename to automatic_updates_extensions/tests/themes/automatic_updates_extensions_test_theme/automatic_updates_extensions_test_theme.info.yml diff --git a/dictionary.txt b/dictionary.txt index 7df2fd2279..7b028abdb9 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -5,3 +5,4 @@ syncer syncers kirk unwritable +filedate -- GitLab