Skip to content

Commit 0a7d897

Browse files
Mahmoud Kassaeitimhunt
authored andcommitted
Edit dates/groups/idnumber: Update to work with Moodle 4.0 #547712
1 parent 9d67ea8 commit 0a7d897

File tree

6 files changed

+17
-23
lines changed

6 files changed

+17
-23
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ jobs:
1414
- php: '7.4'
1515
moodle-branch: 'MOODLE_311_STABLE'
1616
database: 'mariadb'
17-
- php: '7.3'
18-
moodle-branch: 'MOODLE_310_STABLE'
19-
database: 'pgsql'
20-
- php: '7.2'
21-
moodle-branch: 'MOODLE_39_STABLE'
22-
database: 'mariadb'
2317

2418
services:
2519
postgres:
@@ -50,11 +44,6 @@ jobs:
5044
with:
5145
path: plugin
5246

53-
- name: Install node
54-
uses: actions/setup-node@v1
55-
with:
56-
node-version: '14.15.0'
57-
5847
- name: Setup PHP
5948
uses: shivammathur/setup-php@v2
6049
with:

changes.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change log for the Edit ID numbers report
22

3+
## Changes in 2.6
4+
5+
* This version works with Moodle 4.0.
6+
* Updated to use Moodle 3.11 navigation
7+
* Switch from Travis to Github actions.
8+
* Update Travis config.
9+
* Update to Travis-CI config.
310

411
## Changes in 2.5
512

index.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
$urlparams['activitytype'] = $activitytype;
4545
}
4646
$pageurl = new moodle_url('/report/editidnumber/index.php', $urlparams);
47-
report_helper::save_selected_report($id, $pageurl);
4847
$PAGE->set_url($pageurl);
4948
$PAGE->set_pagelayout('admin');
5049

tests/behat/basic.feature

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ Feature: Edit course plugin ID numbers
3737

3838
@javascript @_switch_iframe
3939
Scenario: Test edit ID number report can be used to change plugin instance ID numbers
40-
When I log in as "admin"
41-
And I am on "Course 1" course homepage
40+
When I am on the "Course 1" "course" page logged in as "admin"
4241
And I navigate to "Reports > ID numbers" in current page administration
4342
And I follow "ID numbers"
4443
Then I should see "Course 1"
@@ -47,14 +46,14 @@ Feature: Edit course plugin ID numbers
4746
And I should see "Test quiz name 1"
4847
And I should see "Test quiz name 2"
4948
And I should see "Test quiz name 3"
50-
And I set the field with xpath "//fieldset[@id='id_section2header']/div[@class='fcontainer clearfix']/div[2]/div[contains(@class,'felement')]/input[@type='text']" to "1"
51-
And I set the field with xpath "//fieldset[@id='id_section3header']/div[@class='fcontainer clearfix']/div[2]/div[contains(@class,'felement')]/input[@type='text']" to "2"
49+
And I set the field with xpath "//fieldset[@id='id_section2header']//div[contains(@class,'felement')]/input[@type='text']" to "1"
50+
And I set the field with xpath "//fieldset[@id='id_section3header']//div[contains(@class,'felement')]/input[@type='text']" to "2"
5251
And I press "Save changes"
5352
Then I should see "Course 1"
5453
And I should see "Activity view filter "
5554
And I follow "Expand all"
5655
And I should see "Test quiz name 1"
5756
And I should see "Test quiz name 2"
5857
And I should see "Test quiz name 3"
59-
And the "value" attribute of "//fieldset[@id='id_section2header']/div[@class='fcontainer clearfix']/div[2]/div[contains(@class,'felement')]/input[@type='text']" "xpath_element" should contain "1"
60-
And the "value" attribute of "//fieldset[@id='id_section3header']/div[@class='fcontainer clearfix']/div[2]/div[contains(@class,'felement')]/input[@type='text']" "xpath_element" should contain "2"
58+
And the "value" attribute of "//fieldset[@id='id_section2header']//div[contains(@class,'felement')]/input[@type='text']" "xpath_element" should contain "1"
59+
And the "value" attribute of "//fieldset[@id='id_section3header']//div[contains(@class,'felement')]/input[@type='text']" "xpath_element" should contain "2"

tests/behat/course_report_editidnumber.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@report @report_editidnumber @ou @ou_vle
2-
Feature: Edit idnumber report navigation
2+
Feature: In a course administration page, navigate through report page, test for course ID numbers page
33
In order to navigate through report page
44
As an admin
55
Go to course administration -> Reports -> ID numbers
@@ -17,7 +17,7 @@ Feature: Edit idnumber report navigation
1717
| student1 | C1 | student |
1818

1919
@javascript
20-
Scenario: Selector should be available in the Edit idnumber report
20+
Scenario: Selector should be available in the Activities and resources page
2121
Given I log in as "admin"
2222
And I am on "Course 1" course homepage
2323
When I navigate to "Reports > ID numbers" in current page administration

version.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
defined('MOODLE_INTERNAL') || die;
2626

27-
$plugin->version = 2018112100;
28-
$plugin->requires = 2017111300;
27+
$plugin->version = 2022061700;
28+
$plugin->requires = 2020061500;
2929
$plugin->component = 'report_editidnumber';
3030
$plugin->maturity = MATURITY_STABLE;
31-
$plugin->release = '2.5 for Moodle 3.4+';
31+
$plugin->release = '2.6 for Moodle 3.11+';
3232

3333
$plugin->outestssufficient = true;

0 commit comments

Comments
 (0)