Verified Commit 387e4e94 authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3462561 by catch, smustgrave: Stop using a data provider in UserPasswordResetTest

(cherry picked from commit a6f5d7d3)
parent 9eb5ee79
Loading
Loading
Loading
Loading
Loading
+24 −23
Original line number Diff line number Diff line
@@ -240,10 +240,8 @@ public function testUserPasswordReset(): void {

  /**
   * Tests password reset functionality when user has set preferred language.
   *
   * @dataProvider languagePrefixTestProvider
   */
  public function testUserPasswordResetPreferredLanguage($setPreferredLangcode, $activeLangcode, $prefix, $visitingUrl, $expectedResetUrl, $unexpectedResetUrl): void {
  public function testUserPasswordResetPreferredLanguage(): void {
    // Set two new languages.
    ConfigurableLanguage::createFromLangcode('fr')->save();
    ConfigurableLanguage::createFromLangcode('zh-hant')->save();
@@ -255,6 +253,8 @@ public function testUserPasswordResetPreferredLanguage($setPreferredLangcode, $a
    $config->set('url.prefixes', ['en' => '', 'fr' => 'fr', 'zh-hant' => 'zh'])->save();
    $this->rebuildContainer();

    foreach ($this->languagePrefixTestProvider() as $scenario) {
      [$setPreferredLangcode, $activeLangcode, $prefix, $visitingUrl, $expectedResetUrl, $unexpectedResetUrl] = array_values($scenario);
      $this->account->preferred_langcode = $setPreferredLangcode;
      $this->account->save();
      $this->assertSame($setPreferredLangcode, $this->account->getPreferredLangcode(FALSE));
@@ -276,13 +276,14 @@ public function testUserPasswordResetPreferredLanguage($setPreferredLangcode, $a
      $this->assertStringContainsString($expectedResetUrl, $resetURL);
      $this->assertStringNotContainsString($unexpectedResetUrl, $resetURL);
    }
  }

  /**
   * Data provider for testUserPasswordResetPreferredLanguage().
   * Provides scenarios for testUserPasswordResetPreferredLanguage().
   *
   * @return array
   */
  public static function languagePrefixTestProvider() {
  protected function languagePrefixTestProvider() {
    return [
      'Test language prefix set as \'\', visiting default with preferred language as en' => [
        'setPreferredLangcode' => 'en',