[TASK] Tests: Use existing session

Using Admin->useExistingSession() of Admin actor
instead of Kasper actor speeds up the tests a bit
and should make them more reliable.

Change-Id: Ibb462e87e1ce3725cdc40a7a6afa4e3c668b2b5c
Resolves: #75798
Releases: master
Reviewed-on: https://review.typo3.org/47800
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>

diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
index 643439a..924db8a 100644 (file)
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page;
  * The TYPO3 project - inspiring people to share!
  */
 
  * The TYPO3 project - inspiring people to share!
  */
 

-use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Kasper;
+use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Admin;

 
 /**
  * This testcase is used to check if a page can be added with the page module.
 
 /**
  * This testcase is used to check if a page can be added with the page module.


@@ -22,20 +22,19 @@ use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Kasper;
  */
 class AddPageInPageModuleCest
 {
  */
 class AddPageInPageModuleCest
 {

-    public function _before(Kasper $I)
+    public function _before(Admin $I)

     {
     {

-        $I->loginAsAdmin();
-    }
-
-    public function _after(Kasper $I)
-    {
-        $I->logout();
+        $I->useExistingSession();
+        // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
+        $I->waitForText('Web>Page module');
+        $I->switchToIFrame();

     }
 
     /**
     }
 
     /**

-     * @param Kasper $I
+     * @param Admin $I

      */
      */

-    public function tryToTest(Kasper $I)
+    public function tryToTest(Admin $I)

     {
         // Select page module
         $I->wantToTest('Add a page with page module');
     {
         // Select page module
         $I->wantToTest('Add a page with page module');

diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Profile/UsernameOnAvatarCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Profile/UsernameOnAvatarCest.php
deleted file mode 100644 (file)
index 8319d9a..0000000
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Profile/UsernameOnAvatarCest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Profile;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Kasper;
-
-/**
- * This testcase is used to check if username is visible in the toolbar.
- */
-class UsernameOnAvatarCest
-{
-    public function _before(Kasper $I)
-    {
-        $I->loginAsAdmin();
-    }
-
-    public function _after(Kasper $I)
-    {
-        $I->logout();
-    }
-
-    /**
-     * @param Kasper $I
-     */
-    public function tryToTest(Kasper $I)
-    {
-        $I->see('admin', '#typo3-cms-backend-backend-toolbaritems-usertoolbaritem');
-    }
-}

diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
index 16415c4..94efd13 100644 (file)
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
@@ -44,8 +44,8 @@ class BookmarkCest
     public function _before(Admin $I)
     {
         $I->useExistingSession();
     public function _before(Admin $I)
     {
         $I->useExistingSession();

-        $I->switchToIFrame('content');

         // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
         // Ensure main content frame is fully loaded, otherwise there are load-race-conditions

+        $I->switchToIFrame('content');

         $I->waitForText('Web>Page module');
     }
 
         $I->waitForText('Web>Page module');
     }
 

diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
index 7fc4fde..2e9b5b8 100644 (file)
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
@@ -23,10 +23,10 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\Topbar;
 class HelpCest
 {
     /**
 class HelpCest
 {
     /**

-    * Selector for the module container in the topbar
-    *
-    * @var string
-    */
+     * Selector for the module container in the topbar
+     *
+     * @var string
+     */

     public static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-helptoolbaritem';
 
     /**
     public static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-helptoolbaritem';
 
     /**


@@ -35,8 +35,8 @@ class HelpCest
     public function _before(Admin $I)
     {
         $I->useExistingSession();
     public function _before(Admin $I)
     {
         $I->useExistingSession();

-        $I->switchToIFrame('content');

         // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
         // Ensure main content frame is fully loaded, otherwise there are load-race-conditions

+        $I->switchToIFrame('content');

         $I->waitForText('Web>Page module');
         $I->switchToIFrame();
     }
         $I->waitForText('Web>Page module');
         $I->switchToIFrame();
     }

diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
index 6655d25..613e294 100644 (file)
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
@@ -27,6 +27,10 @@ class LogoCest
     public function _before(Admin $I)
     {
         $I->useExistingSession();
     public function _before(Admin $I)
     {
         $I->useExistingSession();

+        // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
+        $I->waitForText('Web>Page module');
+        $I->switchToIFrame();

     }
 
     /**
     }
 
     /**

diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
new file mode 100644 (file)
index 0000000..4c913cf
--- /dev/null
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
@@ -0,0 +1,40 @@
+<?php
+namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Admin;
+
+/**
+ * This test case is used to check if username is visible in the toolbar.
+ */
+class UsernameOnAvatarCest
+{
+    public function _before(Admin $I)
+    {
+        $I->useExistingSession();
+        // Ensure main content frame is fully loaded, otherwise there are load-race-conditions
+        $I->switchToIFrame('content');
+        $I->waitForText('Web>Page module');
+        $I->switchToIFrame();
+    }
+
+    /**
+     * @param Admin $I
+     */
+    public function tryToTest(Admin $I)
+    {
+        $I->see('admin', '#typo3-cms-backend-backend-toolbaritems-usertoolbaritem');
+    }
+}