Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore

Make shipped apps updatable via appstore

4 files changed, 78 insertions, 1 deletions

diff --git a/tests/data/testapp.zip b/tests/data/testapp.zip
new file mode 100644
index 00000000000..e76c0d18724
--- /dev/null
+++ b/tests/data/testapp.zip
diff --git a/tests/data/testapp2.zip b/tests/data/testapp2.zip
new file mode 100644
index 00000000000..f46832f7a75
--- /dev/null
+++ b/tests/data/testapp2.zip
diff --git a/tests/lib/installer.php b/tests/lib/installer.php
new file mode 100644
index 00000000000..5e267245200
--- /dev/null
+++ b/tests/lib/installer.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright (c) 2014 Georg Ehrke <georg@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Installer extends PHPUnit_Framework_TestCase {
+
+	private static $appid = 'testapp';
+	private $appstore;
+
+	public function setUp() {
+		$this->appstore = OC_Config::getValue('appstoreenabled', true);
+		OC_Config::setValue('appstoreenabled', true);
+		OC_Installer::removeApp(self::$appid);
+	}
+
+	public function tearDown() {
+		OC_Installer::removeApp(self::$appid);
+		OC_Config::setValue('appstoreenabled', $this->appstore);
+	}
+
+	public function testInstallApp() {
+		$pathOfTestApp  = __DIR__;
+		$pathOfTestApp .= '/../data/';
+		$pathOfTestApp .= 'testapp.zip';
+
+		$tmp = OC_Helper::tmpFile('.zip');
+		OC_Helper::copyr($pathOfTestApp, $tmp);
+
+		$data = array(
+			'path' => $tmp,
+			'source' => 'path',
+		);
+
+		OC_Installer::installApp($data);
+		$isInstalled = OC_Installer::isInstalled(self::$appid);
+
+		$this->assertTrue($isInstalled);
+	}
+
+	public function testUpdateApp() {
+		$pathOfOldTestApp  = __DIR__;
+		$pathOfOldTestApp .= '/../data/';
+		$pathOfOldTestApp .= 'testapp.zip';
+
+		$oldTmp = OC_Helper::tmpFile('.zip');
+		OC_Helper::copyr($pathOfOldTestApp, $oldTmp);
+
+		$oldData = array(
+			'path' => $oldTmp,
+			'source' => 'path',
+		);
+
+		$pathOfNewTestApp  = __DIR__;
+		$pathOfNewTestApp .= '/../data/';
+		$pathOfNewTestApp .= 'testapp2.zip';
+
+		$newTmp = OC_Helper::tmpFile('.zip');
+		OC_Helper::copyr($pathOfNewTestApp, $newTmp);
+
+		$newData = array(
+			'path' => $newTmp,
+			'source' => 'path',
+		);
+
+		OC_Installer::installApp($oldData);
+		$oldVersionNumber = OC_App::getAppVersion(self::$appid);
+
+		OC_Installer::updateApp($newData);
+		$newVersionNumber = OC_App::getAppVersion(self::$appid);
+
+		$this->assertNotEquals($oldVersionNumber, $newVersionNumber);
+	}
+}
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 95ffb4514bf..3fd5b3cb7fc 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -7,7 +7,7 @@ $CONFIG = array (
     array (
       'path' => OC::$SERVERROOT.'/apps',
       'url' => '/apps',
-      'writable' => false,
+      'writable' => true,
     ),
     1 =>
     array (