Skip to content
Snippets Groups Projects
Commit 25a42d53 authored by Yash Rode's avatar Yash Rode Committed by Ted Bowman
Browse files

Issue #3323211 by yash.rode: Remove duplicate aaa_update_test.1.1.xml

parent 321d4f93
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
automatic_updates_extensions/tests/fixtures/release-history/aaa_update_test.1.1.xml deleted 100644 → 0
+ 0
− 201
View file @ 321d4f93
<?xml version="1.0" encoding="utf-8"?>
<!--
This fixture is used by \Drupal\Tests\automatic_updates_extensions\Functional\UpdaterFormTest.
Contains metadata about the following (fake) releases of aaa_update_test module, all of which are secure, in order:
- 8.x-3.0, which is in an unsupported branch
- 8.x-2.1
- 8.x-2.1-beta1
- 8.x-2.1-alpha1
- 8.x-2.0
- 8.x-2.0-beta1
- 8.x-2.0-alpha1
- 8.x-1.1
- 8.x-1.1-beta1
- 8.x-1.1-alpha1
- 8.x-1.0
- 8.x-1.0-beta1
- 8.x-1.0-alpha1
-->
<project xmlns:dc="http://purl.org/dc/elements/1.1/">
<title>AAA Update test</title>
<short_name>aaa_update_test</short_name>
<dc:creator>Drupal</dc:creator>
<supported_branches>8.x-2.,8.x-1.</supported_branches>
<project_status>published</project_status>
<link>http://example.com/project/aaa_update_test</link>
<terms>
<term><name>Projects</name><value>AAA Update test project</value></term>
</terms>
<releases>
<release>
<name>AAA Update test 8.x-3.0</name>
<version>8.x-3.0</version>
<tag>8.x-3.0</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-3-0-release</release_link>
<download_link>http://example.com/aaa_update_test-8-3-0.tar.gz</download_link>
<date>1584195300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 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/aaa_update_test-8-x-2-1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-2-1.tar.gz</download_link>
<date>1581603300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-2.1-beta1</name>
<version>8.x-2.1-beta1</version>
<tag>8.x-2.1-beta1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-2-1-beta1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-2-1-beta1.tar.gz</download_link>
<date>1579011300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-2.1-alpha1</name>
<version>8.x-2.1-alpha1</version>
<tag>8.x-2.1-alpha1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-2-1-alpha1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-2-1-alpha1.tar.gz</download_link>
<date>1576419300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 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/aaa_update_test-8-x-2-0-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-2-0.tar.gz</download_link>
<date>1573827300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-2.0-beta1</name>
<version>8.x-2.0-beta1</version>
<tag>8.x-2.0-beta1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-2-0-beta1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-2-0-beta1.tar.gz</download_link>
<date>1571235300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-2.0-alpha1</name>
<version>8.x-2.0-alpha1</version>
<tag>8.x-2.0-alpha1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-2-0-alpha1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-2-0-alpha1.tar.gz</download_link>
<date>1568643300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-1.1</name>
<version>8.x-1.1</version>
<tag>8.x-1.1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-1.tar.gz</download_link>
<date>1566051300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-1.1-beta1</name>
<version>8.x-1.1-beta1</version>
<tag>8.x-1.1-beta1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-1-beta1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-1-beta1.tar.gz</download_link>
<date>1563459300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-1.1-alpha1</name>
<version>8.x-1.1-alpha1</version>
<tag>8.x-1.1-alpha1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-1-alpha1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-1-alpha1.tar.gz</download_link>
<date>1560867300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-1.0</name>
<version>8.x-1.0</version>
<tag>8.x-1.0</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-0.tar.gz</download_link>
<date>1558275300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-1.0-beta1</name>
<version>8.x-1.0-beta1</version>
<tag>8.x-1.0-beta1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-0-beta1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-0-beta1.tar.gz</download_link>
<date>1555683300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
<release>
<name>AAA Update test 8.x-1.0-alpha1</name>
<version>8.x-1.0-alpha1</version>
<tag>8.x-1.0-alpha1</tag>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-0-alpha1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-0-alpha1.tar.gz</download_link>
<date>1553091300</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
</terms>
</release>
</releases>
</project>
automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
+ 4
− 3
View file @ 25a42d53
......@@ -185,7 +185,8 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$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');
$path_to_fixtures_folder = $project_name === 'aaa_update_test' ? '/../../../../package_manager/tests' : '/../..';
$this->setReleaseMetadata(__DIR__ . $path_to_fixtures_folder . '/fixtures/release-history/' . $project_name . '.1.1.xml');
$this->setProjectInstalledVersion([$project_name => $installed_version]);
$this->checkForUpdates();
$state = $this->container->get('state');
......@@ -381,7 +382,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$this->container->get('theme_installer')->install(['automatic_updates_theme_with_updates']);
$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");
$this->setReleaseMetadata(__DIR__ . "/../../../../package_manager/tests/fixtures/release-history/aaa_update_test.1.1.xml");
Stager::setFixturePath(__DIR__ . '/../../fixtures/stage_composer/two_projects');
$this->setProjectInstalledVersion([
'semver_test' => '8.1.0',
......@@ -433,7 +434,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
* Tests the form when modules requiring an update not installed via composer.
*/
public function testNonComposerProjects(): void {
$this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/aaa_update_test.1.1.xml');
$this->setReleaseMetadata(__DIR__ . '/../../../../package_manager/tests/fixtures/release-history/aaa_update_test.1.1.xml');
$this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
$this->config('update.settings')
->set('fetch.url', $this->baseUrl . '/test-release-history')
......
automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php
+ 2
− 1
View file @ 25a42d53
......@@ -51,8 +51,9 @@ class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBas
->set("system_info.$project", $module_info)
->save();
$path_to_fixtures_folder = $project === 'aaa_update_test' ? '/../../../../../package_manager/tests/' : '/../../../';
$this->setReleaseMetadata([
$project => __DIR__ . "/../../../fixtures/release-history/$project.1.1.xml",
$project => __DIR__ . $path_to_fixtures_folder . "fixtures/release-history/$project.1.1.xml",
'drupal' => __DIR__ . '/../../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml',
]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment