Merge pull request #4764 from nextcloud/techdebt/noid/guests-use-occ-…

…no-cheating Integration tests use occ guests:add to create guests
nextcloud · Dec 18, 2020 · e562a12 · e562a12
2 parents f68a871 + fffa965
commit e562a12
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 75 deletions.
diff --git a/tests/integration/features/bootstrap/CommandLineTrait.php b/tests/integration/features/bootstrap/CommandLineTrait.php
@@ -43,9 +43,10 @@ trait CommandLineTrait {
 	 * Invokes an OCC command
 	 *
 	 * @param []string $args OCC command, the part behind "occ". For example: "files:transfer-ownership"
+	 * @param []string $env environment variables
 	 * @return int exit code
 	 */
-	public function runOcc($args = []) {
+	public function runOcc($args = [], $env = null) {
 		// Set UTF-8 locale to ensure that escapeshellarg will not strip
 		// multibyte characters.
 		setlocale(LC_CTYPE, "C.UTF-8");
@@ -61,7 +62,7 @@ public function runOcc($args = []) {
 			1 => ['pipe', 'w'],
 			2 => ['pipe', 'w'],
 		];
-		$process = proc_open('php console.php ' . $args, $descriptor, $pipes, $this->ocPath);
+		$process = proc_open('php console.php ' . $args, $descriptor, $pipes, $this->ocPath, $env);
 		$this->lastStdOut = stream_get_contents($pipes[1]);
 		$this->lastStdErr = stream_get_contents($pipes[2]);
 		$this->lastCode = proc_close($process);

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
@@ -1576,19 +1576,29 @@ public function assureUserExists($user) {
 
 	/**
 	 * @Given /^user "([^"]*)" is a guest account user/
-	 * @param string $user
+	 * @param string $email email address
 	 */
-	public function createGuestUser($user) {
+	public function createGuestUser($email) {
 		$currentUser = $this->currentUser;
 		$this->setCurrentUser('admin');
 		// in case it exists
-		$this->deleteUser($user);
-		$this->sendRequest('POST', '/apps/spreedcheats/guest-users', [
-			'userid' => $user,
-			'password' => self::TEST_PASSWORD,
+		$this->deleteUser($email);
+
+		$lastCode = $this->runOcc([
+			'guests:add',
+			// creator user
+			'admin',
+			// email
+			$email,
+			'--display-name',
+			$email . '-displayname',
+			'--password-from-env',
+		], [
+			'OC_PASS' => self::TEST_PASSWORD,
 		]);
-		$this->assertStatusCode($this->response, 200);
-		$this->createdGuestAccountUsers[] = $user;
+		Assert::assertEquals(0, $lastCode, 'Guest creation succeeded for ' . $email);
+
+		$this->createdGuestAccountUsers[] = $email;
 		$this->setCurrentUser($currentUser);
 	}
 

diff --git a/tests/integration/features/conversation/find-listed.feature b/tests/integration/features/conversation/find-listed.feature
@@ -3,7 +3,7 @@ Feature: conversation/find-listed
     Given user "creator" exists
     And user "regular-user" exists
     And guest accounts can be created
-    And user "user-guest" is a guest account user
+    And user "user-guest@example.com" is a guest account user
 
   Scenario Outline: Nobody can find non-listed rooms
     Given user "creator" creates room "group-room"
@@ -16,10 +16,10 @@ Feature: conversation/find-listed
     And user "creator" allows listing room "public-room" for "none" with 200
     Then user "creator" cannot find any listed rooms (v3)
     Examples:
-      | user         |
-      | creator      |
-      | regular-user |
-      | user-guest   |
+      | user                   |
+      | creator                |
+      | regular-user           |
+      | user-guest@example.com |
 
   Scenario: Regular users can find user-listed rooms
     Given user "creator" creates room "group-room"
@@ -34,7 +34,7 @@ Feature: conversation/find-listed
       | name        | listable |
       | group-room  | 1        |
       | public-room | 1        |
-    And user "user-guest" cannot find any listed rooms (v3)
+    And user "user-guest@example.com" cannot find any listed rooms (v3)
 
   Scenario: All users can find all-listed rooms
     Given user "creator" creates room "group-room"
@@ -49,7 +49,7 @@ Feature: conversation/find-listed
       | name        | listable |
       | group-room  | 2        |
       | public-room | 2        |
-    And user "user-guest" can find listed rooms (v3)
+    And user "user-guest@example.com" can find listed rooms (v3)
       | name        | listable |
       | group-room  | 2        |
       | public-room | 2        |
@@ -101,7 +101,7 @@ Feature: conversation/find-listed
       | name                 | listable |
       | group-the-cool-room  | 2        |
       | public-the-cool-room | 2        |
-    And user "user-guest" can find listed rooms with term "cool" (v3)
+    And user "user-guest@example.com" can find listed rooms with term "cool" (v3)
       | name                 | listable |
       | group-the-cool-room  | 2        |
       | public-the-cool-room | 2        |
@@ -112,7 +112,7 @@ Feature: conversation/find-listed
       | roomName | group-room  |
     When user "creator" allows listing room "group-room" for "all" with 200
     Then user "regular-user" cannot find any listed rooms with term "cool" (v3)
-    And user "user-guest" cannot find any listed rooms with term "cool" (v3)
+    And user "user-guest@example.com" cannot find any listed rooms with term "cool" (v3)
 
   Scenario: Guest users without accounts cannot search for listed rooms
     Given user "creator" creates room "public-room"

diff --git a/tests/integration/features/conversation/join-listable.feature b/tests/integration/features/conversation/join-listable.feature
@@ -3,7 +3,7 @@ Feature: conversation/join-listable
     Given user "creator" exists
     And user "regular-user" exists
     And guest accounts can be created
-    And user "user-guest" is a guest account user
+    And user "user-guest@example.com" is a guest account user
     # implicit: And user "guest" is a guest user with no account
 
   # -----------------------------------------------------------------------------
@@ -15,7 +15,7 @@ Feature: conversation/join-listable
       | roomName | room |
     When user "creator" allows listing room "room" for "none" with 200
     Then user "regular-user" joins room "room" with 404
-    And user "user-guest" joins room "room" with 404
+    And user "user-guest@example.com" joins room "room" with 404
     And user "guest" joins room "room" with 404
 
   Scenario: Anyone can join a non-listed public room
@@ -24,14 +24,14 @@ Feature: conversation/join-listable
       | roomName | room |
     And user "creator" allows listing room "room" for "none" with 200
     When user "regular-user" joins room "room" with 200
-    And user "user-guest" joins room "room" with 200
+    And user "user-guest@example.com" joins room "room" with 200
     And user "guest" joins room "room" with 200
     Then user "creator" sees the following attendees in room "room" with 200 (v3)
-      | actorId      | participantType   | actorType |
-      | creator      | OWNER             | users     |
-      | regular-user | USER_SELF_JOINED  | users     |
-      | user-guest   | USER_SELF_JOINED  | users     |
-      | "guest"      | GUEST             | guests    |
+      | actorId                | participantType   | actorType |
+      | creator                | OWNER             | users     |
+      | regular-user           | USER_SELF_JOINED  | users     |
+      | user-guest@example.com | USER_SELF_JOINED  | users     |
+      | "guest"                | GUEST             | guests    |
 
   # -----------------------------------------------------------------------------
   # User-listed rooms
@@ -42,7 +42,7 @@ Feature: conversation/join-listable
       | roomName | room |
     And user "creator" allows listing room "room" for "users" with 200
     When user "regular-user" joins room "room" with 200
-    And user "user-guest" joins room "room" with 404
+    And user "user-guest@example.com" joins room "room" with 404
     And user "guest" joins room "room" with 404
     Then user "creator" sees the following attendees in room "room" with 200 (v3)
       | actorId       | participantType | actorType |
@@ -55,14 +55,14 @@ Feature: conversation/join-listable
       | roomName | room |
     And user "creator" allows listing room "room" for "users" with 200
     When user "regular-user" joins room "room" with 200
-    And user "user-guest" joins room "room" with 200
+    And user "user-guest@example.com" joins room "room" with 200
     And user "guest" joins room "room" with 200
     Then user "creator" sees the following attendees in room "room" with 200 (v3)
-      | actorId      | participantType   | actorType |
-      | creator      | OWNER             | users     |
-      | regular-user | USER              | users     |
-      | user-guest   | USER_SELF_JOINED  | users     |
-      | "guest"      | GUEST             | guests    |
+      | actorId                | participantType   | actorType |
+      | creator                | OWNER             | users     |
+      | regular-user           | USER              | users     |
+      | user-guest@example.com | USER_SELF_JOINED  | users     |
+      | "guest"                | GUEST             | guests    |
 
   # -----------------------------------------------------------------------------
   # All-listed rooms
@@ -73,25 +73,25 @@ Feature: conversation/join-listable
       | roomName | room |
     And user "creator" allows listing room "room" for "all" with 200
     When user "regular-user" joins room "room" with 200
-    And user "user-guest" joins room "room" with 200
+    And user "user-guest@example.com" joins room "room" with 200
     And user "guest" joins room "room" with 404
     Then user "creator" sees the following attendees in room "room" with 200 (v3)
-      | actorId      | participantType   | actorType |
-      | creator      | OWNER             | users     |
-      | regular-user | USER              | users     |
-      | user-guest   | USER              | users     |
+      | actorId                | participantType   | actorType |
+      | creator                | OWNER             | users     |
+      | regular-user           | USER              | users     |
+      | user-guest@example.com | USER              | users     |
 
   Scenario: Anyone can join an all-listed public room
     Given user "creator" creates room "room"
       | roomType | 3    |
       | roomName | room |
     And user "creator" allows listing room "room" for "all" with 200
     When user "regular-user" joins room "room" with 200
-    And user "user-guest" joins room "room" with 200
+    And user "user-guest@example.com" joins room "room" with 200
     And user "guest" joins room "room" with 200
     Then user "creator" sees the following attendees in room "room" with 200 (v3)
-      | actorId      | participantType   | actorType |
-      | creator      | OWNER             | users     |
-      | regular-user | USER              | users     |
-      | user-guest   | USER              | users     |
-      | "guest"      | GUEST             | guests    |
+      | actorId                | participantType   | actorType |
+      | creator                | OWNER             | users     |
+      | regular-user           | USER              | users     |
+      | user-guest@example.com | USER              | users     |
+      | "guest"                | GUEST             | guests    |
diff --git a/tests/integration/features/conversation/set-listable.feature b/tests/integration/features/conversation/set-listable.feature
@@ -29,16 +29,16 @@ Feature: conversation/set-listable
       | roomName | room |
     And user "moderator" exists
     And guest accounts can be created
-    And user "user-guest" is a guest account user
+    And user "user-guest@example.com" is a guest account user
     And user "creator" adds "regular-user" to room "room" with 200
     And user "creator" adds "moderator" to room "room" with 200
     And user "creator" allows listing room "room" for "all" with 200
     When user "creator" promotes "moderator" in room "room" with 200
-    And user "user-guest" joins room "room" with 200
+    And user "user-guest@example.com" joins room "room" with 200
     And user "guest" joins room "room" with 200
     Then user "moderator" allows listing room "room" for "none" with 200
     And user "regular-user" allows listing room "room" for "users" with 403
-    And user "user-guest" allows listing room "room" for "users" with 403
+    And user "user-guest@example.com" allows listing room "room" for "users" with 403
     And user "guest" allows listing room "room" for "users" with 401
 
   Scenario: Cannot change listable attribute of one to one conversations

diff --git a/tests/integration/spreedcheats/appinfo/routes.php b/tests/integration/spreedcheats/appinfo/routes.php
@@ -26,6 +26,5 @@
 return [
 	'ocs' => [
 		['name' => 'Api#resetSpreed', 'url' => '/', 'verb' => 'DELETE'],
-		['name' => 'Api#createGuestAppUser', 'url' => '/guest-users', 'verb' => 'POST'],
 	],
 ];
diff --git a/tests/integration/spreedcheats/lib/Controller/ApiController.php b/tests/integration/spreedcheats/lib/Controller/ApiController.php
@@ -29,21 +29,16 @@
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IDBConnection;
 use OCP\IRequest;
-use OCP\IUserManager;
 use OCP\Share\IShare;
 
 class ApiController extends OCSController {
 
 	/** @var IDBConnection */
 	private $db;
 
-	/** @var IUserManager */
-	private $userManager;
-
 	public function __construct(string $appName,
 								IRequest $request,
-								IDBConnection $db,
-								IUserManager $userManager
+								IDBConnection $db
 	) {
 		parent::__construct($appName, $request);
 		$this->db = $db;
@@ -81,24 +76,4 @@ public function resetSpreed(): DataResponse {
 
 		return new DataResponse();
 	}
-
-	/**
-	 * @NoCSRFRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function createGuestAppUser(string $userid, string $password): DataResponse {
-		$guestAppContainer = \OC::$server->getRegisteredAppContainer('guests');
-		$guestManager = $guestAppContainer->query('\OCA\Guests\GuestManager');
-		$guestManager->createGuest(
-			\OC::$server->getUserSession()->getUser(),
-			$userid,
-			$userid . '@localhost',
-			$userid . '-displayname'
-		);
-
-		$this->userManager->get($userid)->setPassword($password);
-
-		return new DataResponse();
-	}
 }