Commit bf1fc45b authored by catch's avatar catch
Browse files

Issue #3252067 by tedbow, Spokje: Remove duplicate loading of update reports... 

Issue #3252067 by tedbow, Spokje: Remove duplicate loading of update reports after refreshUpdateStatus

(cherry picked from commit 5e0c689e)
(cherry picked from commit 2d9eca99)
parent e1dcff57

core/modules/update/tests/src/Functional/UpdateContribTest.php

+0 −5
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ public function testNoReleasesAvailable() { 
    ];

    $this->config('update_test.settings')->set('system_info', $system_info)->save();

    $this->refreshUpdateStatus(['drupal' => '0.0', 'aaa_update_test' => 'no-releases']);

    $this->drupalGet('admin/reports/updates');

    // Cannot use $this->standardTests() because we need to check for the

    // 'No available releases found' string.

    $this->assertSession()->responseContains('<h3>Drupal core</h3>');
@@ -277,9 +276,6 @@ public function testNormalUpdateAvailable() { 
          'aaa_update_test' => str_replace('.', '_', $version) . $extra_version,

        ]);

        $this->standardTests();

        $this->drupalGet('admin/reports/updates');

        $this->clickLink('Check manually');

        $this->checkForMetaRefresh();

        $assert_session->pageTextNotContains('Security update required!');

        // The XML test fixtures for this method all contain the '8.x-3.0'

        // release but because '8.x-3.0' is not in a supported branch it will
@@ -550,7 +546,6 @@ public function testHookUpdateStatusAlter() { 
        'aaa_update_test' => '1_0',

      ]

    );

    $this->drupalGet('admin/reports/updates');

    $this->assertSession()->responseContains('<h3>Modules</h3>');

    $this->assertSession()->pageTextContains('Security update required!');

    $this->assertSession()->linkExists('AAA Update test');

core/modules/update/tests/src/Functional/UpdateSemverTestBase.php

+0 −6
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ public function testNormalUpdateAvailable() { 
        $full_version = "8.$minor_version.1$extra_version";

        $this->refreshUpdateStatus([$this->updateProject => "$minor_version.1" . $extra_version]);

        $this->standardTests();

        $this->drupalGet('admin/reports/updates');

        $this->clickLink('Check manually');

        $this->checkForMetaRefresh();

        $this->assertUpdateTableTextNotContains('Security update required!');

        // The XML test fixtures for this method all contain the '8.2.0' release

        // but because '8.2.0' is not in a supported branch it will not be in
@@ -158,9 +155,6 @@ public function testMajorUpdateAvailable() { 
          $this->setProjectInstalledVersion("8.$minor_version.$patch_version" . $extra_version);

          $this->refreshUpdateStatus([$this->updateProject => '9']);

          $this->standardTests();

          $this->drupalGet('admin/reports/updates');

          $this->clickLink('Check manually');

          $this->checkForMetaRefresh();

          $this->assertUpdateTableTextNotContains('Security update required!');

          $this->assertUpdateTableElementContains(Link::fromTextAndUrl('9.0.0', Url::fromUri("http://example.com/{$this->updateProject}-9-0-0-release"))->toString());

          $this->assertUpdateTableElementContains(Link::fromTextAndUrl('Download', Url::fromUri("http://example.com/{$this->updateProject}-9-0-0.tar.gz"))->toString());