Skip to content

Commit 4c1984e

Browse files
author
Mike Churchward
committed
Poet - Setting up for 3.6 and stable.
1 parent b9a4251 commit 4c1984e

File tree

9 files changed

+79
-39
lines changed

9 files changed

+79
-39
lines changed

.travis.yml

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,66 @@ sudo: true
44

55
addons:
66
firefox: "47.0.1"
7-
postgresql: "9.3"
7+
postgresql: "9.4"
88
apt:
99
packages:
10-
- oracle-java8-installer
11-
- oracle-java8-set-default
10+
- oracle-java9-installer
11+
- oracle-java9-set-default
1212

1313
cache:
1414
directories:
1515
- $HOME/.composer/cache
1616
- $HOME/.npm
1717

1818
php:
19-
- 7.0
20-
- 7.1
19+
- 5.6
20+
- 7.1
21+
- 7.2
2122

2223
env:
23-
global:
24-
- MOODLE_BRANCH=MOODLE_34_STABLE
24+
- MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql
25+
- MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli
26+
- MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql
27+
- MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli
28+
- MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql
29+
- MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli
30+
- MOODLE_BRANCH=MOODLE_33_STABLE DB=pgsql
31+
- MOODLE_BRANCH=MOODLE_33_STABLE DB=mysqli
2532

26-
matrix:
27-
- DB=pgsql
28-
- DB=mysqli
33+
matrix:
34+
exclude:
35+
- php: 7.1
36+
env: MOODLE_BRANCH=MOODLE_33_STABLE DB=mysqli
37+
- php: 7.1
38+
env: MOODLE_BRANCH=MOODLE_33_STABLE DB=pgsql
39+
- php: 7.2
40+
env: MOODLE_BRANCH=MOODLE_33_STABLE DB=mysqli
41+
- php: 7.2
42+
env: MOODLE_BRANCH=MOODLE_33_STABLE DB=pgsql
43+
- php: 5.6
44+
env: MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli
45+
- php: 5.6
46+
env: MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql
47+
- php: 7.2
48+
env: MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli
49+
- php: 7.2
50+
env: MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql
51+
- php: 5.6
52+
env: MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli
53+
- php: 5.6
54+
env: MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql
55+
- php: 7.2
56+
env: MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli
57+
- php: 7.2
58+
env: MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql
59+
- php: 5.6
60+
env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli
61+
- php: 5.6
62+
env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql
63+
- php: 7.1
64+
env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli
65+
- php: 7.1
66+
env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql
2967

3068
before_install:
3169
- phpenv config-rm xdebug.ini
@@ -41,7 +79,6 @@ before_install:
4179
install:
4280
- moodle-plugin-ci install
4381

44-
script:
4582
script:
4683
- moodle-plugin-ci phplint
4784
- moodle-plugin-ci phpcpd

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Release Notes
22

3+
Release 3.6.0 (Build 2018120300)
4+
First stable release. Compatibile with 3.6, 3.5, 3.4 and 3.3.
5+
36
Release BETA3.3.4 (Build 2018062800)
47
GHISSUE-1 - Added hooks to module form to include metadata form elements in the module settings page.
58
GHISSUE-10 - Implemented Privacy API for GDPR compliance.

context/category/tests/behat/enable_category.feature

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ Feature: Enable category context plugin
1616
| user | course | role |
1717
| teacher1 | C1 | editingteacher |
1818
And I log in as "admin"
19-
And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata"
19+
And I navigate to "Plugins > Local plugins > Metadata" in site administration
2020
And I set the field "id_s_metadatacontext_category_metadataenabled" to "1"
2121
And I press "Save changes"
2222
Then the field "s_metadatacontext_category_metadataenabled" matches value "1"
23-
And I navigate to "Courses" node in "Site administration"
23+
And I navigate to "Courses" in site administration
2424
Then I should see "Category metadata"
25-
And I navigate to "Category metadata" node in "Site administration > Courses"
25+
And I navigate to "Courses > Category metadata" in site administration
2626
Then I should see "Category metadata"
2727
And I should see "Create a new profile field:"
2828
And I should see "Create a new profile category"
@@ -36,9 +36,9 @@ Feature: Enable category context plugin
3636
Then I should see "Category metadata"
3737
And I should see "Creation date"
3838

39-
And I navigate to "Courses" node in "Site administration"
39+
And I navigate to "Courses" in site administration
4040
And I press "Blocks editing on"
41-
And I navigate to "Manage courses and categories" node in "Site administration > Courses"
41+
And I navigate to "Courses > Manage courses and categories" in site administration
4242
Then I should see "Miscellaneous"
4343
And I add the "Administration" block
4444
And I follow "Edit this category"
@@ -54,7 +54,7 @@ Feature: Enable category context plugin
5454
And I press "Save changes"
5555
And I should see "Metadata saved"
5656

57-
And I navigate to "Manage courses and categories" node in "Site administration > Courses"
57+
And I navigate to "Courses > Manage courses and categories" in site administration
5858
And I follow "Edit this category"
5959
And I follow "Category metadata"
6060
Then I should see "Creation date"

context/cohort/tests/behat/enable_cohort.feature

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Feature: Enable cohort context plugin
1616
| user | course | role |
1717
| teacher1 | C1 | editingteacher |
1818
And I log in as "admin"
19-
And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata"
19+
And I navigate to "Plugins > Local plugins > Metadata" in site administration
2020
And I set the field "id_s_metadatacontext_cohort_metadataenabled" to "1"
2121
And I press "Save changes"
2222
Then the field "s_metadatacontext_cohort_metadataenabled" matches value "1"
2323

24-
And I navigate to "Users" node in "Site administration"
24+
And I navigate to "Users" in site administration
2525
Then I should see "Cohort metadata"
26-
And I navigate to "Cohort metadata" node in "Site administration > Users"
26+
And I navigate to "Users > Cohort metadata" in site administration
2727
Then I should see "Cohort metadata"
2828
And I should see "Create a new profile field:"
2929
And I should see "Create a new profile category"
@@ -35,7 +35,7 @@ Feature: Enable cohort context plugin
3535
Then I should see "Cohort metadata"
3636
And I should see "Cohort Manager ID"
3737

38-
And I navigate to "Cohorts" node in "Site administration > Users > Accounts"
38+
And I navigate to "Users > Accounts > Cohorts" in site administration
3939
And I press "Blocks editing on"
4040
And I follow "Add new cohort"
4141
Then I should see "Add new cohort"
@@ -52,7 +52,7 @@ Feature: Enable cohort context plugin
5252
And I set the field "id_local_metadata_field_managerid" to "MANAGER001"
5353
And I press "Save changes"
5454
And I should see "Metadata saved"
55-
And I navigate to "Cohorts" node in "Site administration > Users > Accounts"
55+
And I navigate to " Users > Accounts > Cohorts" in site administration
5656
And I should see "Cohort One"
5757
And I click on "Edit" "link" in the "//table[@id='cohorts']//tr[1]//td[6]" "xpath_element"
5858
And I should see "Edit cohort"

context/course/tests/behat/enable_course.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Feature: Enable course context plugin
1616
| user | course | role |
1717
| teacher1 | C1 | editingteacher |
1818
And I log in as "admin"
19-
And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata"
19+
And I navigate to "Plugins > Local plugins > Metadata" in site administration
2020
And I set the field "id_s_metadatacontext_course_metadataenabled" to "1"
2121
And I press "Save changes"
2222
Then the field "s_metadatacontext_course_metadataenabled" matches value "1"
2323

24-
And I navigate to "Courses" node in "Site administration"
24+
And I navigate to "Courses" in site administration
2525
Then I should see "Course metadata"
26-
And I navigate to "Course metadata" node in "Site administration > Courses"
26+
And I navigate to "Courses > Course metadata" in site administration
2727
Then I should see "Course metadata"
2828
And I should see "Create a new profile field:"
2929
And I should see "Create a new profile category"

context/group/tests/behat/enable_group.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Feature: Enable group context plugin
1919
| user | course | role |
2020
| teacher1 | C1 | editingteacher |
2121
And I log in as "admin"
22-
And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata"
22+
And I navigate to "Plugins > Local plugins > Metadata" in site administration
2323
And I set the field "id_s_metadatacontext_group_metadataenabled" to "1"
2424
And I press "Save changes"
2525
Then the field "s_metadatacontext_group_metadataenabled" matches value "1"
2626

27-
And I navigate to "Courses" node in "Site administration"
27+
And I navigate to "Courses" in site administration
2828
Then I should see "Group metadata"
29-
And I navigate to "Group metadata" node in "Site administration > Courses"
29+
And I navigate to "Courses > Group metadata" in site administration
3030
Then I should see "Group metadata"
3131
And I should see "Create a new profile field:"
3232
And I should see "Create a new profile category"
@@ -49,7 +49,7 @@ Feature: Enable group context plugin
4949

5050
And I am on "Course 1" course homepage
5151
And I turn editing mode on
52-
And I navigate to "Groups" node in "Course administration > Users"
52+
And I navigate to "Users > Groups" in current page administration
5353
And I set the field "Groups" to "Group A"
5454
And I press "Edit group settings"
5555
And I add the "Administration" block

context/module/tests/behat/enable_module.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Feature: Enable module context plugin
1919
| user | course | role |
2020
| teacher1 | C1 | editingteacher |
2121
And I log in as "admin"
22-
And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata"
22+
And I navigate to "Plugins > Local plugins > Metadata" in site administration
2323
And I set the field "id_s_metadatacontext_module_metadataenabled" to "1"
2424
And I press "Save changes"
2525
Then the field "s_metadatacontext_module_metadataenabled" matches value "1"
2626

27-
And I navigate to "Plugins" node in "Site administration"
27+
And I navigate to "Plugins" in site administration
2828
Then I should see "Module metadata"
29-
And I navigate to "Module metadata" node in "Site administration > Plugins"
29+
And I navigate to "Plugins > Module metadata" in site administration
3030
Then I should see "Module metadata"
3131
And I should see "Create a new profile field:"
3232
And I should see "Create a new profile category"

context/user/tests/behat/enable_user.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Feature: Enable user context plugin
1616
| user | course | role |
1717
| teacher1 | C1 | editingteacher |
1818
And I log in as "admin"
19-
And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata"
19+
And I navigate to "Plugins > Local plugins > Metadata" in site administration
2020
And I set the field "id_s_metadatacontext_user_metadataenabled" to "1"
2121
And I press "Save changes"
2222
Then the field "s_metadatacontext_user_metadataenabled" matches value "1"
2323

24-
And I navigate to "Users" node in "Site administration"
24+
And I navigate to "Users" in site administration
2525
Then I should see "User metadata"
26-
And I navigate to "User metadata" node in "Site administration > Users"
26+
And I navigate to "Users > User metadata" in site administration
2727
Then I should see "User metadata"
2828
And I should see "Create a new profile field:"
2929
And I should see "Create a new profile category"
@@ -35,7 +35,7 @@ Feature: Enable user context plugin
3535
Then I should see "User metadata"
3636
And I should see "I accept the site policy"
3737

38-
And I navigate to "Browse list of users" node in "Site administration > Users > Accounts"
38+
And I navigate to "Users > Accounts > Browse list of users" in site administration
3939
And I follow "Teacher 1"
4040
Then I should see "Metadata"
4141
And I should see "I accept the site policy"

version.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*/
2323

2424
defined('MOODLE_INTERNAL') || die;
25-
$plugin->version = 2017070104;
26-
$plugin->release = 'BETA3.3.4 (Build 2018062800)';
27-
$plugin->maturity = MATURITY_BETA;
25+
$plugin->version = 2018120100;
26+
$plugin->release = '3.6.0 (Build 2018120300)';
27+
$plugin->maturity = MATURITY_STABLE;
2828
$plugin->requires = 2016052300; // Moodle 3.1 release and upwards.
2929
$plugin->component = 'local_metadata';

0 commit comments

Comments
 (0)