Use new options in the license manager for the EE features

templates/admin.php

@@ -81,8 +81,7 @@
 	p($l->t('Enable Secure View (requires Enterprise edition)'));
 	print_unescaped('</em>');
 } else {
-	//FIXME: in 10.6 we wont need to warn about requring enterprise edition, but just disable checkbox
-	p($l->t('Enable Secure View (requires Enterprise edition)'));
+	p($l->t('Enable Secure View'));
 }?></label>
 	<div id="enable-share-attributes-defaults" style="padding-left: 28px;" class="indent <?php if ($_['secure_view_option'] !== 'true') {
 	p('hidden');

tests/unit/AppConfigTest.php

@@ -50,11 +50,26 @@ public function testOpenInNewtabDefault() {
 		$this->assertEquals(true, $enterpriseEdition);
 	}
 
-	public function testSecureViewDisabled() {
-		// TODO: This is currently aligned with the changes at the moment.
-		// we've decided to release secure_view as community in this version
-		// until a new core release fixes the problem with the license.
-		$enterpriseEdition = $this->appConfig->enterpriseFeaturesEnabled();
-		$this->assertEquals(true, $enterpriseEdition);
+	public function enterpriseFeaturesEnabledProvider() {
+		return [
+			[true, true],
+			[false, false],
+		];
+	}
+
+	/**
+	 * @dataProvider enterpriseFeaturesEnabledProvider
+	 */
+	public function testEnterpriseFeaturesEnabled($licenseCheckReturn, $expectedResult) {
+		$options = [
+			'startGracePeriod' => false,
+			'disableApp' => false,
+		];
+		$this->licenseManager->expects($this->once())
+			->method('checkLicenseFor')
+			->with('richdocuments', $options)
+			->willReturn($licenseCheckReturn);
+
+		$this->assertSame($expectedResult, $this->appConfig->enterpriseFeaturesEnabled());
 	}
 }