test: improve Acceptance test

(cherry picked from commit 231bbd0)

Author: RobinTheHood

tests/acceptance/AcceptanceCest.php

@@ -4,27 +4,15 @@ class AcceptanceCest
 {
     private $sessionCookie;
 
-    public function _login(AcceptanceTester $I)
+    public function _before(AcceptanceTester $I)
     {
-        // set session cookie
-        if ($this->sessionCookie) {
-            $I->setCookie('PHPSESSID', $this->sessionCookie);
-            return;
-        }
-
-        // logging in
-        $I->amOnPage('/?action=signIn');
-        $I->fillField('username', 'root');
-        $I->fillField('password', 'root');
-        $I->click('Anmelden');
-
-        // saving session cookie
-        $this->sessionCookie = $I->grabCookie('PHPSESSID');
+        $this->_login($I);
     }
 
-    // public function _before(AcceptanceTester $I)
-    // {
-    // }
+    public function _after(AcceptanceTester $I)
+    {
+        $this->_login($I);
+    }
 
     public function signInSuccessfully(AcceptanceTester $I)
     {
@@ -36,8 +24,6 @@ public function signInSuccessfully(AcceptanceTester $I)
      */
     public function seeAllModules(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/');
         $I->see('Alle Module');
 
@@ -55,8 +41,6 @@ public function seeAllModules(AcceptanceTester $I)
      */
     public function seeLoadedModules(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?filterModules=loaded');
         $I->see('Geladene Module');
 
@@ -71,24 +55,15 @@ public function seeLoadedModules(AcceptanceTester $I)
      */
     public function seeInstalledModules(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?filterModules=installed');
         $I->see('Installierte Module');
-
-        $I->seeNumberOfElements(".module-serach-box", [1,200]);
-
-        // Local Module
-        $I->see('Composer Autoload');
     }
 
     /**
      * @after signInSuccessfully
      */
     public function seeUpdatableModules(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?filterModules=updatable');
         $I->see('Aktualisierbare Module');
     }
@@ -98,8 +73,6 @@ public function seeUpdatableModules(AcceptanceTester $I)
      */
     public function seeChangedModules(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?filterModules=changed');
         $I->see('Geänderte Module');
     }
@@ -109,8 +82,6 @@ public function seeChangedModules(AcceptanceTester $I)
      */
     public function seeNotLoadedModules(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?filterModules=notloaded');
         $I->see('Nicht geladene Module');
 
@@ -122,8 +93,6 @@ public function seeNotLoadedModules(AcceptanceTester $I)
      */
     public function seeSupportPage(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?action=support');
         $I->see('Hilfe & Support');
         $I->see('Modul-Entwickler werden');
@@ -134,8 +103,6 @@ public function seeSupportPage(AcceptanceTester $I)
      */
     public function seeSystemPage(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?action=selfUpdate');
         $I->see('MMLC - Modified Module Loader Client');
         $I->see('AccessToken:');
@@ -147,8 +114,6 @@ public function seeSystemPage(AcceptanceTester $I)
      */
     public function seeSettingPage(AcceptanceTester $I)
     {
-        $this->_login($I);
-
         $I->amOnPage('/?action=settings');
         $I->see('Einstellungen');
         $I->see('Allgemein');
@@ -166,4 +131,22 @@ public function seeSettingPage(AcceptanceTester $I)
         $I->see('Module Pfad');
         $I->see('Installationsmodus');
     }
+
+    public function _login(AcceptanceTester $I)
+    {
+        // set session cookie
+        if ($this->sessionCookie) {
+            $I->setCookie('PHPSESSID', $this->sessionCookie);
+            return;
+        }
+
+        // logging in
+        $I->amOnPage('/?action=signIn');
+        $I->fillField('username', 'root');
+        $I->fillField('password', 'root');
+        $I->click('Anmelden');
+
+        // saving session cookie
+        $this->sessionCookie = $I->grabCookie('PHPSESSID');
+    }
 }