From 62b77d8ed0cc1ea8d328f8c26e2ff69da0171a6d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 11 Mar 2016 10:23:38 +0100
Subject: API version needs to be on basic because we use it there

---
 build/integration/features/bootstrap/BasicStructure.php | 16 +++++++++++-----
 build/integration/features/bootstrap/Provisioning.php   |  7 -------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'build/integration')

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;
 
@@ -51,6 +52,14 @@ trait BasicStructure {
 		}
 	}
 
+	/**
+	 * @Given /^using api version "([^"]*)"$/
+	 * @param string $version
+	 */
+	public function usingApiVersion($version) {
+		$this->apiVersion = $version;
+	}
+
 	/**
 	 * @Given /^As an "([^"]*)"$/
 	 */
@@ -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
@@ -24,13 +24,6 @@ trait Provisioning {
 	/** @var array */
 	private $createdGroups = [];
 
-	/**
-	 * @Given /^using api version "([^"]*)"$/
-	 */
-	public function usingApiVersion($version) {
-		$this->apiVersion = $version;
-	}
-
 	/**
 	 * @Given /^user "([^"]*)" exists$/
 	 */
-- 
cgit v1.2.3