feat(tests): logged in user is now always logged out by base test class

Elgg · Nov 5, 2021 · c1a9736 · c1a9736
1 parent 3ec2d61
commit c1a9736
Show file tree

Hide file tree

Showing 73 changed files with 25 additions and 400 deletions.
diff --git a/engine/tests/classes/Elgg/BaseTestCase.php b/engine/tests/classes/Elgg/BaseTestCase.php
@@ -182,6 +182,9 @@ protected function tearDown(): void {
 		$this->assertFalse((bool) _elgg_services()->session->getDisabledEntityVisibility(), __METHOD__ . ': hidden entities not reset');
 
 		// Tests should run without a logged in user
+		if (_elgg_services()->session->isLoggedIn()) {
+			_elgg_services()->session->removeLoggedInUser();
+		}
 		$this->assertFalse((bool) _elgg_services()->session->isLoggedIn(), __METHOD__ . ': there should be no logged in user');
 
 		// cleanup admin user

diff --git a/engine/tests/classes/Elgg/Plugins/GroupToolContainerLogicIntegrationTest.php b/engine/tests/classes/Elgg/Plugins/GroupToolContainerLogicIntegrationTest.php
@@ -31,22 +31,6 @@ public function up() {
 
 		$this->group = $this->createGroup();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see \Elgg\BaseTestCase::down()
-	 */
-	public function down() {
-		if ($this->group) {
-			$this->group->delete();
-		}
-
-		if ($this->owner) {
-			$this->owner->delete();
-		}
-
-		elgg()->session->removeLoggedInUser();
-	}
 
 	/**
 	 * Get the type of the content being gated behind the group tool option
@@ -88,8 +72,6 @@ public function testUserCantWriteContentWithToolEnabled() {
 		$this->assertTrue($this->group->enableTool($this->getGroupToolOption()));
 
 		$this->assertFalse($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 
 	public function testUserCantWriteContentWithToolDisabled() {
@@ -98,8 +80,6 @@ public function testUserCantWriteContentWithToolDisabled() {
 		$this->assertTrue($this->group->disableTool($this->getGroupToolOption()));
 
 		$this->assertFalse($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 
 	public function testGroupMemberCanWriteContentWithToolEnabled() {
@@ -109,8 +89,6 @@ public function testGroupMemberCanWriteContentWithToolEnabled() {
 		$this->assertTrue($this->group->enableTool($this->getGroupToolOption()));
 
 		$this->assertTrue($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 
 	public function testGroupMemberCantWriteContentWithToolDisabled() {
@@ -120,8 +98,6 @@ public function testGroupMemberCantWriteContentWithToolDisabled() {
 		$this->assertTrue($this->group->disableTool($this->getGroupToolOption()));
 
 		$this->assertFalse($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 
 	public function testAdminCanWriteContentWithToolEnabled() {
@@ -130,8 +106,6 @@ public function testAdminCanWriteContentWithToolEnabled() {
 		$this->assertTrue($this->group->enableTool($this->getGroupToolOption()));
 
 		$this->assertTrue($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 
 	public function testAdminCantWriteContentWithToolDisabled() {
@@ -140,8 +114,6 @@ public function testAdminCantWriteContentWithToolDisabled() {
 		$this->assertTrue($this->group->disableTool($this->getGroupToolOption()));
 
 		$this->assertFalse($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 
 	public function testAdminMemberCantWriteContentWithToolDisabled() {
@@ -151,7 +123,5 @@ public function testAdminMemberCantWriteContentWithToolDisabled() {
 		$this->assertTrue($this->group->disableTool($this->getGroupToolOption()));
 
 		$this->assertFalse($this->group->canWriteToContainer($user->guid, $this->getContentType(), $this->getContentSubtype()));
-
-		$user->delete();
 	}
 }
diff --git a/engine/tests/phpunit/integration/Elgg/Actions/Admin/AdminNoticesTest.php b/engine/tests/phpunit/integration/Elgg/Actions/Admin/AdminNoticesTest.php
@@ -16,10 +16,6 @@ public function up() {
 		_elgg_services()->session->setLoggedInUser($this->getAdmin());
 	}
 
-	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
-	}
-
 	public function testDeletesSingleAdminNotice() {
 
 		elgg_delete_admin_notice('zen');
@@ -64,5 +60,4 @@ public function testDeletesBatchAdminNotices() {
 
 		$this->assertEquals(0, $count_zens());
 	}
-
-}
+}
diff --git a/engine/tests/phpunit/integration/Elgg/Actions/Admin/UpgradeTest.php b/engine/tests/phpunit/integration/Elgg/Actions/Admin/UpgradeTest.php
@@ -17,11 +17,7 @@ class UpgradeTest extends ActionResponseTestCase {
 	public function up() {
 		_elgg_services()->session->setLoggedInUser($this->getAdmin());
 	}
-
-	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
-	}
-
+
 	public function testUpgradeFailsWithInvalidUpgradeEntity() {
 		$this->expectException(EntityNotFoundException::class);
 		$this->executeAction('admin/upgrade', [

diff --git a/engine/tests/phpunit/integration/Elgg/Actions/Entity/MuteIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/Entity/MuteIntegrationTest.php
@@ -31,13 +31,6 @@ public function up() {
 		_elgg_services()->session->setLoggedInUser($this->user);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
-	}
-
 	public function testFailsWithMissingEntityGUID() {
 		$response = $this->executeAction('entity/mute');
 

diff --git a/engine/tests/phpunit/integration/Elgg/Actions/Entity/SubscribeIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/Entity/SubscribeIntegrationTest.php
@@ -33,13 +33,6 @@ public function up() {
 		_elgg_services()->session->setLoggedInUser($this->user);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
-	}
-
 	public function testFailsWithMissingEntityGUID() {
 		$response = $this->executeAction('entity/subscribe');
 

diff --git a/engine/tests/phpunit/integration/Elgg/Actions/Entity/UmuteIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/Entity/UmuteIntegrationTest.php
@@ -30,14 +30,7 @@ public function up() {
 
 		_elgg_services()->session->setLoggedInUser($this->user);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
-	}
-
+
 	public function testFailsWithMissingEntityGUID() {
 		$response = $this->executeAction('entity/unmute');
 

diff --git a/engine/tests/phpunit/integration/Elgg/Actions/Entity/UnsubscribeIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/Entity/UnsubscribeIntegrationTest.php
@@ -31,13 +31,6 @@ public function up() {
 		_elgg_services()->session->setLoggedInUser($this->user);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
-	}
-
 	public function testFailsWithMissingEntityGUID() {
 		$response = $this->executeAction('entity/unsubscribe');
 

diff --git a/engine/tests/phpunit/integration/Elgg/Actions/LoginIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/LoginIntegrationTest.php
@@ -51,8 +51,6 @@ public function testLoginWithUsernameAndPassword() {
 		$this->assertEquals(elgg_echo('loginok', [], $user->language), array_shift($messages['success']));
 
 		$this->assertEquals($user, _elgg_services()->session->getLoggedInUser());
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testLoginWithEmailAndPassword() {
@@ -72,8 +70,6 @@ public function testLoginWithEmailAndPassword() {
 		$this->assertInstanceOf(OkResponse::class, $response);
 
 		$this->assertEquals($user, _elgg_services()->session->getLoggedInUser());
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testLoginFailsWithEmptyPassword() {
@@ -328,6 +324,5 @@ public function testRespectsLastForwardFrom() {
 		_elgg_services()->session->removeLoggedInUser();
 
 		elgg_unregister_plugin_hook_handler('login:forward', 'user', $forward_handler);
-
 	}
 }
diff --git a/engine/tests/phpunit/integration/Elgg/Actions/RegisterIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/RegisterIntegrationTest.php
@@ -269,11 +269,8 @@ public function testRegistrationSucceeds() {
 		$this->assertInstanceOf(\ElggUser::class, $user);
 
 		$this->assertEquals($user->guid, elgg_get_logged_in_user_guid());
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
-
 	public function testRegistrationSucceedsButExceptionThrownFromHook() {
 
 		$hook = $this->registerTestingHook('register', 'user', function () {
@@ -357,6 +354,5 @@ public function testRegisterWithoutValidation() {
 		$this->assertTrue($user->isEnabled());
 
 		$this->assertNotEmpty(elgg_get_logged_in_user_entity());
-		logout($user);
 	}
 }
diff --git a/engine/tests/phpunit/integration/Elgg/Actions/User/ValidateIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/User/ValidateIntegrationTest.php
@@ -9,17 +9,9 @@
 class ValidateIntegrationTest extends ActionResponseTestCase {
 
 	public function up() {
-
-		$session = elgg_get_session();
-		$session->setLoggedInUser($this->getAdmin());
-	}
-
-	public function down() {
-
-		$session = elgg_get_session();
-		$session->removeLoggedInUser();
+		_elgg_services()->session->setLoggedInUser($this->getAdmin());
 	}
-	
+
 	public function testValidateSingleUserWithoutParams() {
 
 		$response = $this->executeAction('admin/user/validate');

diff --git a/engine/tests/phpunit/integration/Elgg/Actions/UserSettingsIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/UserSettingsIntegrationTest.php
@@ -59,8 +59,6 @@ public function testPasswordChangeFailsWithoutValidCurrentPassword() {
 		$this->assertInstanceOf(OkResponse::class, $response);
 
 		$this->assertErrorMessageEmitted(elgg_echo('LoginException:ChangePasswordFailure'));
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testPasswordChangeFailsWithInvalidNewPassword() {
@@ -81,8 +79,6 @@ public function testPasswordChangeFailsWithInvalidNewPassword() {
 		$this->assertInstanceOf(OkResponse::class, $response);
 
 		$this->assertErrorMessageEmitted(elgg_echo('Security:InvalidPasswordLengthException', [elgg()->config->min_password_length]));
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testPasswordChangeFailsWithMismatchingNewPassword() {
@@ -103,8 +99,6 @@ public function testPasswordChangeFailsWithMismatchingNewPassword() {
 		$this->assertInstanceOf(OkResponse::class, $response);
 
 		$this->assertErrorMessageEmitted(elgg_echo('RegistrationException:PasswordMismatch'));
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testPasswordChangeSucceeds() {
@@ -131,8 +125,6 @@ public function testPasswordChangeSucceeds() {
 		$this->assertSystemMessageEmitted(elgg_echo('user:password:success'));
 
 		$this->assertNotEquals($user->password_hash, $old_hash);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testDisplayNameChangeFails() {
@@ -152,8 +144,6 @@ public function testDisplayNameChangeFails() {
 		$this->assertErrorMessageEmitted(elgg_echo('user:name:fail'));
 
 		$this->assertEquals($user->name, $name);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testDisplayNameChangeSucceeds() {
@@ -173,8 +163,6 @@ public function testDisplayNameChangeSucceeds() {
 		$this->assertSystemMessageEmitted(elgg_echo('user:name:success'));
 
 		$this->assertEquals($new_name, $user->name);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testUsernameChangeFails() {
@@ -199,8 +187,6 @@ public function testUsernameChangeFails() {
 		$this->assertErrorMessageEmitted(elgg_echo('registration:userexists'));
 
 		$this->assertEquals($user->username, $username);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testUsernameChangeSucceeds() {
@@ -224,8 +210,6 @@ public function testUsernameChangeSucceeds() {
 		$this->assertSystemMessageEmitted(elgg_echo('user:username:success'));
 
 		$this->assertEquals($new_username, $user->username);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testLanguageChangeSucceeds() {
@@ -260,8 +244,6 @@ public function testLanguageChangeSucceeds() {
 		$this->assertSystemMessageEmitted(elgg_echo('user:language:success'));
 
 		$this->assertEquals($new_language, $user->getLanguage());
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testEmailChangeFailsWithExistingEmail() {
@@ -283,8 +265,6 @@ public function testEmailChangeFailsWithExistingEmail() {
 		$this->assertErrorMessageEmitted(elgg_echo('registration:dupeemail'));
 
 		$this->assertEquals($email, $user->email);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testEmailChangeFailsWithWrongPassword() {
@@ -308,8 +288,6 @@ public function testEmailChangeFailsWithWrongPassword() {
 		$this->assertErrorMessageEmitted(elgg_echo('email:save:fail:password'));
 
 		$this->assertEquals($email, $user->email);
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testEmailChangeSucceeds() {
@@ -337,8 +315,6 @@ public function testEmailChangeSucceeds() {
 		$this->assertEquals($new_email, $user->email);
 
 		$this->assertSystemMessageEmitted(elgg_echo('email:save:success'));
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
 
 	public function testDefaultAccessChangeSucceeds() {
@@ -360,7 +336,5 @@ public function testDefaultAccessChangeSucceeds() {
 		$this->assertSystemMessageEmitted(elgg_echo('user:default_access:success'));
 
 		$this->assertEquals(ACCESS_PRIVATE, get_default_access($user));
-
-		_elgg_services()->session->removeLoggedInUser();
 	}
-}
+}
diff --git a/engine/tests/phpunit/integration/Elgg/Actions/WidgetsIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Actions/WidgetsIntegrationTest.php
@@ -35,7 +35,6 @@ public function up() {
 	}
 
 	public function down() {
-		_elgg_services()->session->removeLoggedInUser();
 		_elgg_services()->hooks->restore();
 	}
 

diff --git a/engine/tests/phpunit/integration/Elgg/Controllers/AdminPluginsRefreshIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Controllers/AdminPluginsRefreshIntegrationTest.php
@@ -14,8 +14,6 @@ class AdminPluginsRefreshIntegrationTest extends IntegrationTestCase {
 	 */
 	public function down() {
 		elgg_unregister_route('admin_plugins_refresh');
-
-		elgg()->session->removeLoggedInUser();
 	}
 
 	protected function createService(Request $request) {

diff --git a/engine/tests/phpunit/integration/Elgg/Controllers/CommentEntityRedirectorIntegrationTest.php b/engine/tests/phpunit/integration/Elgg/Controllers/CommentEntityRedirectorIntegrationTest.php
@@ -43,13 +43,6 @@ public function up() {
 			'access_id' => ACCESS_PUBLIC,
 		]);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function down() {
-		elgg()->session->removeLoggedInUser();
-	}
 
 	protected function createService(Request $request) {
 		$request->_integration_testing = true;