Merge pull request #9810 from nextcloud/tests/9769/apps-management-acceptance

Acceptance tests for apps management and minor fixes

.drone.yml

@@ -615,6 +615,13 @@ pipeline:
       when:
         matrix:
           TESTS-ACCEPTANCE: users
+  acceptance-apps:
+      image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-apps --selenium-server selenium:4444 allow-git-repository-modifications features/apps.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: apps
   nodb-codecov:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -785,6 +792,8 @@ matrix:
       TESTS-ACCEPTANCE: login
     - TESTS: acceptance
       TESTS-ACCEPTANCE: users
+    - TESTS: acceptance
+      TESTS-ACCEPTANCE: apps
     - TESTS: jsunit
     - TESTS: syntax-php7.0
     - TESTS: syntax-php7.1

settings/Controller/AppSettingsController.php

@@ -253,6 +253,7 @@ class AppSettingsController extends Controller {
 		$apps = array_map(function($appData) use ($dependencyAnalyzer) {
 			$appstoreData = $appData['appstoreData'];
 			$appData['screenshot'] = isset($appstoreData['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($appstoreData['screenshots'][0]['url']) : '';
+			$appData['category'] = $appstoreData['categories'];
 
 			$newVersion = $this->installer->isUpdateAvailable($appData['id']);
 			if($newVersion && $this->appManager->isInstalled($appData['id'])) {

settings/src/components/appList.vue

@@ -27,7 +27,7 @@
 				<app-item v-for="app in apps" :key="app.id" :app="app" :category="category" />
 			</template>
 			<template v-for="bundle in bundles" v-if="useBundleView && bundleApps(bundle.id).length > 0">
-				<div class="apps-header">
+				<div class="apps-header" :key="bundle.id">
 					<div class="app-image"></div>
 					<h2>{{ bundle.name }} <input type="button" :value="bundleToggleText(bundle.id)" v-on:click="toggleBundle(bundle.id)"></h2>
 					<div class="app-version"></div>
@@ -99,7 +99,7 @@ export default {
 				return apps.filter(app => app.active);
 			}
 			if (this.category === 'disabled') {
-				return apps.filter(app => !app.active);
+				return apps.filter(app => !app.active && app.installed);
 			}
 			if (this.category === 'app-bundles') {
 				return apps.filter(app => app.bundles);

tests/acceptance/config/behat.yml

@@ -9,6 +9,7 @@ default:
 
         - AppNavigationContext
         - AppSettingsContext
+        - AppsManagementContext
         - CommentsAppContext
         - ContactsMenuContext
         - DialogContext

tests/acceptance/features/apps.feature

@@ -0,0 +1,90 @@
+Feature: apps
+
+  Scenario: enable an installed app
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    When I enable the "QA testing" app
+    Then I see that the "QA testing" app has been enabled
+
+  Scenario: disable a installed app
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    When I disable the "Update notification" app
+    Then I see that the "Update notification" app has been disabled
+
+  Scenario: Browse enabled apps
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    When I open the "Active apps" section
+    Then I see that the current section is "Active apps"
+    And I see that there are only enabled apps
+
+  Scenario: Browse disabled apps
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    When I open the "Disabled apps" section
+    Then I see that the current section is "Disabled apps"
+    And I see that there are only disabled apps
+
+  Scenario: Browse app bundles
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    When I open the "App bundles" section
+    Then I see that the current section is "App bundles"
+    And I see the app bundles
+    And I see that the "Enterprise bundle" is disabled
+
+  Scenario: Enable an app bundle
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    And I open the "App bundles" section
+    When I enable all apps from the "Enterprise bundle"
+    Then I see that the "Auditing / Logging" app has been enabled
+    And I see that the "LDAP user and group backend" app has been enabled
+
+  Scenario: View app details
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    When I click on the "QA testing" app
+    Then I see that the app details are shown
+
+  # TODO: Improve testing with app store as external API
+  # The following scenarios require the files_antivirus and calendar app
+  # being present in the app store with support for the current server version
+  # Ideally we would have either a dummy app store endpoint with some test apps
+  # or even an app store instance running somewhere to properly test this.
+  # This is also a requirement to properly test updates of apps
+
+  Scenario: Show section from app store
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    And I see that the current section is "Your apps"
+    When I open the "Files" section
+    Then I see that there some apps listed from the app store
+    And I see that the current section is "Files"
+
+  Scenario: View app details for app store apps
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    And I open the "Tools" section
+    When I click on the "Antivirus App for files" app
+    Then I see that the app details are shown
+
+  Scenario: Install an app from the app store
+    Given I act as Jane
+    And I am logged in as the admin
+    And I open the Apps management
+    And I open the "Office & text" section
+    And I click on the "Calendar" app
+    And I see that the app details are shown
+    Then I download and enable the "Calendar" app
+    And I see that the "Calendar" app has been enabled

tests/acceptance/features/bootstrap/AppsManagementContext.php

@@ -0,0 +1,232 @@
+<?php
+
+/**
+ *
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+use Behat\Behat\Context\Context;
+
+class AppsManagementContext implements Context, ActorAwareInterface {
+
+	use ActorAware;
+
+	/**
+	 * @return Locator
+	 */
+	public static function enableButtonForApp($app) {
+		return Locator::forThe()->button("Enable")->
+			descendantOf(self::rowForApp($app))->
+			describedAs("Enable button in the app list for $app");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function downloadAndEnableButtonForApp($app) {
+		return Locator::forThe()->button("Download and enable")->
+		descendantOf(self::rowForApp($app))->
+		describedAs("Download & enable button in the app list for $app");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function disableButtonForApp($app) {
+		return Locator::forThe()->button("Disable")->
+		descendantOf(self::rowForApp($app))->
+		describedAs("Disable button in the app list for $app");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function bundleButton($bundle) {
+		return Locator::forThe()->xpath("//div[@id='app-content']//div[@class='apps-header']/h2[normalize-space() = '$bundle']/input")->
+		describedAs("Button to enable / disable bundles");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function rowForApp($app) {
+		return Locator::forThe()->xpath("//div[@id='app-content']//div[@class='app-name'][normalize-space() = '$app']/..")->
+				describedAs("Row for app $app in Apps Management");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function emptyAppList() {
+		return Locator::forThe()->xpath("//div[@id='app-content']//div[@id='apps-list-empty']")->
+			describedAs("Empty apps list view");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function appEntries() {
+		return Locator::forThe()->xpath("//div[@id='app-content']//div[@class='section']")->
+			describedAs("Entries in apps list");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function disabledAppEntries() {
+		return Locator::forThe()->button("Disable")->
+		descendantOf(self::appEntries())->
+		describedAs("Disable button in the app list");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function enabledAppEntries() {
+		return Locator::forThe()->button("Enable")->
+		descendantOf(self::appEntries())->
+		describedAs("Enable button in the app list");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function sidebar() {
+		return Locator::forThe()->id("app-sidebar")->
+		describedAs("Sidebar in apps management");
+	}
+
+
+	/**
+	 * @When I enable the :app app
+	 */
+	public function iEnableTheApp($app) {
+		$this->actor->find(self::enableButtonForApp($app), 10)->click();
+	}
+
+	/**
+	 * @When I download and enable the :app app
+	 */
+	public function iDownloadAndEnableTheApp($app) {
+		$this->actor->find(self::downloadAndEnableButtonForApp($app), 10)->click();
+	}
+
+	/**
+	 * @When I disable the :app app
+	 */
+	public function iDisableTheApp($app) {
+		$this->actor->find(self::disableButtonForApp($app), 10)->click();
+	}
+
+	/**
+	 * @Then I see that the :app app has been enabled
+	 */
+	public function iSeeThatTheAppHasBeenEnabled($app) {
+		// TODO: Find a way to check if the enable button is removed
+		$this->actor->find(self::disableButtonForApp($app), 10);
+	}
+
+	/**
+	 * @Then I see that the :app app has been disabled
+	 */
+	public function iSeeThatTheAppHasBeenDisabled($app) {
+		// TODO: Find a way to check if the disable button is removed
+		$this->actor->find(self::enableButtonForApp($app), 10);
+	}
+
+	/**
+	 * @Then /^I see that there are no available updates$/
+	 */
+	public function iSeeThatThereAreNoAvailableUpdates() {
+		PHPUnit_Framework_Assert::assertTrue(
+			$this->actor->find(self::emptyAppList(), 10)->isVisible()
+		);
+	}
+
+	/**
+	 * @Then /^I see that there some apps listed from the app store$/
+	 */
+	public function iSeeThatThereSomeAppsListedFromTheAppStore() {
+		WaitFor::elementToBeEventuallyShown($this->actor, self::appEntries(), 10);
+	}
+
+	/**
+	 * @When /^I click on the "([^"]*)" app$/
+	 */
+	public function iClickOnTheApp($app) {
+		$this->actor->find(self::rowForApp($app), 10)->click();
+	}
+
+	/**
+	 * @Given /^I see that there are only disabled apps$/
+	 */
+	public function iSeeThatThereAreOnlyDisabledApps() {
+		$buttons = $this->actor->getSession()->getDriver()->find("//input[@value = 'Disable']");
+		PHPUnit\Framework\Assert::assertEmpty($buttons, 'Found disabled apps');
+	}
+
+	/**
+	 * @Given /^I see that there are only enabled apps$/
+	 */
+	public function iSeeThatThereAreOnlyEnabledApps() {
+		$buttons = $this->actor->getSession()->getDriver()->find("//input[@value = 'Enable']");
+		PHPUnit\Framework\Assert::assertEmpty($buttons, 'Found disabled apps');
+	}
+
+	/**
+	 * @Given /^I see the app bundles$/
+	 */
+	public function iSeeTheAppBundles() {
+		$this->actor->find(self::rowForApp('Auditing / Logging'), 2);
+		$this->actor->find(self::rowForApp('LDAP user and group backend'), 2);
+	}
+
+	/**
+	 * @When /^I enable all apps from the "([^"]*)"$/
+	 */
+	public function iEnableAllAppsFromThe($bundle) {
+		$this->actor->find(self::bundleButton($bundle), 2)->click();
+	}
+
+	/**
+	 * @Given /^I see that the "([^"]*)" is disabled$/
+	 */
+	public function iSeeThatTheIsDisabled($bundle) {
+		PHPUnit\Framework\Assert::assertEquals('Enable all', $this->actor->find(self::bundleButton($bundle))->getValue());
+	}
+
+	/**
+	 * @Given /^I see that the app details are shown$/
+	 */
+	public function iSeeThatTheAppDetailsAreShown() {
+		// The sidebar always exists in the DOM, so it has to be explicitly
+		// waited for it to be visible instead of relying on the implicit wait
+		// made to find the element.
+		if (!WaitFor::elementToBeEventuallyShown(
+			$this->actor,
+			self::sidebar(),
+			$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
+			PHPUnit_Framework_Assert::fail("The sidebar was not shown yet after $timeout seconds");
+		}
+	}
+
+
+}

tests/acceptance/features/bootstrap/SettingsMenuContext.php

@@ -51,6 +51,13 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
 		return self::menuItemFor("Users");
 	}
 
+	/**
+	 * @return Locator
+	 */
+	public static function usersAppsItem() {
+		return self::menuItemFor("Apps");
+	}
+
 	/**
 	 * @return Locator
 	 */
@@ -100,6 +107,15 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
 		$this->actor->find(self::usersMenuItem(), 2)->click();
 	}
 
+	/**
+	 * @When I open the Apps management
+	 */
+	public function iOpenTheAppsManagement() {
+		$this->iOpenTheSettingsMenu();
+
+		$this->actor->find(self::usersAppsItem(), 2)->click();
+	}
+
 	/**
 	 * @When I visit the settings page
 	 */

tests/acceptance/run.sh

@@ -147,7 +147,7 @@ function prepareDocker() {
 	# "docker cp" does not take them into account (the extracted files are set
 	# to root).
 	echo "Copying local Git working directory of Nextcloud to the container"
-	tar --create --file="$NEXTCLOUD_LOCAL_TAR" --exclude=".git" --exclude="./build" --exclude="./config/config.php" --exclude="./data" --exclude="./data-autotest" --exclude="./tests" --directory=../../ .
+	tar --create --file="$NEXTCLOUD_LOCAL_TAR" --exclude=".git" --exclude="./build" --exclude="./config/config.php" --exclude="./data" --exclude="./data-autotest" --exclude="./tests" --exclude="./apps-extra" --exclude="apps-writable" --directory=../../ .
 	tar --append --file="$NEXTCLOUD_LOCAL_TAR" --directory=../../ tests/acceptance/
 
 	docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud