Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
10 merge requests!10602Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear,!10301Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time login...,!10187Issue #3487488 by dakwamine: ExtensionMimeTypeGuesser::guessMimeType must support file names with "0" (zero) like foo.0.zip,!9929Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9787Resolve issue 3479427 - bootstrap barrio issue under Windows,!9742Issue #3463908 by catch, quietone: Split OptionsFieldUiTest into two,!9526Issue #3458177 by mondrake, catch, quietone, godotislate, longwave, larowlan,...,!6502Draft: Resolve #2938524 "Plach testing issue",!38582585169-10.1.x,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key
Pipeline #238022 passed with warnings
Pipeline: drupal

#238070

    Pipeline: drupal

    #238064

      Pipeline: drupal

      #238055

        +6
        ......@@ -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,34 +253,37 @@ public function testUserPasswordResetPreferredLanguage($setPreferredLangcode, $a
        $config->set('url.prefixes', ['en' => '', 'fr' => 'fr', 'zh-hant' => 'zh'])->save();
        $this->rebuildContainer();
        $this->account->preferred_langcode = $setPreferredLangcode;
        $this->account->save();
        $this->assertSame($setPreferredLangcode, $this->account->getPreferredLangcode(FALSE));
        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));
        // Test Default langcode is different from active langcode when visiting different.
        if ($setPreferredLangcode !== 'en') {
        $this->drupalGet($prefix . '/user/password');
        $this->assertSame($activeLangcode, $this->getSession()->getResponseHeader('Content-language'));
        $this->assertSame('en', $this->languageManager->getDefaultLanguage()->getId());
        }
        // Test password reset with language prefixes.
        $this->drupalGet($visitingUrl);
        $edit = ['name' => $this->account->getAccountName()];
        $this->submitForm($edit, 'Submit');
        $this->assertValidPasswordReset($edit['name']);
        // Test Default langcode is different from active langcode when visiting different.
        if ($setPreferredLangcode !== 'en') {
        $this->drupalGet($prefix . '/user/password');
        $this->assertSame($activeLangcode, $this->getSession()->getResponseHeader('Content-language'));
        $this->assertSame('en', $this->languageManager->getDefaultLanguage()->getId());
        $resetURL = $this->getResetURL();
        $this->assertStringContainsString($expectedResetUrl, $resetURL);
        $this->assertStringNotContainsString($unexpectedResetUrl, $resetURL);
        }
        // Test password reset with language prefixes.
        $this->drupalGet($visitingUrl);
        $edit = ['name' => $this->account->getAccountName()];
        $this->submitForm($edit, 'Submit');
        $this->assertValidPasswordReset($edit['name']);
        $resetURL = $this->getResetURL();
        $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',
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment