Enable travis to use upstream PR + only available from NC 13 + fix test

Signed-off-by: Tobia De Koninck <[email protected]>
nextcloud · Oct 1, 2017 · 212aff8 · 212aff8
1 parent 41feeee
commit 212aff8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ services:
 
 env:
   global:
-    - BRANCH=master
+    - BRANCH=contactsstore_public_api
     - REPO=nc
   matrix:
     - DB=mysql

diff --git a/appinfo/application.php b/appinfo/application.php
@@ -244,7 +244,7 @@ public function __construct(array $urlParams=array()){
 
 		$container->registerService('UserProvider', function(IContainer $c) {
 			$version = \OCP\Util::getVersion();
-			if (($version[0] == 12 && $version[2] >= 2) || ($version[0] >= 13)) {
+			if ($version[0] == 13) {
 				return new ContactsStoreUserProvider(
 					$c->query('OCP\Contacts\ContactsMenu\IContactsStore'),
 					$c->query('ServerContainer')->getUserSession(),

diff --git a/tests/integration/db/PresenceMapperTest.php b/tests/integration/db/PresenceMapperTest.php
@@ -80,6 +80,8 @@ public function setupContactsStoreAPI() {
 			$syncService->updateUser($user);
 		}
 
+		\OC_User::setIncognitoMode(false);
+
 		\OC::$server->getDatabaseConnection()->executeQuery("DELETE FROM *PREFIX*ojsxc_stanzas");
 
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ services: @@
     env:
       global:
-        - BRANCH=master
+        - BRANCH=contactsstore_public_api
         - REPO=nc
       matrix:
         - DB=mysql
@@ Expand Down @@