MOBILE-3947 behat: Reimplement wait
The behaviour of wait for new versions has changed, so we need to implement it ourselves. See https://github.com/oleg-andreyev/MinkPhpWebDriver/pull/81main
parent
1f7a00b1ce
commit
639b4d9cfa
|
@ -214,10 +214,7 @@ class behat_app extends behat_app_helper {
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->wait_for_pending_js();
|
$this->wait_animations_done();
|
||||||
|
|
||||||
// Wait scroll animation to finish.
|
|
||||||
$this->getSession()->wait(300);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -263,10 +260,7 @@ class behat_app extends behat_app_helper {
|
||||||
throw new DriverException('Error when swiping - ' . $result);
|
throw new DriverException('Error when swiping - ' . $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->wait_for_pending_js();
|
$this->wait_animations_done();
|
||||||
|
|
||||||
// Wait swipe animation to finish.
|
|
||||||
$this->getSession()->wait(300);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -689,10 +683,7 @@ class behat_app extends behat_app_helper {
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->wait_for_pending_js();
|
$this->wait_animations_done();
|
||||||
|
|
||||||
// Wait for UI to settle after refreshing.
|
|
||||||
$this->getSession()->wait(300);
|
|
||||||
|
|
||||||
if (is_null($locator)) {
|
if (is_null($locator)) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -641,4 +641,15 @@ EOF;
|
||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wait until animations have finished.
|
||||||
|
*/
|
||||||
|
protected function wait_animations_done() {
|
||||||
|
$this->wait_for_pending_js();
|
||||||
|
|
||||||
|
// Ideally, we wouldn't wait a fixed amount of time. But it is not straightforward to wait for animations
|
||||||
|
// to finish, so for now we'll just wait 300ms.
|
||||||
|
usleep(300000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue