diff -u b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php --- b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php @@ -94,7 +94,13 @@ // Check the test option. $this->assertIdentical($view->display_handler->getOption('test_option'), ''); - $this->setExpectedException(\PHPUnit_Framework_Error::class); + $style = $view->display_handler->getOption('style'); + $style['type'] = 'test_style'; + $view->display_handler->setOption('style', $style); + $view->initDisplay(); + $view->initStyle(); + $view->style_plugin->setUsesRowPlugin(FALSE); + $output = $view->preview(); $output = $renderer->renderRoot($output); @@ -104,7 +110,6 @@ $view->display_handler->overrideOption('test_option', 'Test option title'); $view->save(); - $this->setExpectedException(\PHPUnit_Framework_Error::class); $output = $view->preview(); $output = $renderer->renderRoot($output); @@ -115,9 +120,9 @@ $this->drupalGet('admin/structure/views/view/test_view/edit/display_test_1'); $this->assertText('Display test settings'); // Ensure that the order is as expected. - $result = $this->xpath('//ul[@id="views-display-menu-tabs"]/li'); - $this->assertEqual((string) $result[0]->a, 'Display test 2'); - $this->assertEqual((string) $result[1]->a, 'Display test'); + $result = $this->xpath('//ul[@id="views-display-menu-tabs"]/li/a/child::text()'); + $this->assertEqual($result[0]->getText(), 'Display test 2'); + $this->assertEqual($result[1]->getText(), 'Display test'); $this->clickLink('Test option title'); diff -u b/core/modules/views/tests/src/Functional/ViewTestBase.php b/core/modules/views/src/Tests/ViewTestBase.php --- b/core/modules/views/tests/src/Functional/ViewTestBase.php +++ b/core/modules/views/src/Tests/ViewTestBase.php @@ -1,12 +1,10 @@ assertSession()->buildXPathQuery('//button[@id=:value]|//input[@id=:value]', [':value' => $id]); - $field = $this->getSession()->getPage()->find('xpath', $xpath); - - if (empty($field)) { - throw new ElementNotFoundException($this->getSession()->getDriver(), 'form field', 'id', $field); - } - - $this->assertEquals($expected_label, $field->getValue()); + return $this->assertFieldById($id, $expected_label, t($message, ['%label' => $expected_label])); } /** diff -u b/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php b/core/modules/views/src/Tests/Wizard/WizardTestBase.php --- b/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php +++ b/core/modules/views/src/Tests/Wizard/WizardTestBase.php @@ -1,11 +1,15 @@ drupalCreateUser(['administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions']);