Skip to content
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.

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

[tests-only] Update CI to latest .drone.star and behat dependencies #499

Merged
merged 1 commit into from
Nov 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ def jscodestyle(ctx):
"steps": [
{
"name": "coding-standard-js",
"image": "owncloudci/php:8.0",
"image": "owncloudci/nodejs:14",
"pull": "always",
"commands": [
"make test-js-style",
Expand Down Expand Up @@ -1289,6 +1289,7 @@ def acceptance(ctx):
setupElasticSearch(testConfig["esVersion"]) +
testConfig["extraSetup"] +
fixPermissions(testConfig["phpVersion"], testConfig["federatedServerNeeded"]) +
waitForBrowserService(testConfig["phpVersion"], isWebUI) +
[
({
"name": "acceptance-tests",
Expand Down Expand Up @@ -1547,6 +1548,18 @@ def browserService(browser):

return []

def waitForBrowserService(phpVersion, isWebUi):
if isWebUi:
return [{
"name": "wait-for-selenium",
"image": "owncloudci/php:%s" % phpVersion,
"pull": "always",
"commands": [
"wait-for-it -t 600 selenium:4444",
],
}]
return []

def emailService(emailNeeded):
if emailNeeded:
return [{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class FilesPrimaryS3Context implements Context {
* @return void
* @throws Exception
*/
public function setUpScenario(BeforeScenarioScope $scope) {
public function setUpScenario(BeforeScenarioScope $scope):void {
// Get the environment
$environment = $scope->getEnvironment();
// Get all the contexts you need in this context
Expand Down
9 changes: 4 additions & 5 deletions vendor-bin/behat/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
}
},
"require": {
"behat/behat": "^3.6",
"behat/behat": "^3.9",
"behat/mink": "1.7.1",
"behat/mink-extension": "^2.3",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.4",
"friends-of-behat/mink-extension": "^2.5",
"behat/mink-selenium2-driver": "^1.5",
"ciaranmcnulty/behat-stepthroughextension" : "dev-master",
"jarnaiz/behat-junit-formatter": "^1.3",
"rdx/behat-variables": "^1.2",
"sensiolabs/behat-page-object-extension": "^2.3",
"symfony/translation": "^4.4",
"sabre/xml": "^2.2",
"guzzlehttp/guzzle": "^6.5",
"guzzlehttp/guzzle": "^7.4",
"phpunit/phpunit": "^9.5"
}
}