Merge pull request #33950 from owncloud/stable10-adjust-waitTillXpath…

…IsVisible-calls [stable10] Adjust waitTillXpathIsVisible calls
owncloud · Dec 20, 2018 · 81f9a77 · 81f9a77
2 parents 95cddaf + c6cc013
commit 81f9a77
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 22 deletions.
diff --git a/tests/acceptance/features/lib/AdminAppsSettingsPage.php b/tests/acceptance/features/lib/AdminAppsSettingsPage.php
@@ -97,6 +97,8 @@ public function waitTillPageIsLoaded(
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
 		$this->waitForAjaxCallsToStartAndFinish($session);
-		$this->waitTillXpathIsVisible($session, $this->appEnableDisableButtonXpath);
+		$this->waitTillXpathIsVisible(
+			$this->appEnableDisableButtonXpath, $timeout_msec
+		);
 	}
 }
diff --git a/tests/acceptance/features/lib/AdminGeneralSettingsPage.php b/tests/acceptance/features/lib/AdminGeneralSettingsPage.php
@@ -293,6 +293,8 @@ public function waitTillPageIsLoaded(
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
 		$this->waitForAjaxCallsToStartAndFinish($session);
-		$this->waitTillXpathIsVisible($session, $this->ownCloudVersionStringXpath);
+		$this->waitTillXpathIsVisible(
+			$this->ownCloudVersionStringXpath, $timeout_msec
+		);
 	}
 }
diff --git a/tests/acceptance/features/lib/AdminSharingSettingsPage.php b/tests/acceptance/features/lib/AdminSharingSettingsPage.php
@@ -388,6 +388,8 @@ public function waitTillPageIsLoaded(
 		Session $session,
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
-		$this->waitTillXpathIsVisible($session, $this->shareApiCheckboxXpath);
+		$this->waitTillXpathIsVisible(
+			$this->shareApiCheckboxXpath, $timeout_msec
+		);
 	}
 }
diff --git a/tests/acceptance/features/lib/AdminStorageSettingsPage.php b/tests/acceptance/features/lib/AdminStorageSettingsPage.php
@@ -335,6 +335,8 @@ public function waitTillPageIsLoaded(
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
 		$this->waitForAjaxCallsToStartAndFinish($session);
-		$this->waitTillXpathIsVisible($session, $this->filesExternalFormXpath);
+		$this->waitTillXpathIsVisible(
+			$this->filesExternalFormXpath, $timeout_msec
+		);
 	}
 }
diff --git a/tests/acceptance/features/lib/FilesPageElement/FileActionsMenu.php b/tests/acceptance/features/lib/FilesPageElement/FileActionsMenu.php
@@ -74,10 +74,10 @@ public function waitTillPageIsLoaded(
 		$xpath = null
 	) {
 		if ($xpath === null) {
-			throw new \InvalidArgumentException('$xpath need to be set');
+			throw new \InvalidArgumentException('$xpath needs to be set');
 		}
 		$this->waitForOutstandingAjaxCalls($session);
-		$element = $this->waitTillXpathIsVisible($session, $xpath);
+		$element = $this->waitTillXpathIsVisible($xpath, $timeout_msec);
 		$this->setElement($element);
 	}
 

diff --git a/tests/acceptance/features/lib/FilesPageElement/SharingDialog.php b/tests/acceptance/features/lib/FilesPageElement/SharingDialog.php
@@ -488,9 +488,9 @@ public function waitTillPageIsLoaded(
 		$xpath = null
 	) {
 		if ($xpath === null) {
-			throw new \InvalidArgumentException('$xpath need to be set');
+			throw new \InvalidArgumentException('$xpath needs to be set');
 		}
 		$this->waitForOutstandingAjaxCalls($session);
-		$this->waitTillXpathIsVisible($session, $xpath);
+		$this->waitTillXpathIsVisible($xpath, $timeout_msec);
 	}
 }
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php b/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
@@ -327,10 +327,10 @@ public function waitTillPageIsLoaded(
 		$xpath = null
 	) {
 		if ($xpath === null) {
-			throw new \InvalidArgumentException('$xpath need to be set');
+			throw new \InvalidArgumentException('$xpath needs to be set');
 		}
 		$this->waitForOutstandingAjaxCalls($session);
-		$popupElement = $this->waitTillXpathIsVisible($session, $xpath);
+		$popupElement = $this->waitTillXpathIsVisible($xpath, $timeout_msec);
 		$this->setElement($popupElement);
 	}
 }
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php b/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php
@@ -83,10 +83,10 @@ public function waitTillPageIsLoaded(
 		$xpath = null
 	) {
 		if ($xpath === null) {
-			throw new \InvalidArgumentException('$xpath need to be set');
+			throw new \InvalidArgumentException('$xpath needs to be set');
 		}
 		$this->waitForOutstandingAjaxCalls($session);
-		$element = $this->waitTillXpathIsVisible($session, $xpath);
+		$element = $this->waitTillXpathIsVisible($xpath, $timeout_msec);
 		$this->setElement($element);
 	}
 

diff --git a/tests/acceptance/features/lib/NotificationsAppDialog.php b/tests/acceptance/features/lib/NotificationsAppDialog.php
@@ -99,6 +99,8 @@ public function waitTillPageIsLoaded(
 		Session $session,
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
-		$this->waitTillXpathIsVisible($session, $this->notificationContainerXpath);
+		$this->waitTillXpathIsVisible(
+			$this->notificationContainerXpath, $timeout_msec
+		);
 	}
 }
diff --git a/tests/acceptance/features/lib/OwncloudPage.php b/tests/acceptance/features/lib/OwncloudPage.php
@@ -146,14 +146,12 @@ public function waitTillElementIsNotNull(
 	/**
 	 * waits for the element located by the xpath to be visible
 	 *
-	 * @param Session $session
 	 * @param string $xpath the xpath of the element to wait for
 	 * @param int $timeout_msec
 	 *
 	 * @return NodeElement
 	 */
 	public function waitTillXpathIsVisible(
-		Session $session,
 		$xpath,
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
@@ -162,13 +160,13 @@ public function waitTillXpathIsVisible(
 			$element,
 			__METHOD__ .
 			" xpath: $xpath" .
-			" timeout waiting for element to be availiable"
+			" timeout waiting for element to be available"
 		);
-		$visibibity = $this->waitFor(
-			STANDARD_UI_WAIT_TIMEOUT_MILLISEC / 1000,
+		$visibility = $this->waitFor(
+			$timeout_msec / 1000,
 			[$element, 'isVisible']
 		);
-		if ($visibibity !== true) {
+		if ($visibility !== true) {
 			throw new \Exception(
 				__METHOD__ .
 				" xpath: $xpath" .

diff --git a/tests/acceptance/features/lib/OwncloudPageElement/SettingsMenu.php b/tests/acceptance/features/lib/OwncloudPageElement/SettingsMenu.php
@@ -61,6 +61,6 @@ public function waitTillPageIsLoaded(
 		Session $session,
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
-		$this->waitTillXpathIsVisible($session, $this->logoutButtonXpath);
+		$this->waitTillXpathIsVisible($this->logoutButtonXpath, $timeout_msec);
 	}
 }
diff --git a/tests/acceptance/features/lib/PersonalGeneralSettingsPage.php b/tests/acceptance/features/lib/PersonalGeneralSettingsPage.php
@@ -83,7 +83,9 @@ public function waitTillPageIsLoaded(
 		Session $session,
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
-		$this->waitTillXpathIsVisible($session, $this->personalProfilePanelXpath);
+		$this->waitTillXpathIsVisible(
+			$this->personalProfilePanelXpath, $timeout_msec
+		);
 		$this->waitForOutstandingAjaxCalls($session);
 	}
 

diff --git a/tests/acceptance/features/lib/PersonalSecuritySettingsPage.php b/tests/acceptance/features/lib/PersonalSecuritySettingsPage.php
@@ -150,6 +150,8 @@ public function waitTillPageIsLoaded(
 		$timeout_msec = STANDARD_UI_WAIT_TIMEOUT_MILLISEC
 	) {
 		$this->waitForOutstandingAjaxCalls($session);
-		$this->waitTillXpathIsVisible($session, $this->corsInputfieldXpath);
+		$this->waitTillXpathIsVisible(
+			$this->corsInputfieldXpath, $timeout_msec
+		);
 	}
 }