Merge pull request #4683 from crazyserver/MOBILE-4974-behat

MOBILE-4974 behat: Allow to listen when the app is ready

Author: dpalou

local_moodleappbehat/tests/behat/behat_app.php

@@ -52,15 +52,11 @@ class behat_app extends behat_app_helper {
     protected $scenariolaststep;
 
     /**
-     * @BeforeScenario
+     * @BeforeScenario @app
      */
     public function before_scenario(ScenarioScope $scope) {
         $feature = $scope->getFeature();
 
-        if (!$feature->hasTag('app')) {
-            return;
-        }
-
         $steps = $scope->getScenario()->getSteps();
 
         $this->scenarioslug = $this->get_scenario_slug($scope);

local_moodleappbehat/tests/behat/behat_app_helper.php

@@ -33,6 +33,11 @@ interface behat_app_listener {
      */
     function on_app_load(): void;
 
+    /**
+     * Called when the app is ready.
+     */
+    function on_app_ready(): void;
+
     /**
      * Called before the app is unloaded.
      */
@@ -43,7 +48,7 @@ function on_app_unload(): void;
 /**
  * A trait containing functionality used by the behat app context.
  *
- * @package    core
+ * @package    local_moodleappbehat
  * @category   test
  * @copyright  2018 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -234,6 +239,8 @@ protected function prepare_browser() {
             throw new DriverException('Moodle App not found in browser');
         }, false, 60);
 
+        $this->notify_ready();
+
         try {
             // Init Behat JavaScript runtime.
             $initoptions = json_encode([
@@ -351,6 +358,17 @@ protected function notify_load(): void {
         }
     }
 
+    /**
+     * Notify to listeners that the app is ready.
+     */
+    protected function notify_ready(): void {
+        foreach (self::$listeners as $listener) {
+            if (method_exists($listener, 'on_app_ready')) {
+                $listener->on_app_ready();
+            }
+        }
+    }
+
     /**
      * Notify to listeners that the app is about to be unloaded.
      */

src/addons/block/activitymodules/tests/behat/block_activitymodules.feature

@@ -48,6 +48,7 @@ Feature: Basic tests of activity modules block
     When I press "Test forum name 1" in the app
     Then the header should be "Test forum name 1" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/activityresults/tests/behat/block_activityresults.feature

@@ -21,6 +21,7 @@ Feature: Basic tests of activity results block
     Then I should find "Activity results" in the app
     And I should find "Please configure this block" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/badges/tests/behat/block_badges.feature

@@ -21,6 +21,7 @@ Feature: Basic tests of badges block
     Then I should find "Latest badges" in the app
     And I should find "You have no badges to display" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/blogmenu/tests/behat/block_blogmenu.feature

@@ -21,6 +21,7 @@ Feature: Basic tests of blog menu block
     Then I should find "Blog menu" in the app
     And I should find "Blog entries" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/blogrecent/tests/behat/block_blogrecent.feature

@@ -21,6 +21,7 @@ Feature: Basic tests of blog recent block
     Then I should find "Recent blog entries" in the app
     And I should find "No recent entries" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/blogtags/tests/behat/block_blogtags.feature

@@ -51,6 +51,7 @@ Feature: Basic tests of blog tags block
     And I should find "T1" in the app
     And I should find "T2" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/calendarmonth/tests/behat/block_calendar_month.feature

@@ -22,6 +22,7 @@ Feature: View the calendar block and check it links to the calendar page
     When I press "Calendar" in the app
     Then the header should be "Calendar" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist:

src/addons/block/calendarupcoming/tests/behat/block_calendar_upcoming.feature

@@ -24,6 +24,7 @@ Feature: View the calendar upcoming block and check
     Then the header should be "Calendar" in the app
     And I should find "There are no events" in the app
 
+  @disabled_features
   Scenario: Block is included in disabled features
     # Add another block just to ensure there is something in the block region and the drawer is displayed.
     Given the following "blocks" exist: