Merge pull request #30106 from owncloud/accept-user-share

Accept user share notification
owncloud · May 30, 2018 · b9bfa6c · b9bfa6c
2 parents 104b02d + 10197f6
commit b9bfa6c
Show file tree

Hide file tree

Showing 72 changed files with 5,046 additions and 706 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -145,6 +145,17 @@ pipeline:
       matrix:
         TEST_SUITE: caldav
 
+  install-notifications-app:
+    image: owncloudci/php:${PHP_VERSION}
+    pull: true
+    commands:
+      - git clone https://github.com/owncloud/notifications.git apps/notifications
+      - php occ a:e notifications
+      - echo "export APPS_TO_ENABLE=notifications" > environment.sh
+    when:
+      matrix:
+        INSTALL_NOTIFICATIONS-APP: true
+
   fix-permissions:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
@@ -213,6 +224,7 @@ pipeline:
       - PLATFORM=Linux
       - MAILHOG_HOST=email
     commands:
+      - if [ -f ./environment.sh  ]; then . ./environment.sh; fi
       - bash tests/travis/start_ui_tests.sh --remote
     when:
       matrix:
@@ -474,6 +486,16 @@ matrix:
       CHOWN_SERVER: true
       OWNCLOUD_LOG: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: api
+      BEHAT_SUITE: apiSharingNotifications
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_NOTIFICATIONS-APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: api
       BEHAT_SUITE: apiCapabilities
@@ -558,6 +580,17 @@ matrix:
       OWNCLOUD_LOG: true
       USE_EMAIL: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: selenium
+      BEHAT_SUITE: webUISharingNotifications
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      USE_EMAIL: true
+      INSTALL_NOTIFICATIONS-APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: selenium
       BEHAT_SUITE: webUIFavorites

diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -945,4 +945,15 @@ public function isIncomingServer2serverShareEnabled() {
 		$result = $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes');
 		return ($result === 'yes') ? true : false;
 	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function updateForRecipient(IShare $share, $recipient) {
+		/*
+		 * This function does nothing yet as it is just for outgoing
+		 * federated shares.
+		 */
+		return $share;
+	}
 }
diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
@@ -35,6 +35,7 @@
 use OCP\ILogger;
 use OCP\IUserManager;
 use OCP\Share\IManager;
+use OCP\Share\IShare;
 
 /**
  * Class FederatedShareProviderTest
@@ -784,4 +785,11 @@ public function dataTestFederatedSharingSettings() {
 			['no', false]
 		];
 	}
+
+	public function testUpdateForRecipientReturnsShare() {
+		$share = $this->createMock(IShare::class);
+		$returnedShare = $this->provider->updateForRecipient($share, 'recipient1');
+
+		$this->assertEquals($share, $returnedShare);
+	}
 }