diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php index 41e5b79..928e37d 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php @@ -35,30 +35,6 @@ protected function initMink() { } /** - * Asserts that the element with the given CSS selector is visible. - * - * @param string $css_selector - * The CSS selector identifying the element to check. - * @param string $message - * Optional message to show alongside the assertion. - */ - protected function assertElementVisible($css_selector, $message = '') { - $this->assertTrue($this->getSession()->getDriver()->isVisible(CssSelector::toXPath($css_selector)), $message); - } - - /** - * Asserts that the element with the given CSS selector is not visible. - * - * @param string $css_selector - * The CSS selector identifying the element to check. - * @param string $message - * Optional message to show alongside the assertion. - */ - protected function assertElementNotVisible($css_selector, $message = '') { - $this->assertFalse($this->getSession()->getDriver()->isVisible(CssSelector::toXPath($css_selector)), $message); - } - - /** * Waits for the given time or until the given JS condition becomes TRUE. * * @param string $condition @@ -75,7 +51,7 @@ protected function assertElementNotVisible($css_selector, $message = '') { */ protected function assertJsCondition($condition, $timeout = 1000, $message = '') { $message = $message ?: "Javascript condition met:\n" . $condition; - $result = $this->getSession()->getDriver()->wait($timeout, $condition); + $result = $this->getSession()->wait($timeout, $condition); $this->assertTrue($result, $message); } diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php index 8d8ea2b..9c5c992 100644 --- a/core/tests/Drupal/Tests/BrowserTestBase.php +++ b/core/tests/Drupal/Tests/BrowserTestBase.php @@ -1441,40 +1441,6 @@ protected function drupalUserIsLoggedIn(UserInterface $account) { } /** - * Asserts that the element with the given CSS selector is present. - * - * @param string $css_selector - * The CSS selector identifying the element to check. - * @param string $message - * Optional message to show alongside the assertion. - */ - protected function assertElementPresent($css_selector, $message = '') { - $this->assertNotEmpty($this->getSession()->getDriver()->find(CssSelector::toXPath($css_selector)), $message); - } - - /** - * Asserts that the element with the given CSS selector is not present. - * - * @param string $css_selector - * The CSS selector identifying the element to check. - * @param string $message - * Optional message to show alongside the assertion. - */ - protected function assertElementNotPresent($css_selector, $message = '') { - $this->assertEmpty($this->getSession()->getDriver()->find(CssSelector::toXPath($css_selector)), $message); - } - - /** - * Clicks the element with the given CSS selector. - * - * @param string $css_selector - * The CSS selector identifying the element to click. - */ - protected function click($css_selector) { - $this->getSession()->getDriver()->click(CssSelector::toXPath($css_selector)); - } - - /** * Prevents serializing any properties. * * Browser tests are run in a separate process. To do this PHPUnit creates a