Issue #3269267 by danflanagan8, dww: dblog tests should not rely on Classy

(cherry picked from commit f67f0cb2d8)
merge-requests/2022/head
catch 2022-03-29 10:25:03 +01:00
parent 39865b51bf
commit 4fb5cf2558
2 changed files with 12 additions and 6 deletions

View File

@ -11,6 +11,7 @@ use Drupal\Core\Url;
use Drupal\dblog\Controller\DbLogController;
use Drupal\error_test\Controller\ErrorTestController;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\system\Functional\Menu\AssertBreadcrumbTrait;
/**
* Generate events and verify dblog entries; verify user access to log reports
@ -20,6 +21,7 @@ use Drupal\Tests\BrowserTestBase;
*/
class DbLogTest extends BrowserTestBase {
use FakeLogEntries;
use AssertBreadcrumbTrait;
/**
* Modules to enable.
@ -38,7 +40,7 @@ class DbLogTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'classy';
protected $defaultTheme = 'stark';
/**
* A user with some relevant administrative permissions.
@ -366,9 +368,13 @@ class DbLogTest extends BrowserTestBase {
$query = Database::getConnection()->select('watchdog');
$query->addExpression('MIN([wid])');
$wid = $query->execute()->fetchField();
$this->drupalGet('admin/reports/dblog/event/' . $wid);
$xpath = '//nav[@class="breadcrumb"]/ol/li[last()]/a';
$this->assertEquals('Recent log messages', current($this->xpath($xpath))->getText(), 'DBLogs link displayed at breadcrumb in event page.');
$trail = [
'' => 'Home',
'admin' => 'Administration',
'admin/reports' => 'Reports',
'admin/reports/dblog' => 'Recent log messages',
];
$this->assertBreadcrumb('admin/reports/dblog/event/' . $wid, $trail);
}
/**

View File

@ -31,13 +31,13 @@ class DbLogViewsTest extends DbLogTest {
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'classy';
protected $defaultTheme = 'stark';
/**
* {@inheritdoc}
*/
protected function getLogsEntriesTable() {
return $this->xpath('.//table[contains(@class, "views-view-table")]/tbody/tr');
return $this->xpath('.//div[contains(@class, "views-element-container")]//table/tbody/tr');
}
/**