[auto-generated] Update plugin files

Check out the commits that caused these changes: moodlehq/moodleapp@b722a8a...609c33d

Author: github-actions[bot]

tests/behat/behat_app.php

@@ -33,9 +33,6 @@
  */
 class behat_app extends behat_app_helper {
 
-    /** @var string URL for running Ionic server */
-    protected $ionicurl = '';
-
     /** @var array Config overrides */
     protected $appconfig = [
         'disableUserTours' => true,
@@ -101,7 +98,7 @@ public function i_launch_the_app(string $runtime = '') {
      * @When I restart the app
      */
     public function i_restart_the_app() {
-        $this->getSession()->visit($this->ionicurl);
+        $this->getSession()->visit($this->get_app_url());
 
         $this->i_wait_the_app_to_restart();
     }

tests/behat/behat_app_helper.php

@@ -48,9 +48,6 @@ function on_app_unload(): void;
  */
 class behat_app_helper extends behat_base {
 
-    /** @var stdClass Object with data about launched Ionic instance (if any) */
-    protected static $ionicrunning = null;
-
     /** @var array */
     protected static $listeners = [];
 
@@ -87,6 +84,21 @@ protected static function is_windows() : bool {
         return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
     }
 
+    /**
+     * Get url of the running Ionic application.
+     *
+     * @return string Ionic app url.
+     */
+    public function get_app_url(): string {
+        global $CFG;
+
+        if (empty($CFG->behat_ionic_wwwroot)) {
+            throw new DriverException('$CFG->behat_ionic_wwwroot must be defined.');
+        }
+
+        return $CFG->behat_ionic_wwwroot;
+    }
+
     /**
      * Called from behat_hooks when a new scenario starts, if it has the app tag.
      *
@@ -100,8 +112,6 @@ public function start_scenario() {
             $this->notify_unload();
             $this->apprunning = false;
         }
-
-        $this->ionicurl = $this->start_or_reuse_ionic();
     }
 
     /**
@@ -118,8 +128,8 @@ protected function check_behat_setup() {
         }
 
         // Check the config settings are defined.
-        if (empty($CFG->behat_ionic_wwwroot) && empty($CFG->behat_ionic_dirroot)) {
-            throw new DriverException('$CFG->behat_ionic_wwwroot or $CFG->behat_ionic_dirroot must be defined.');
+        if (empty($CFG->behat_ionic_wwwroot)) {
+            throw new DriverException('$CFG->behat_ionic_wwwroot must be defined.');
         }
     }
 
@@ -171,108 +181,6 @@ protected function fix_moodle_setup() {
         }
     }
 
-    /**
-     * Starts an Ionic server if necessary, or uses an existing one.
-     *
-     * @return string URL to Ionic server
-     * @throws DriverException If there's a system error starting Ionic
-     */
-    protected function start_or_reuse_ionic() {
-        global $CFG;
-
-        if (empty($CFG->behat_ionic_dirroot) && !empty($CFG->behat_ionic_wwwroot)) {
-            // Use supplied Ionic server which should already be running.
-            $url = $CFG->behat_ionic_wwwroot;
-        } else if (self::$ionicrunning) {
-            // Use existing Ionic instance launched previously.
-            $url = self::$ionicrunning->url;
-        } else {
-            // Open Ionic process in relevant path.
-            $path = realpath($CFG->behat_ionic_dirroot);
-            $stderrfile = $CFG->dataroot . '/behat/ionic-stderr.log';
-            $prefix = '';
-            // Except on Windows, use 'exec' so that we get the pid of the actual Node process
-            // and not the shell it uses to execute. You can't do exec on Windows; there is a
-            // bypass_shell option but it is not the same thing and isn't usable here.
-            if (!self::is_windows()) {
-                $prefix = 'exec ';
-            }
-            $process = proc_open($prefix . 'ionic serve --no-interactive --no-open',
-                    [['pipe', 'r'], ['pipe', 'w'], ['file', $stderrfile, 'w']], $pipes, $path);
-            if ($process === false) {
-                throw new DriverException('Error starting Ionic process');
-            }
-            fclose($pipes[0]);
-
-            // Get pid - we will need this to kill the process.
-            $status = proc_get_status($process);
-            $pid = $status['pid'];
-
-            // Read data from stdout until the server comes online.
-            // Note: On Windows it is impossible to read simultaneously from stderr and stdout
-            // because stream_select and non-blocking I/O don't work on process pipes, so that is
-            // why stderr was redirected to a file instead. Also, this code is simpler.
-            $url = null;
-            $stdoutlog = '';
-            while (true) {
-                $line = fgets($pipes[1], 4096);
-                if ($line === false) {
-                    break;
-                }
-
-                $stdoutlog .= $line;
-
-                if (preg_match('~^\s*Local: (http\S*)~', $line, $matches)) {
-                    $url = $matches[1];
-                    break;
-                }
-            }
-
-            // If it failed, close the pipes and the process.
-            if (!$url) {
-                fclose($pipes[1]);
-                proc_close($process);
-                $logpath = $CFG->dataroot . '/behat/ionic-start.log';
-                $stderrlog = file_get_contents($stderrfile);
-                @unlink($stderrfile);
-                file_put_contents($logpath,
-                        "Ionic startup log from " . date('c') .
-                        "\n\n----STDOUT----\n$stdoutlog\n\n----STDERR----\n$stderrlog");
-                throw new DriverException('Unable to start Ionic. See ' . $logpath);
-            }
-
-            // Remember the URL, so we can reuse it next time, and other details so we can kill
-            // the process.
-            self::$ionicrunning = (object)['url' => $url, 'process' => $process, 'pipes' => $pipes,
-                    'pid' => $pid];
-            $url = self::$ionicrunning->url;
-        }
-        return $url;
-    }
-
-    /**
-     * Closes Ionic (if it was started) at end of test suite.
-     *
-     * @AfterSuite
-     */
-    public static function close_ionic() {
-        if (self::$ionicrunning) {
-            fclose(self::$ionicrunning->pipes[1]);
-
-            if (self::is_windows()) {
-                // Using proc_terminate here does not work. It terminates the process but not any
-                // other processes it might have launched. Instead, we need to use an OS-specific
-                // mechanism to kill the process and children based on its pid.
-                exec('taskkill /F /T /PID ' . self::$ionicrunning->pid);
-            } else {
-                // On Unix this actually works, although only due to the 'exec' command inserted
-                // above.
-                proc_terminate(self::$ionicrunning->process);
-            }
-            self::$ionicrunning = null;
-        }
-    }
-
     /**
      * Goes to the app page and then sets up some initial JavaScript so we can use it.
      *
@@ -294,12 +202,9 @@ protected function prepare_browser(array $options = []) {
 
             // Reset its size.
             $this->resize_window($this->windowsize, true);
-            if (empty($this->ionicurl)) {
-                $this->ionicurl = $this->start_or_reuse_ionic();
-            }
 
             // Visit the Ionic URL.
-            $this->getSession()->visit($this->ionicurl);
+            $this->getSession()->visit($this->get_app_url());
             $this->notify_load();
 
             $this->apprunning = true;

version.php

@@ -6,7 +6,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2022092000;
+$plugin->version = 2022102000;
 $plugin->requires = 2016052300;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->release = '4.1.0-dev';