summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-03-11 10:23:38 +0100
committerJoas Schilling <nickvergessen@owncloud.com>2016-03-11 13:59:19 +0100
commit62b77d8ed0cc1ea8d328f8c26e2ff69da0171a6d (patch)
tree69c94ae1bc201b07e657a06744b5958a251e7338 /build
parent5f7502de6cbae156ae9bef5fb8db7390e9b5aa21 (diff)
downloadnextcloud-server-62b77d8ed0cc1ea8d328f8c26e2ff69da0171a6d.tar.gz
nextcloud-server-62b77d8ed0cc1ea8d328f8c26e2ff69da0171a6d.zip
API version needs to be on basic because we use it there
Diffstat (limited to 'build')
-rw-r--r--build/integration/features/bootstrap/BasicStructure.php16
-rw-r--r--build/integration/features/bootstrap/Provisioning.php7
2 files changed, 11 insertions, 12 deletions
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 0084597836f..47358d2ccfc 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -1,7 +1,5 @@
<?php
-use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
use GuzzleHttp\Client;
use GuzzleHttp\Message\ResponseInterface;
@@ -17,6 +15,9 @@ trait BasicStructure {
/** @var string */
private $baseUrl = '';
+ /** @var int */
+ private $apiVersion = 1;
+
/** @var ResponseInterface */
private $response = null;
@@ -52,6 +53,14 @@ trait BasicStructure {
}
/**
+ * @Given /^using api version "([^"]*)"$/
+ * @param string $version
+ */
+ public function usingApiVersion($version) {
+ $this->apiVersion = $version;
+ }
+
+ /**
* @Given /^As an "([^"]*)"$/
*/
public function asAn($user) {
@@ -248,7 +257,6 @@ trait BasicStructure {
mkdir("../../core/skeleton/PARENT/CHILD", 0777, true);
}
file_put_contents("../../core/skeleton/PARENT/CHILD/" . "child.txt", "ownCloud test text file\n");
-
}
/**
@@ -269,8 +277,6 @@ trait BasicStructure {
if (is_dir("../../core/skeleton/PARENT")) {
rmdir("../../core/skeleton/PARENT");
}
-
-
}
}
diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php
index 6d710b2016f..a3359ac96d6 100644
--- a/build/integration/features/bootstrap/Provisioning.php
+++ b/build/integration/features/bootstrap/Provisioning.php
@@ -25,13 +25,6 @@ trait Provisioning {
private $createdGroups = [];
/**
- * @Given /^using api version "([^"]*)"$/
- */
- public function usingApiVersion($version) {
- $this->apiVersion = $version;
- }
-
- /**
* @Given /^user "([^"]*)" exists$/
*/
public function assureUserExists($user) {