Commit d2477c64 authored by Adam G-H's avatar Adam G-H
Browse files

Issue #3310972 by phenaproxima: Release history fixtures are duplicated

parent 7de19b88

automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { 
    // aaa_update_test) are already installed by static::$modules.

    $this->container->get('theme_installer')->install(['test_theme']);

    $this->useFixtureDirectoryAsStaged(__DIR__ . '/../../fixtures/stage_composer/' . $project_name);

    $this->setReleaseMetadata(__DIR__ . '/../../../../tests/fixtures/release-history/drupal.9.8.2.xml');

    $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');

    $this->setProjectInstalledVersion([$project_name => $installed_version]);

    $this->checkForUpdates();
@@ -235,7 +235,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { 
   */

  public function testDisplayUpdates(bool $unrequested_updates): void {

    $this->container->get('theme_installer')->install(['automatic_updates_theme_with_updates']);

    $this->setReleaseMetadata(__DIR__ . '/../../../../tests/fixtures/release-history/drupal.9.8.2.xml');

    $this->setReleaseMetadata(__DIR__ . '/../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml');

    $this->setReleaseMetadata(__DIR__ . "/../../fixtures/release-history/semver_test.1.1.xml");

    $this->setReleaseMetadata(__DIR__ . "/../../fixtures/release-history/aaa_update_test.1.1.xml");

    Stager::setFixturePath(__DIR__ . '/../../fixtures/stage_composer/two_projects');

automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBas 


    $this->setReleaseMetadata([

      $project => __DIR__ . "/../../../fixtures/release-history/$project.1.1.xml",

      'drupal' => __DIR__ . '/../../../../../tests/fixtures/release-history/drupal.9.8.2.xml',

      'drupal' => __DIR__ . '/../../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml',

    ]);



    if ($error_expected) {
@@ -128,7 +128,7 @@ class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBas 
    $this->setReleaseMetadata([

      'aaa_automatic_updates_test' => __DIR__ . "/../../../../../package_manager/tests/fixtures/release-history/aaa_automatic_updates_test.9.8.2.xml",

      $project => __DIR__ . "/../../../fixtures/release-history/$project.1.1.xml",

      'drupal' => __DIR__ . '/../../../../../tests/fixtures/release-history/drupal.9.8.2.xml',

      'drupal' => __DIR__ . '/../../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml',

    ]);

    $active_dir = __DIR__ . '/../../../fixtures/update_release_validator/active';

    $this->copyFixtureFolderToActiveDirectory($active_dir);

package_manager/tests/fixtures/release-history/drupal.9.8.1-security.xml

+105 −62
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Contains metadata about the following (fake) releases of Drupal core, in order:

* 9.8.1, which is a security release

* 9.8.0, which is insecure

* 9.8.0-alpha1, which is insecure

* 9.8.x-dev

-->

<project xmlns:dc="http://purl.org/dc/elements/1.1/">

    <title>Drupal</title>

    <short_name>drupal</short_name>
@@ -7,7 +14,10 @@ 
    <project_status>published</project_status>

    <link>http://example.com/project/drupal</link>

    <terms>

   <term><name>Projects</name><value>Drupal project</value></term>

        <term>

            <name>Projects</name>

            <value>Drupal project</value>

        </term>

    </terms>

    <releases>

        <release>
@@ -18,9 +28,18 @@ 
            <download_link>http://example.com/drupal-9-8-1.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

    <term><name>Release type</name><value>New features</value></term>

    <term><name>Release type</name><value>Bug fixes</value></term>

    <term><name>Release type</name><value>Security update</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Security update</value>

                </term>

            </terms>

        </release>

        <release>
@@ -31,9 +50,18 @@ 
            <download_link>http://example.com/drupal-9-8-0.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

     <term><name>Release type</name><value>New features</value></term>

     <term><name>Release type</name><value>Bug fixes</value></term>

     <term><name>Release type</name><value>Insecure</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Insecure</value>

                </term>

            </terms>

        </release>

        <release>
@@ -44,9 +72,18 @@ 
            <download_link>http://example.com/drupal-9-8-0-alpha1-.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

            <term><name>Release type</name><value>Insecure</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Insecure</value>

                </term>

            </terms>

        </release>

        <release>
@@ -57,8 +94,14 @@ 
            <download_link>http://example.com/drupal-9-8-x-dex.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

    </releases>

package_manager/tests/fixtures/release-history/drupal.9.8.2-older-sec-release.xml

+206 −122
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Contains metadata about the following (fake) releases of Drupal core, in order:

* 9.8.2

* 9.8.1, which is a security update

* 9.8.1-beta1, which is a security update

* 9.8.0, which is insecure

* 9.8.0-alpha1

* 9.7.1, which is a security update

* 9.7.0, which is insecure

* 9.7.0-alpha1

* 9.8.x-dev

-->

<project xmlns:dc="http://purl.org/dc/elements/1.1/">

    <title>Drupal</title>

    <short_name>drupal</short_name>
@@ -7,7 +19,10 @@ 
    <project_status>published</project_status>

    <link>http://example.com/project/drupal</link>

    <terms>

   <term><name>Projects</name><value>Drupal project</value></term>

        <term>

            <name>Projects</name>

            <value>Drupal project</value>

        </term>

    </terms>

    <releases>

        <release>
@@ -18,8 +33,14 @@ 
            <download_link>http://example.com/drupal-9-8-2.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

      <term><name>Release type</name><value>New features</value></term>

      <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -30,9 +51,18 @@ 
            <download_link>http://example.com/drupal-9-8-1.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

    <term><name>Release type</name><value>New features</value></term>

    <term><name>Release type</name><value>Bug fixes</value></term>

    <term><name>Release type</name><value>Security update</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Security update</value>

                </term>

            </terms>

        </release>

        <release>
@@ -43,9 +73,18 @@ 
            <download_link>http://example.com/drupal-9-8-1-beta1.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

            <term><name>Release type</name><value>Security release</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Security release</value>

                </term>

            </terms>

        </release>

        <release>
@@ -56,9 +95,18 @@ 
            <download_link>http://example.com/drupal-9-8-0.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

     <term><name>Release type</name><value>New features</value></term>

     <term><name>Release type</name><value>Bug fixes</value></term>

     <term><name>Release type</name><value>Insecure</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Insecure</value>

                </term>

            </terms>

        </release>

        <release>
@@ -69,8 +117,14 @@ 
            <download_link>http://example.com/drupal-9-8-0-alpha1.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

      <term><name>Release type</name><value>New features</value></term>

      <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -81,9 +135,18 @@ 
            <download_link>http://example.com/drupal-9-7-1.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

            <term><name>Release type</name><value>Security update</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Security update</value>

                </term>

            </terms>

        </release>

        <release>
@@ -94,9 +157,18 @@ 
            <download_link>http://example.com/drupal-9-7-0.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

            <term><name>Release type</name><value>Insecure</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Insecure</value>

                </term>

            </terms>

        </release>

        <release>
@@ -107,8 +179,14 @@ 
            <download_link>http://example.com/drupal-9-7-0-alpha1.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -119,8 +197,14 @@ 
            <download_link>http://example.com/drupal-9-8-x-dex.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

    </releases>

package_manager/tests/fixtures/release-history/drupal.9.8.2-unsupported_unpublished.xml

+228 −142
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

Contains metadata about the following (fake) releases of Drupal core, in order:

* 9.8.2

* 9.8.1, which is unsupported

* 9.8.0

* 9.8.0-alpha1

* 9.7.1

* 9.7.0

* 9.7.0-alpha1

* 9.6.1, which is in an unsupported branch

* 9.6.0, which is in an unsupported branch

* 9.6.0, which is in an unsupported branch

* 9.8.x-dev

-->

<project xmlns:dc="http://purl.org/dc/elements/1.1/">

    <title>Drupal</title>

    <short_name>drupal</short_name>
@@ -7,7 +21,10 @@ 
    <project_status>published</project_status>

    <link>http://example.com/project/drupal</link>

    <terms>

   <term><name>Projects</name><value>Drupal project</value></term>

        <term>

            <name>Projects</name>

            <value>Drupal project</value>

        </term>

    </terms>

    <releases>

        <release>
@@ -18,8 +35,14 @@ 
            <download_link>http://example.com/drupal-9-8-2.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

      <term><name>Release type</name><value>New features</value></term>

      <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -30,9 +53,18 @@ 
            <download_link>http://example.com/drupal-9-8-1.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

    <term><name>Release type</name><value>New features</value></term>

    <term><name>Release type</name><value>Bug fixes</value></term>

    <term><name>Release type</name><value>Unsupported</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Unsupported</value>

                </term>

            </terms>

        </release>

        <release>
@@ -43,8 +75,14 @@ 
            <download_link>http://example.com/drupal-9-8-0.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

     <term><name>Release type</name><value>New features</value></term>

     <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -55,8 +93,14 @@ 
            <download_link>http://example.com/drupal-9-8-0-alpha1.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

      <term><name>Release type</name><value>New features</value></term>

      <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -67,8 +111,14 @@ 
            <download_link>http://example.com/drupal-9-7-1.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -79,8 +129,14 @@ 
            <download_link>http://example.com/drupal-9-7-0.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -91,8 +147,14 @@ 
            <download_link>http://example.com/drupal-9-7-0-alpha1.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -103,8 +165,14 @@ 
            <download_link>http://example.com/drupal-9-6-1.tar.gz</download_link>

            <date>1250425521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -115,8 +183,14 @@ 
            <download_link>http://example.com/drupal-9-6-0.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -127,8 +201,14 @@ 
            <download_link>http://example.com/drupal-9-6-0-alpha1.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

        <release>
@@ -139,8 +219,14 @@ 
            <download_link>http://example.com/drupal-9-8-x-dex.tar.gz</download_link>

            <date>1250424521</date>

            <terms>

            <term><name>Release type</name><value>New features</value></term>

            <term><name>Release type</name><value>Bug fixes</value></term>

                <term>

                    <name>Release type</name>

                    <value>New features</value>

                </term>

                <term>

                    <name>Release type</name>

                    <value>Bug fixes</value>

                </term>

            </terms>

        </release>

    </releases>