Save login in session

Digital-Peak · Apr 24, 2023 · 981c9f7 · 981c9f7
1 parent 4fd25bb
commit 981c9f7
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 17 deletions.
diff --git a/tests/Acceptance/Administrator/ArticleEditCest.php b/tests/Acceptance/Administrator/ArticleEditCest.php
@@ -28,7 +28,7 @@ public function canSeeAttachmentDetails(Attachment $I, Article $IA)
 		$article = $IA->createArticle(['title' => 'Test title']);
 		$I->createAttachment(['path' => 'test.txt', 'item_id' => $article['id']]);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit&id=' . $article['id']);
 		$I->click('Attachments');
 
@@ -43,7 +43,7 @@ public function canSeeUploadFormInArticleForm(Article $I)
 
 		$article = $I->createArticle(['title' => 'Test title']);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit&id=' . $article['id']);
 		$I->click('Attachments');
 
@@ -58,7 +58,7 @@ public function cantSeeUploadFormInArticleFormWhenDisabledExtension(Article $I)
 
 		$article = $I->createArticle(['title' => 'Test title']);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit&id=' . $article['id']);
 
 		$I->dontSee('Attachments');
@@ -104,7 +104,7 @@ public function canUploadAttachmentOnArticleFormPage(Article $I)
 
 		$article = $I->createArticle(['title' => 'Test title']);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit&id=' . $article['id']);
 		$I->click('Attachments');
 
@@ -122,7 +122,7 @@ public function canUploadMultipleAttachmentOnArticleFormPage(Article $I)
 
 		$article = $I->createArticle(['title' => 'Test title']);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit&id=' . $article['id']);
 		$I->click('Attachments');
 
@@ -144,7 +144,7 @@ public function canTrashAttachment(Attachment $I, Article $IA)
 		$article = $IA->createArticle(['title' => 'Test title']);
 		$I->createAttachment(['path' => 'test.txt', 'item_id' => $article['id']]);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit&id=' . $article['id']);
 		$I->click('Attachments');
 		$I->click('Trash');
@@ -158,7 +158,7 @@ public function canSeeInformationMessageWhenArticleIsNotSaved(Article $I)
 	{
 		$I->wantToTest('that an information message is shown when an article is not saved.');
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_content&task=article.edit');
 		$I->click('Attachments');
 

diff --git a/tests/Acceptance/Administrator/AttachmentEditCest.php b/tests/Acceptance/Administrator/AttachmentEditCest.php
@@ -20,7 +20,7 @@ public function canEditAttachment(Attachment $I)
 
 		$I->createAttachment(['path' => 'test.jpg']);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage(AttachmentsListPage::$url);
 		$I->click('test.jpg');
 		$I->waitForElement(AttachmentFormPage::$rootClass);

diff --git a/tests/Acceptance/Administrator/AttachmentsListCest.php b/tests/Acceptance/Administrator/AttachmentsListCest.php
@@ -18,7 +18,7 @@ public function _before(AcceptanceTester $I)
 	{
 		parent::_before($I);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 	}
 
 	public function canNavigateToAttachmentForm(Attachment $I)

diff --git a/tests/Acceptance/Administrator/ConfigEditCest.php b/tests/Acceptance/Administrator/ConfigEditCest.php
@@ -24,7 +24,7 @@ public function cantSeeAttachmentDetails(Attachment $I)
 	{
 		$I->wantToTest('that the attachment details are not shown in the global config form.');
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_config&view=component&component=com_content');
 
 		$I->dontSee('Attachments', '#config');

diff --git a/tests/Acceptance/Administrator/MediaListCest.php b/tests/Acceptance/Administrator/MediaListCest.php
@@ -19,7 +19,7 @@ public function _before(AcceptanceTester $I)
 	{
 		parent::_before($I);
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 
 		if (is_dir($I->getConfiguration('home_dir') . '/images/test')) {
 			(new FileSystem())->deleteDir($I->getConfiguration('home_dir') . '/images/test');

diff --git a/tests/Acceptance/Administrator/MenuEditCest.php b/tests/Acceptance/Administrator/MenuEditCest.php
@@ -24,7 +24,7 @@ public function cantSeeAttachmentDetails(Attachment $I)
 	{
 		$I->wantToTest('that the attachment details are not shown in the menu item form.');
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_menus&task=menu.edit');
 
 		$I->dontSee('Attachments');

diff --git a/tests/Acceptance/Administrator/PluginEditCest.php b/tests/Acceptance/Administrator/PluginEditCest.php
@@ -24,7 +24,7 @@ public function cantSeeAttachmentDetails(Attachment $I)
 	{
 		$I->wantToTest('that the attachment details are not shown in the plugin form.');
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage(
 			'/administrator/index.php?option=com_plugins&task=plugin.edit&extension_id=' . $I->grabFromDatabase('extensions', 'extension_id', [])
 		);

diff --git a/tests/Acceptance/Administrator/TaskEditCest.php b/tests/Acceptance/Administrator/TaskEditCest.php
@@ -24,7 +24,7 @@ public function cantSeeAttachmentDetails(Attachment $I)
 	{
 		$I->wantToTest('that the attachment details are not shown in the task form.');
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('/administrator/index.php?option=com_scheduler&view=select&layout=default');
 		$I->click('Demo Task');
 

diff --git a/tests/Support/Helper/Acceptance.php b/tests/Support/Helper/Acceptance.php
@@ -7,8 +7,34 @@
 
 namespace Tests\Support\Helper;
 
-class Acceptance extends \Codeception\Module
+use Codeception\Module;
+
+class Acceptance extends Module
 {
+	public function doFrontEndLogin($user = null, $password = null, $useSnapshot = true)
+	{
+		/** @var JoomlaBrowser $browser */
+		$I = $this->getModule('Joomla\Browser\JoomlaBrowser');
+
+		if (is_null($user)) {
+			$user = $I->_getConfig('username');
+		}
+
+		if (is_null($password)) {
+			$password = $I->_getConfig('password');
+		}
+
+		if ($useSnapshot && $I->loadSessionSnapshot('front' . $user)) {
+			return;
+		}
+
+		$I->doFrontEndLogin($user, $password);
+
+		if ($useSnapshot) {
+			$I->saveSessionSnapshot('front' . $user);
+		}
+	}
+
 	public function getConfiguration($element = null)
 	{
 		if (is_null($element)) {
@@ -63,7 +89,7 @@ public function createCat($title)
 		/** @var Joomla\Browser\JoomlaBrowser $browser */
 		$I = $this->getModule('Joomla\Browser\JoomlaBrowser');
 
-		$I->doAdministratorLogin(null, null, false);
+		$I->doAdministratorLogin();
 		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_content');
 		$I->click('New');
 		$I->fillField(['id' => 'jform_title'], $title);

diff --git a/tests/Support/Page/Acceptance/Administrator/AttachmentsListPage.php b/tests/Support/Page/Acceptance/Administrator/AttachmentsListPage.php
@@ -11,6 +11,6 @@
 
 class AttachmentsListPage extends AcceptanceTester
 {
-	public static $url       = '/administrator/index.php?option=com_dpattachments&view=attachments';
+	public static $url       = '/administrator/index.php?option=com_dpattachments&view=attachments&filter[state]=';
 	public static $rootClass = '.com-dpattachments-attachments';
 }