diff --git a/modules/redirect_404/src/Tests/Redirect404TestBase.php b/modules/redirect_404/src/Tests/Redirect404TestBase.php deleted file mode 100644 index 2842aeb..0000000 --- a/modules/redirect_404/src/Tests/Redirect404TestBase.php +++ /dev/null @@ -1,144 +0,0 @@ -adminUser = $this->drupalCreateUser($this->adminPermissions); - $this->drupalLogin($this->adminUser); - - $this->drupalCreateContentType(['type' => 'page', 'name' => 'Page']); - } - - /** - * Passes if the language of the 404 path IS found on the loaded page. - * - * Because assertText() checks also in the Language select options, this - * specific assertion in the redirect 404 table body is needed. - * - * @param string $language - * The language to assert in the redirect 404 table body. - * @param string $body - * (optional) The table body xpath where to assert the language. Defaults - * to '//table/tbody'. - * @param string $message - * (optional) A message to display with the assertion. Do not translate - * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed - * variables in the message text, not t(). If left blank, a default message - * will be displayed. - * - * @return bool - * TRUE on pass, FALSE on fail. - */ - protected function assertLanguageInTableBody($language, $body = '//table/tbody', $message = '') { - return $this->assertLanguageInTableBodyHelper($language, $body, $message, FALSE); - } - - /** - * Passes if the language of the 404 path is NOT found on the loaded page. - * - * Because assertText() checks also in the Language select options, this - * specific assertion in the redirect 404 table body is needed. - * - * @param string $language - * The language to assert in the redirect 404 table body. - * @param string $body - * (optional) The table body xpath where to assert the language. Defaults - * to '//table/tbody'. - * @param string $message - * (optional) A message to display with the assertion. Do not translate - * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed - * variables in the message text, not t(). If left blank, a default message - * will be displayed. - * - * @return bool - * TRUE on pass, FALSE on fail. - */ - protected function assertNoLanguageInTableBody($language, $body = '//table/tbody', $message = '') { - return $this->assertLanguageInTableBodyHelper($language, $body, $message, TRUE); - } - - /** - * Helper for assertLanguageInTableBody and assertNoLanguageInTableBody. - * - * @param array $language - * The language to assert in the redirect 404 table body. - * @param string $body - * (optional) The table body xpath where to assert the language. Defaults - * to '//table/tbody'. - * @param string $message - * (optional) A message to display with the assertion. Do not translate - * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed - * variables in the message text, not t(). If left blank, a default message - * will be displayed. - * @param bool $not_exists - * (optional) TRUE if this language should not exist, FALSE if it should. - * Defaults to TRUE. - * - * @return bool - * TRUE on pass, FALSE on fail. - */ - protected function assertLanguageInTableBodyHelper($language, $body = '//table/tbody', $message = '', $not_exists = TRUE) { - if (!$message) { - if (!$not_exists) { - $message = new FormattableMarkup('Language "@language" found in 404 table.', ['@language' => $language]); - } - else { - $message = new FormattableMarkup('Language "@language" not found in 404 table.', ['@language' => $language]); - } - } - - if ($not_exists) { - return $this->assertFalse(strpos($this->xpath($body)[0]->asXML(), $language), $message); - } - else { - return $this->assertTrue(strpos($this->xpath($body)[0]->asXML(), $language), $message); - } - } - -} diff --git a/modules/redirect_404/src/Tests/Fix404RedirectUILanguageTest.php b/modules/redirect_404/tests/src/Functional/Fix404RedirectUILanguageTest.php similarity index 96% rename from modules/redirect_404/src/Tests/Fix404RedirectUILanguageTest.php rename to modules/redirect_404/tests/src/Functional/Fix404RedirectUILanguageTest.php index 89a14d2..a0d1a2d 100644 --- a/modules/redirect_404/src/Tests/Fix404RedirectUILanguageTest.php +++ b/modules/redirect_404/tests/src/Functional/Fix404RedirectUILanguageTest.php @@ -1,6 +1,6 @@ assertUrl('admin/config/search/redirect/404'); $this->assertText('There are no 404 errors to fix.'); // Check if the redirect works as expected. - $this->assertRedirect('fr/testing', 'fr/node', 'HTTP/1.1 301 Moved Permanently'); + $this->assertRedirect('fr/testing', 'fr/node', 301); // Test removing a redirect assignment, visit again the non existing page. $this->drupalGet('admin/config/search/redirect'); @@ -136,7 +136,7 @@ class Fix404RedirectUILanguageTest extends Redirect404TestBase { $this->drupalGet('admin/config/search/redirect'); $this->assertLanguageInTableBody('Spanish'); // Check if the redirect works as expected. - $this->assertRedirect('es/testing', 'es/node', 'HTTP/1.1 301 Moved Permanently'); + $this->assertRedirect('es/testing', 'es/node', 301); // Visit multiple non existing pages to test the Redirect 404 View. $this->drupalGet('testing1'); @@ -197,7 +197,7 @@ class Fix404RedirectUILanguageTest extends Redirect404TestBase { $this->assertLanguageInTableBody('Spanish'); $this->assertLanguageInTableBody('English'); // Check if the redirect works as expected. - $this->assertRedirect('/testing1', '/node', 'HTTP/1.1 301 Moved Permanently'); + $this->assertRedirect('/testing1', '/node', 301); } } diff --git a/modules/redirect_404/src/Tests/Fix404RedirectUITest.php b/modules/redirect_404/tests/src/Functional/Fix404RedirectUITest.php similarity index 88% rename from modules/redirect_404/src/Tests/Fix404RedirectUITest.php rename to modules/redirect_404/tests/src/Functional/Fix404RedirectUITest.php index fb8dd73..2045bf8 100644 --- a/modules/redirect_404/src/Tests/Fix404RedirectUITest.php +++ b/modules/redirect_404/tests/src/Functional/Fix404RedirectUITest.php @@ -1,6 +1,6 @@ clickLink('Ignore'); $this->assertUrl('admin/config/search/redirect/settings?ignore=' . $path_to_ignore . $destination); $this->assertText('Resolved the path ' . $path_to_ignore . ' in the database. Please check the ignored list and save the settings.'); - $xpath = $this->xpath('//*[@id="edit-ignore-pages"]')[0]->asXML(); - $this->assertTrue(strpos($xpath, $node_to_ignore), $node_to_ignore . " in 'Path to ignore' found"); - $this->assertTrue(strpos($xpath, $terms_to_ignore), $terms_to_ignore . " in 'Path to ignore' found"); - $this->assertTrue(strpos($xpath, $path_to_ignore), $path_to_ignore . " in 'Path to ignore' found"); + $this->assertSession()->elementContains('css', '#edit-ignore-pages', $node_to_ignore); + $this->assertSession()->elementContains('css', '#edit-ignore-pages', $terms_to_ignore); + $this->assertSession()->elementContains('css', '#edit-ignore-pages', $path_to_ignore); // Save the path with wildcard, but omitting the leading slash. $nodes_to_ignore = 'node/*'; @@ -175,12 +174,12 @@ class Fix404RedirectUITest extends Redirect404TestBase { // Go back to the settings to check the 'Path to ignore' configurations. $this->drupalGet('admin/config/search/redirect/settings'); - $xpath = $this->xpath('//*[@id="edit-ignore-pages"]')[0]->asXML(); + $xpath = $this->xpath('//*[@id="edit-ignore-pages"]')[0]->getHtml(); // Check that the new page to ignore has been saved with leading slash. - $this->assertTrue(strpos($xpath, '/' . $nodes_to_ignore), '/' . $nodes_to_ignore . " in 'Path to ignore' found"); - $this->assertTrue(strpos($xpath, $terms_to_ignore), $terms_to_ignore . " in 'Path to ignore' found"); - $this->assertFalse(strpos($xpath, $node_to_ignore), $node_to_ignore . " in 'Path to ignore' found"); - $this->assertFalse(strpos($xpath, $path_to_ignore), $path_to_ignore . " in 'Path to ignore' found"); + $this->assertSession()->elementContains('css', '#edit-ignore-pages', '/'. $nodes_to_ignore); + $this->assertSession()->elementContains('css', '#edit-ignore-pages', $terms_to_ignore); + $this->assertSession()->elementNotContains('css', '#edit-ignore-pages', $node_to_ignore); + $this->assertSession()->elementNotContains('css', '#edit-ignore-pages', $path_to_ignore); } } diff --git a/modules/redirect_404/src/Tests/Redirect404LogSuppressorTest.php b/modules/redirect_404/tests/src/Functional/Redirect404LogSuppressorTest.php similarity index 97% rename from modules/redirect_404/src/Tests/Redirect404LogSuppressorTest.php rename to modules/redirect_404/tests/src/Functional/Redirect404LogSuppressorTest.php index ef021b5..2737f68 100644 --- a/modules/redirect_404/src/Tests/Redirect404LogSuppressorTest.php +++ b/modules/redirect_404/tests/src/Functional/Redirect404LogSuppressorTest.php @@ -1,6 +1,6 @@ adminUser = $this->drupalCreateUser($this->adminPermissions); + $this->drupalLogin($this->adminUser); + + $this->drupalCreateContentType(['type' => 'page', 'name' => 'Page']); + } + + /** + * Passes if the language of the 404 path IS found on the loaded page. + * + * Because assertText() checks also in the Language select options, this + * specific assertion in the redirect 404 table body is needed. + * + * @param string $language + * The language to assert in the redirect 404 table body. + */ + protected function assertLanguageInTableBody($language) { + $this->assertSession()->elementContains('css', 'table tbody', $language); + } + + /** + * Passes if the language of the 404 path is NOT found on the loaded page. + * + * Because assertText() checks also in the Language select options, this + * specific assertion in the redirect 404 table body is needed. + * + * @param string $language + * The language to assert in the redirect 404 table body. + */ + protected function assertNoLanguageInTableBody($language) { + $this->assertSession()->elementNotContains('css', 'table tbody', $language); + } + +} diff --git a/modules/redirect_domain/src/Tests/RedirectDomainUITest.php b/modules/redirect_domain/tests/src/FunctionalJavascript/RedirectDomainUITest.php similarity index 66% rename from modules/redirect_domain/src/Tests/RedirectDomainUITest.php rename to modules/redirect_domain/tests/src/FunctionalJavascript/RedirectDomainUITest.php index d50791f..dec1bab 100644 --- a/modules/redirect_domain/src/Tests/RedirectDomainUITest.php +++ b/modules/redirect_domain/tests/src/FunctionalJavascript/RedirectDomainUITest.php @@ -1,15 +1,15 @@ assertFieldByName('redirects[0][destination]'); // Add another field for new domain redirect. - $this->drupalPostAjaxForm(NULL, [], ['op' => t('Add another')]); + $page = $this->getSession()->getPage(); + $page->pressButton('Add another'); // Add two new domain redirects. - $edit = [ - 'redirects[0][from]' => 'foo.example.org', - 'redirects[0][sub_path]' => '//sub-path', - 'redirects[0][destination]' => 'www.example.org/foo', - 'redirects[1][from]' => 'bar.example.org', - 'redirects[1][sub_path]' => '', - 'redirects[1][destination]' => 'www.example.org/bar', - ]; - $this->drupalPostForm(NULL, $edit, t('Save')); + $page->fillField('redirects[0][from]', 'foo.example.org'); + $page->fillField('redirects[0][sub_path]', '//sub-path'); + $page->fillField('redirects[0][destination]', 'www.example.org/foo'); + $page->fillField('redirects[1][from]', 'bar.example.org'); + $page->fillField('redirects[1][sub_path]', ''); + $page->fillField('redirects[1][destination]', 'www.example.org/bar'); + $page->pressButton('Save'); // Check the new domain redirects. $this->assertFieldByName('redirects[0][from]', 'foo.example.org'); diff --git a/src/Plugin/Field/FieldWidget/RedirectSourceWidget.php b/src/Plugin/Field/FieldWidget/RedirectSourceWidget.php index 3555912..0aae50c 100644 --- a/src/Plugin/Field/FieldWidget/RedirectSourceWidget.php +++ b/src/Plugin/Field/FieldWidget/RedirectSourceWidget.php @@ -2,6 +2,7 @@ namespace Drupal\redirect\Plugin\Field\FieldWidget; +use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; diff --git a/src/Tests/AssertRedirectTrait.php b/tests/src/Functional/AssertRedirectTrait.php similarity index 58% rename from src/Tests/AssertRedirectTrait.php rename to tests/src/Functional/AssertRedirectTrait.php index ae93688..8519412 100644 --- a/src/Tests/AssertRedirectTrait.php +++ b/tests/src/Functional/AssertRedirectTrait.php @@ -1,8 +1,7 @@ drupalHead($path); - $headers = $this->drupalGetHeaders(TRUE); + public function assertRedirect($path, $expected_ending_url, $expected_ending_status = 301) { + $client = $this->getSession()->getDriver()->getClient()->getClient(); + /** @var \Psr\Http\Message\ResponseInterface $response */ + $response = $client->request('HEAD', Url::fromUri('base:' . $path)->setAbsolute(TRUE)->toString(), ['allow_redirects' => false]); - $ending_url = isset($headers[0]['location']) ? $headers[0]['location'] : NULL; - $message = SafeMarkup::format('Testing redirect from %from to %to. Ending url: %url', [ - '%from' => $path, - '%to' => $expected_ending_url, - '%url' => $ending_url, - ]); + $this->assertEquals($expected_ending_status, $response->getStatusCode()); + + $ending_url = $response->getHeader('location'); + $ending_url = $ending_url ? $ending_url[0] : NULL; + $message = "Testing redirect from $path to $expected_ending_url. Ending url: $ending_url"; if ($expected_ending_url == '') { $expected_ending_url = Url::fromUri('base:')->setAbsolute()->toString(); @@ -46,8 +48,7 @@ trait AssertRedirectTrait { } $this->assertEqual($expected_ending_url, $ending_url, $message); - - $this->assertEqual($headers[0][':status'], $expected_ending_status); + return $response; } } diff --git a/src/Tests/GlobalRedirectTest.php b/tests/src/Functional/GlobalRedirectTest.php similarity index 98% rename from src/Tests/GlobalRedirectTest.php rename to tests/src/Functional/GlobalRedirectTest.php index 67dce83..3f68959 100644 --- a/src/Tests/GlobalRedirectTest.php +++ b/tests/src/Functional/GlobalRedirectTest.php @@ -1,20 +1,20 @@ drupalPostAjaxForm('admin/config/search/redirect/add', [ + $this->drupalPostForm('admin/config/search/redirect/add', [ 'redirect_source[0][path]' => 'non-existing?key=value', - ], 'redirect_source[0][path]'); + ], 'Save'); $this->assertRaw(t('The base source path %source is already being redirected. Do you want to edit the existing redirect?', ['%source' => 'non-existing?key=value', '@edit-page' => $redirect->url('edit-form')])); // The hint about a valid path. - $this->drupalPostAjaxForm('admin/config/search/redirect/add', [ + $this->drupalPostForm('admin/config/search/redirect/add', [ 'redirect_source[0][path]' => 'node', - ], 'redirect_source[0][path]'); + ], 'Save'); $this->assertRaw(t('The source path %path is likely a valid path. It is preferred to create URL aliases for existing paths rather than redirects.', ['%path' => 'node', '@url-alias' => Url::fromRoute('path.admin_add')->toString()])); @@ -400,20 +400,18 @@ class RedirectUITest extends WebTestBase { $redirect1->setStatusCode(301); $redirect1->save(); - $this->assertRedirect('test-redirect', 'node'); - $headers = $this->drupalGetHeaders(TRUE); + $response = $this->assertRedirect('test-redirect', 'node'); // Note, self::assertCacheTag() cannot be used here since it only looks at // the final set of headers. $expected = 'http_response ' . implode(' ', $redirect1->getCacheTags()); - $this->assertEqual($expected, $headers[0]['x-drupal-cache-tags'], 'Redirect cache tags properly set.'); + $this->assertEqual($expected, $response->getHeader('x-drupal-cache-tags')[0], 'Redirect cache tags properly set.'); // First request should be a cache MISS. - $this->assertEqual($headers[0]['x-drupal-cache'], 'MISS', 'First request to the redirect was not cached.'); + $this->assertEqual($response->getHeader('x-drupal-cache')[0], 'MISS', 'First request to the redirect was not cached.'); // Second request should be cached. - $this->assertRedirect('test-redirect', 'node'); - $headers = $this->drupalGetHeaders(TRUE); - $this->assertEqual($headers[0]['x-drupal-cache'], 'HIT', 'The second request to the redirect was cached.'); + $response = $this->assertRedirect('test-redirect', 'node'); + $this->assertEqual($response->getHeader('x-drupal-cache')[0], 'HIT', 'The second request to the redirect was cached.'); // Ensure that the redirect has been cleared from cache when deleted. $redirect1->delete();