Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle

roddle · Feb 17, 2015 · c8171c1 · c8171c1
2 parents cbae4e3 + d1bb9ea
commit c8171c1
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 5 deletions.
diff --git a/admin/tool/task/classes/edit_scheduled_task_form.php b/admin/tool/task/classes/edit_scheduled_task_form.php
@@ -58,27 +58,22 @@ public function definition() {
         $mform->addElement('text', 'minute', get_string('taskscheduleminute', 'tool_task'));
         $mform->setType('minute', PARAM_RAW);
         $mform->addHelpButton('minute', 'taskscheduleminute', 'tool_task');
-        $mform->addRule('minute', get_string('required'), 'required');
 
         $mform->addElement('text', 'hour', get_string('taskschedulehour', 'tool_task'));
         $mform->setType('hour', PARAM_RAW);
         $mform->addHelpButton('hour', 'taskschedulehour', 'tool_task');
-        $mform->addRule('hour', get_string('required'), 'required');
 
         $mform->addElement('text', 'day', get_string('taskscheduleday', 'tool_task'));
         $mform->setType('day', PARAM_RAW);
         $mform->addHelpButton('day', 'taskscheduleday', 'tool_task');
-        $mform->addRule('day', get_string('required'), 'required');
 
         $mform->addElement('text', 'month', get_string('taskschedulemonth', 'tool_task'));
         $mform->setType('month', PARAM_RAW);
         $mform->addHelpButton('month', 'taskschedulemonth', 'tool_task');
-        $mform->addRule('month', get_string('required'), 'required');
 
         $mform->addElement('text', 'dayofweek', get_string('taskscheduledayofweek', 'tool_task'));
         $mform->setType('dayofweek', PARAM_RAW);
         $mform->addHelpButton('dayofweek', 'taskscheduledayofweek', 'tool_task');
-        $mform->addRule('dayofweek', get_string('required'), 'required');
 
         $mform->addElement('advcheckbox', 'disabled', get_string('disabled', 'tool_task'));
         $mform->addHelpButton('disabled', 'disabled', 'tool_task');

diff --git a/admin/tool/task/tests/behat/manage_tasks.feature b/admin/tool/task/tests/behat/manage_tasks.feature
@@ -0,0 +1,53 @@
+@tool @tool_task @javascript
+Feature: Manage scheduled tasks
+  In order to configure scheduled tasks
+  As an admin
+  I need to be able to disable, enable, edit and reset to default scheduled tasks
+
+  Background:
+    Given I log in as "admin"
+    And I navigate to "Scheduled tasks" node in "Site administration > Server"
+
+  Scenario: Disable scheduled task
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | disabled             | 1 |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And I should see "Task disabled" in the "Log table cleanup" "table_row"
+
+  Scenario: Enable scheduled task
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | disabled             | 0 |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And I should not see "Task disabled" in the "Log table cleanup" "table_row"
+
+  Scenario: Edit scheduled task
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | minute               | */5 |
+      | hour                 | 1   |
+      | day                  | 2   |
+      | month                | 3   |
+      | dayofweek            | 4   |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And the following should exist in the "admintable" table:
+      | Component    | Minute | Hour | Day | Day of week | Month |
+      | Standard log | */5    | 1    | 2   | 4           | 3     |
+
+  Scenario: Reset scheduled task to default
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | resettodefaults      | 1   |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And the following should not exist in the "admintable" table:
+      | Component    | Minute | Hour | Day | Day of week | Month |
+      | Standard log | */5    | 1    | 2   | 4           | 3     |