Fix automated tests

Author: bluetom

.github/workflows/config.json

@@ -2,7 +2,7 @@
   "main-moodle": "MOODLE_405_STABLE",
   "main-php": "8.3",
   "moodle-php": {
-    "MOODLE_405_STABLE": ["8.1", "8.2", "8.3"]
+    "MOODLE_405_STABLE": ["8.3"]
   },
   "moodle-plugin-ci": "4.4.5"
 }

classes/local/backup/backup_lifecycle_workflow.php

@@ -22,10 +22,9 @@
  */
 namespace tool_lifecycle\local\backup;
 
-require_once(__DIR__ . '/../../../config.php');
-require_once("$CFG->libdir/filelib.php");
+defined('MOODLE_INTERNAL') || die();
 
-require_login();
+require_once("$CFG->libdir/filelib.php");
 
 use tool_lifecycle\local\entity\step_subplugin;
 use tool_lifecycle\local\entity\trigger_subplugin;

tests/active_workflow_is_manual_test.php

@@ -68,12 +68,14 @@ public function setUp(): void {
         $settings->displayname = self::MANUAL_TRIGGER1_DISPLAYNAME;
         $settings->capability = self::MANUAL_TRIGGER1_CAPABILITY;
         $this->manualworkflow = $generator->create_manual_workflow($settings);
+        $generator->create_step("instance1", "createbackup", $this->manualworkflow->id);
         $this->automaticworkflow = $generator->create_workflow();
+        $generator->create_step("instance1", "createbackup", $this->automaticworkflow->id);
 
         $this->assertNull($this->manualworkflow->manual);
         $this->assertNull($this->automaticworkflow->manual);
 
-        // We do not need a sesskey check in theses tests.
+        // We do not need a sesskey check in these tests.
         $USER->ignoresesskey = true;
     }
 

tests/behat/manual_trigger.feature

@@ -37,6 +37,9 @@ Feature: Add a manual trigger and test view and actions as a teacher
       | Action name                | Delete course                             |
       | Capability                 | moodle/course:manageactivities            |
     And I press "Save changes"
+    And I select "Create backup step" from the "tool_lifecycle-choose-step" singleselect
+    And I set the field "Instance name" to "Create backup step"
+    And I press "Save changes"
     And I am on workflowdrafts page
     And I press "Activate"
     And I log out

tests/generator/lib.php

@@ -79,7 +79,7 @@ class tool_lifecycle_generator extends testing_module_generator {
      * @throws coding_exception
      * @throws moodle_exception
      */
-    public static function create_workflow($triggernames = ['startdatedelay'], $stepnames = []) {
+    public static function create_workflow($triggernames = ['startdatedelay'], $stepnames = ['createbackup']) {
         // Create Workflow.
         $record = new stdClass();
         $record->id = null;
@@ -101,15 +101,15 @@ public static function create_workflow($triggernames = ['startdatedelay'], $step
                 throw new coding_exception("You can use only those triggernames,".
                     "which are defined as defaults in this generator.");
             }
-            $step = self::create_trigger($subpluginname, $subpluginname, $workflow->id);
-            settings_manager::save_settings($step->id, settings_type::TRIGGER, $subpluginname,
+            $trigger = self::create_trigger($subpluginname, $subpluginname, $workflow->id);
+            settings_manager::save_settings($trigger->id, settings_type::TRIGGER, $subpluginname,
                 self::$defaulttrigger[$subpluginname]);
         }
         return $workflow;
     }
 
     /**
-     * Creates an artificial workflow without steps, which is triggered manually.
+     * Creates an artificial workflow which is triggered manually.
      * @param \stdClass $triggersettings settings of the manual trigger
      * @return workflow
      * @throws moodle_exception

tests/manual_trigger_tools_test.php

@@ -72,14 +72,16 @@ public function setUp(): void {
         $triggersettings->displayname = self::MANUAL_TRIGGER1_DISPLAYNAME;
         $triggersettings->capability = self::MANUAL_TRIGGER1_CAPABILITY;
         $this->workflow1 = $generator->create_manual_workflow($triggersettings);
+        $generator->create_step("instance1", "createbackup", $this->workflow1->id);
 
         $triggersettings = new \stdClass();
         $triggersettings->icon = self::MANUAL_TRIGGER2_ICON;
         $triggersettings->displayname = self::MANUAL_TRIGGER2_DISPLAYNAME;
         $triggersettings->capability = self::MANUAL_TRIGGER2_CAPABILITY;
         $this->workflow2 = $generator->create_manual_workflow($triggersettings);
+        $generator->create_step("instance1", "createbackup", $this->workflow2->id);
 
-        // We do not need a sesskey check in theses tests.
+        // We do not need a sesskey check in these tests.
         $USER->ignoresesskey = true;
     }
 

tests/persistence/persist_step_test.php

@@ -70,11 +70,11 @@ public function test_add_step(): void {
             $this->workflow->id);
         $this->assertNotEmpty($step->id);
         $this->assertEquals($this->workflow->id, $step->workflowid);
-        $this->assertEquals(1, $step->sortindex);
+        $this->assertEquals(2, $step->sortindex);
     }
 
     /**
-     * Test that sortindizes are created correclty when creating multiple steps.
+     * Test that sort indices are created correctly when creating multiple steps.
      * @covers \tool_lifecycle\local\manager\step_manager
      */
     public function test_add_multiple_steps(): void {
@@ -90,9 +90,9 @@ public function test_add_multiple_steps(): void {
             'instance3',
             'subpluginname',
             $this->workflow->id);
-        $this->assertEquals(1, $step1->sortindex);
-        $this->assertEquals(2, $step2->sortindex);
-        $this->assertEquals(3, $step3->sortindex);
+        $this->assertEquals(2, $step1->sortindex);
+        $this->assertEquals(3, $step2->sortindex);
+        $this->assertEquals(4, $step3->sortindex);
     }
 
     /**
@@ -118,14 +118,14 @@ public function test_remove_step(): void {
         $step2 = step_manager::get_step_instance($step2->id);
         $step3 = step_manager::get_step_instance($step3->id);
         $this->assertNull($step1);
-        $this->assertEquals(1, $step2->sortindex);
-        $this->assertEquals(2, $step3->sortindex);
+        $this->assertEquals(2, $step2->sortindex);
+        $this->assertEquals(3, $step3->sortindex);
         // Delete third step.
         step_manager::handle_action(action::STEP_INSTANCE_DELETE, $step3->id, $this->workflow->id);
         $step3 = step_manager::get_step_instance($step3->id);
         $step2 = step_manager::get_step_instance($step2->id);
         $this->assertNull($step3);
-        $this->assertEquals(1, $step2->sortindex);
+        $this->assertEquals(2, $step2->sortindex);
     }
 
     /**
@@ -154,8 +154,8 @@ public function test_add_after_remove_step(): void {
         $step2 = step_manager::get_step_instance($step2->id);
         $step3 = step_manager::get_step_instance($step3->id);
         $this->assertNull($step1);
-        $this->assertEquals(1, $step2->sortindex);
-        $this->assertEquals(2, $step3->sortindex);
+        $this->assertEquals(2, $step2->sortindex);
+        $this->assertEquals(3, $step3->sortindex);
     }
 
 }

tests/process_status_message_test.php

@@ -56,7 +56,7 @@ final class process_status_message_test extends \advanced_testcase {
     public function setUp(): void {
         global $USER;
 
-        // We do not need a sesskey check in theses tests.
+        // We do not need a sesskey check in these tests.
         $USER->ignoresesskey = true;
 
         $this->resetAfterTest(false);
@@ -66,10 +66,10 @@ public function setUp(): void {
         $settings->displayname = self::MANUAL_TRIGGER1_DISPLAYNAME;
         $settings->capability = self::MANUAL_TRIGGER1_CAPABILITY;
         $this->workflow = $this->generator->create_manual_workflow($settings);
-        workflow_manager::handle_action(action::WORKFLOW_ACTIVATE, $this->workflow->id);
-
         $this->generator->create_step("instance1", "createbackup", $this->workflow->id);
         $this->generator->create_step("instance2", "email", $this->workflow->id);
+        workflow_manager::handle_action(action::WORKFLOW_ACTIVATE, $this->workflow->id);
+
     }
 
     /**

tests/workflow_actions_testcase.php

@@ -53,7 +53,7 @@ abstract class workflow_actions_testcase extends \advanced_testcase {
      */
     public function setUp(): void {
         global $USER;
-        // We do not need a sesskey check in theses tests.
+        // We do not need a sesskey check in these tests.
         $USER->ignoresesskey = true;
 
         $this->resetAfterTest(true);

workflowoverview.php

@@ -102,6 +102,7 @@
 $showdetailslink = new moodle_url(urls::WORKFLOW_DETAILS, $params);
 
 $action = optional_param('action', null, PARAM_TEXT);
+$msg = "";
 if ($action) {
     if ($action == 'select') {
         $cid = required_param('cid', PARAM_INT);
@@ -133,7 +134,7 @@
             }
         }
     }
-    redirect($PAGE->url, $msg, 3, notification::NOTIFY_SUCCESS);
+    redirect($PAGE->url, $msg, null, notification::NOTIFY_SUCCESS);
 }
 
 $PAGE->set_pagetype('admin-setting-' . 'tool_lifecycle');