From b92e3ca3ee3f8bed1ff52311d29b4ce1e4297a83 Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Wed, 12 Oct 2016 21:50:49 +0200
Subject: [TASK] Restructure tests/ folder.

Move unit tests to tests/unit/. Get the old still working UnitTests
into a working state again.
Updated composer.json with required-dev packages.
Create a new folder tests/acceptance for Behat functional/acceptance
testing. Add a first Feature draft of a Behat functional test for
local login.
---
 composer.json | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 7326fbc6e..abf583875 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,15 @@
 		"ext-gd" : "*",
 		"ext-mbstring" : "*",
 		"ext-xml" : "*",
-		"sabre/dav" : "~3.2",
-		"ext-openssl" : "*"
+		"ext-openssl" : "*",
+		"sabre/dav" : "~3.2"
+	},
+	"require-dev" : {
+		"php" : ">=5.6",
+		"phpunit/phpunit" : "^5.6",
+		"behat/behat" : "@stable",
+		"behat/mink-extension": "@stable",
+		"behat/mink-goutte-driver": "@stable"
 	},
 	"autoload" : {
 		"psr-4" : {
@@ -36,8 +43,13 @@
 			"Zotlabs\\" : "Zotlabs/"
 		}
 	},
+	"autoload-dev" : {
+		"psr-4" : {
+			"Zotlabs\\Tests\\Unit\\" : "tests/unit"
+		}
+	},
 	"minimum-stability" : "stable",
 	"config" : {
 		"notify-on-install" : false
 	}
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3