Merge branch 'master' of github.com:owncloud/core into vcategories_db

Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php

3 files changed, 37 insertions, 2 deletions

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 16ed6cdb3c7..f8364b71ef7 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,5 @@
 <?php
 
-global $RUNTIME_NOAPPS;
-$RUNTIME_NOAPPS = true;
 require_once __DIR__.'/../lib/base.php';
 
 if(!class_exists('PHPUnit_Framework_TestCase')){
diff --git a/tests/enable_all.php b/tests/enable_all.php
new file mode 100644
index 00000000000..23a1e8ab68c
--- /dev/null
+++ b/tests/enable_all.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2012 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once __DIR__.'/../lib/base.php';
+
+OC_App::enable('calendar');
+OC_App::enable('contacts');
+#OC_App::enable('files_archive');
+#OC_App::enable('mozilla_sync');
+#OC_App::enable('news');
+#OC_App::enable('provisioning_api');
+#OC_App::enable('user_external');
+
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
new file mode 100644
index 00000000000..7eadccbe769
--- /dev/null
+++ b/tests/preseed-config.php
@@ -0,0 +1,19 @@
+<?php
+$CONFIG = array (
+  "appstoreenabled" => false,
+  'apps_paths' => 
+  array (
+    0 => 
+    array (
+      'path' => OC::$SERVERROOT.'/apps',
+      'url' => '/apps',
+      'writable' => false,
+    ),
+    1 => 
+    array (
+      'path' => OC::$SERVERROOT.'/apps2',
+      'url' => '/apps2',
+      'writable' => false,
+    )
+    ),
+);