mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7757 from nextcloud/12-7605 

[stable12] Wait for the shared link to be set in the acceptance tests
This commit is contained in:
Morris Jobke 2018-01-09 18:10:31 +01:00 committed by GitHub
parent 4c92d096b8 fd9710bb44
commit e6f8869c2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/acceptance/features/bootstrap/FilesAppContext.php
View File

@ -346,7 +346,16 @@ class FilesAppContext implements Context, ActorAwareInterface {
* @Given I write down the shared link * @Given I write down the shared link
*/ */
public function iWriteDownTheSharedLink() { public function iWriteDownTheSharedLink() {
$this->actor->getSharedNotebook()["shared link"] = $this->actor->find(self::shareLinkField(), 10)->getValue(); // The shared link field always exists in the DOM (once the "Sharing"
// tab is loaded), but its value is the actual shared link only when it
// is visible.
if (!$this->waitForElementToBeEventuallyShown(
self::shareLinkField(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The shared link was not shown yet after $timeout seconds");
}
$this->actor->getSharedNotebook()["shared link"] = $this->actor->find(self::shareLinkField())->getValue();
} }
/** /**
@ -486,7 +495,9 @@ class FilesAppContext implements Context, ActorAwareInterface {
* @When I see that the :tabName tab in the details view is eventually loaded * @When I see that the :tabName tab in the details view is eventually loaded
*/ */
public function iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded($tabName) { public function iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded($tabName) {
if (!$this->waitForElementToBeEventuallyNotShown(self::loadingIconForTabInCurrentSectionDetailsViewNamed($tabName), $timeout = 10)) { if (!$this->waitForElementToBeEventuallyNotShown(
self::loadingIconForTabInCurrentSectionDetailsViewNamed($tabName),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The $tabName tab in the details view has not been loaded after $timeout seconds"); PHPUnit_Framework_Assert::fail("The $tabName tab in the details view has not been loaded after $timeout seconds");
} }
} }
@ -502,7 +513,9 @@ class FilesAppContext implements Context, ActorAwareInterface {
* @Then I see that the working icon for password protect is eventually not shown * @Then I see that the working icon for password protect is eventually not shown
*/ */
public function iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown() { public function iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown() {
if (!$this->waitForElementToBeEventuallyNotShown(self::passwordProtectWorkingIcon(), $timeout = 10)) { if (!$this->waitForElementToBeEventuallyNotShown(
self::passwordProtectWorkingIcon(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The working icon for password protect is still shown after $timeout seconds"); PHPUnit_Framework_Assert::fail("The working icon for password protect is still shown after $timeout seconds");
} }
} }
@ -517,10 +530,24 @@ class FilesAppContext implements Context, ActorAwareInterface {
$this->iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown(); $this->iSeeThatTheWorkingIconForPasswordProtectIsEventuallyNotShown();
} }
private function waitForElementToBeEventuallyShown($elementLocator, $timeout = 10, $timeoutStep = 1) {
$actor = $this->actor;
$elementShownCallback = function() use ($actor, $elementLocator) {
try {
return $actor->find($elementLocator)->isVisible();
} catch (NoSuchElementException $exception) {
return false;
}
};
return Utils::waitFor($elementShownCallback, $timeout, $timeoutStep);
}
private function waitForElementToBeEventuallyNotShown($elementLocator, $timeout = 10, $timeoutStep = 1) { private function waitForElementToBeEventuallyNotShown($elementLocator, $timeout = 10, $timeoutStep = 1) {
$actor = $this->actor; $actor = $this->actor;
$elementNotFoundCallback = function() use ($actor, $elementLocator) { $elementNotShownCallback = function() use ($actor, $elementLocator) {
try { try {
return !$actor->find($elementLocator)->isVisible(); return !$actor->find($elementLocator)->isVisible();
} catch (NoSuchElementException $exception) { } catch (NoSuchElementException $exception) {
@ -528,6 +555,6 @@ class FilesAppContext implements Context, ActorAwareInterface {
} }
}; };
return Utils::waitFor($elementNotFoundCallback, $timeout, $timeoutStep); return Utils::waitFor($elementNotShownCallback, $timeout, $timeoutStep);
} }
} }