Verified Commit 0ec61e36 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3205912 by quietone, kunal.sachdev, tedbow: Move duplicate code in... 

Issue #3205912 by quietone, kunal.sachdev, tedbow: Move duplicate code in testNormalUpdateAvailable to a new method

(cherry picked from commit 8a67d672)
parent 3d98eb89

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

+18 −10
Original line number Diff line number Diff line
@@ -70,11 +70,7 @@ public function testNormalUpdateAvailable() { 
            // Both stable and unstable releases are available.

            // A stable release is the latest.

            if ($extra_version == '') {

              $this->assertUpdateTableTextNotContains('Up to date');

              $this->assertUpdateTableTextContains('Update available');

              $this->assertVersionUpdateLinks('Recommended version:', $full_version);

              $this->assertUpdateTableTextNotContains('Latest version:');

              $this->assertUpdateTableElementContains('warning.svg');

              $this->assertNoExtraVersion($full_version);

            }

            // Only unstable releases are available.

            // An unstable release is the latest.
@@ -91,11 +87,7 @@ public function testNormalUpdateAvailable() { 
            // Both stable and unstable releases are available.

            // A stable release is the latest.

            if ($extra_version == '') {

              $this->assertUpdateTableTextNotContains('Up to date');

              $this->assertUpdateTableTextContains('Update available');

              $this->assertVersionUpdateLinks('Recommended version:', $full_version);

              $this->assertUpdateTableTextNotContains('Latest version:');

              $this->assertUpdateTableElementContains('warning.svg');

              $this->assertNoExtraVersion($full_version);

            }

            // Both stable and unstable releases are available.

            // An unstable release is the latest.
@@ -112,6 +104,22 @@ public function testNormalUpdateAvailable() { 
    }

  }



  /**

   * Asserts update table when there is no extra version.

   *

   * @param string $full_version

   *   The recommended version.

   *

   * @return void

   */

  protected function assertNoExtraVersion(string $full_version): void {

    $this->assertUpdateTableTextNotContains('Up to date');

    $this->assertUpdateTableTextContains('Update available');

    $this->assertVersionUpdateLinks('Recommended version:', $full_version);

    $this->assertUpdateTableTextNotContains('Latest version:');

    $this->assertUpdateTableElementContains('warning.svg');

  }



  /**

   * Tests the Update Manager module when major updates are available.

   *