Skip to content

[stable21] Add missing waits and asserts in acceptance tests #25993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 9 commits into from
Mar 8, 2021
Merged

[stable21] Add missing waits and asserts in acceptance tests #25993

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3a4ec7
Add missing waits when finding elements in the acceptance tests
danxuliu Jan 17, 2021
d03bc3e
Verify WaitFor::element... results with an assertion
danxuliu Mar 5, 2021
34814ad
Fix delete user acceptance test
danxuliu Mar 6, 2021
4c98d29
Fix identation
danxuliu Mar 5, 2021
270db2f
Add locator for apps list
danxuliu Mar 5, 2021
1058abc
Find elements through the actor rather than the driver
danxuliu Mar 5, 2021
b086a0f
Add explicit locator for "Enable all" bundle button
danxuliu Mar 5, 2021
3a470c2
Assert also element visibility instead of just finding it
danxuliu Mar 5, 2021
8185c46
Find directly the label instead of falling back to it
danxuliu Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Find elements through the actor rather than the driver 
"Actor::find" is a more robust way to look for elements, as it handles
some exceptions that may be thrown. Therefore, even if the elements are
not actually used and it is only checked whether they exist or not using
the actor is the preferred way when possible (and it also makes it
consistent with the rest of the acceptance tests).

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Mar 8, 2021
commit 1058abc97cb750d7f87b0afb6c836fc146b3b84e
34 changes: 30 additions & 4 deletions tests/acceptance/features/bootstrap/AppsManagementContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ public static function enableButtonForApp($app) {
describedAs("Enable button in the app list for $app");
}

/**
* @return Locator
*/
public static function enableButtonForAnyApp() {
return Locator::forThe()->button("Enable")->
descendantOf(self::appsList())->
describedAs("Enable button in the app list for any app");
}

/**
* @return Locator
*/
Expand All @@ -63,6 +72,15 @@ public static function disableButtonForApp($app) {
describedAs("Disable button in the app list for $app");
}

/**
* @return Locator
*/
public static function disableButtonForAnyApp() {
return Locator::forThe()->button("Disable")->
descendantOf(self::appsList())->
describedAs("Disable button in the app list for any app");
}

/**
* @return Locator
*/
Expand Down Expand Up @@ -195,16 +213,24 @@ public function iClickOnTheApp($app) {
* @Given /^I see that there are only disabled apps$/
*/
public function iSeeThatThereAreOnlyDisabledApps() {
$buttons = $this->actor->getSession()->getDriver()->find("//input[@value = 'Disable']");
PHPUnit\Framework\Assert::assertEmpty($buttons, 'Found disabled apps');
try {
$this->actor->find(self::disableButtonForAnyApp(), 2);

PHPUnit_Framework_Assert::fail("Found enabled apps");
} catch (NoSuchElementException $exception) {
}
}

/**
* @Given /^I see that there are only enabled apps$/
*/
public function iSeeThatThereAreOnlyEnabledApps() {
$buttons = $this->actor->getSession()->getDriver()->find("//input[@value = 'Enable']");
PHPUnit\Framework\Assert::assertEmpty($buttons, 'Found disabled apps');
try {
$this->actor->find(self::enableButtonForAnyApp(), 2);

PHPUnit_Framework_Assert::fail("Found disabled apps");
} catch (NoSuchElementException $exception) {
}
}

/**
Expand Down