From 03d523a39ed7711a1ef8ec1b6582f6e27e94d71c Mon Sep 17 00:00:00 2001 From: Mike Churchward Date: Mon, 3 Dec 2018 17:19:09 -0500 Subject: [PATCH] Poet - Setting up for 3.6 and stable. --- .travis.yml | 59 +++++++++++++++---- CHANGES.txt | 3 + .../tests/behat/enable_category.feature | 12 ++-- .../cohort/tests/behat/enable_cohort.feature | 10 ++-- .../course/tests/behat/enable_course.feature | 6 +- .../group/tests/behat/enable_group.feature | 8 +-- .../module/tests/behat/enable_module.feature | 6 +- context/user/tests/behat/enable_user.feature | 8 +-- version.php | 6 +- 9 files changed, 79 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c61f49..30bbf3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ sudo: true addons: firefox: "47.0.1" - postgresql: "9.3" + postgresql: "9.4" apt: packages: - - oracle-java8-installer - - oracle-java8-set-default + - oracle-java9-installer + - oracle-java9-set-default cache: directories: @@ -16,16 +16,54 @@ cache: - $HOME/.npm php: - - 7.0 - - 7.1 +- 5.6 +- 7.1 +- 7.2 env: - global: - - MOODLE_BRANCH=MOODLE_34_STABLE +- MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql +- MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli +- MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql +- MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli +- MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql +- MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli +- MOODLE_BRANCH=MOODLE_33_STABLE DB=pgsql +- MOODLE_BRANCH=MOODLE_33_STABLE DB=mysqli - matrix: - - DB=pgsql - - DB=mysqli +matrix: + exclude: + - php: 7.1 + env: MOODLE_BRANCH=MOODLE_33_STABLE DB=mysqli + - php: 7.1 + env: MOODLE_BRANCH=MOODLE_33_STABLE DB=pgsql + - php: 7.2 + env: MOODLE_BRANCH=MOODLE_33_STABLE DB=mysqli + - php: 7.2 + env: MOODLE_BRANCH=MOODLE_33_STABLE DB=pgsql + - php: 5.6 + env: MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli + - php: 5.6 + env: MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql + - php: 7.2 + env: MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli + - php: 7.2 + env: MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql + - php: 5.6 + env: MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli + - php: 5.6 + env: MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql + - php: 7.2 + env: MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli + - php: 7.2 + env: MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql + - php: 5.6 + env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli + - php: 5.6 + env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql + - php: 7.1 + env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli + - php: 7.1 + env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql before_install: - phpenv config-rm xdebug.ini @@ -41,7 +79,6 @@ before_install: install: - moodle-plugin-ci install -script: script: - moodle-plugin-ci phplint - moodle-plugin-ci phpcpd diff --git a/CHANGES.txt b/CHANGES.txt index 5c3bc3c..ed98c34 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,8 @@ Release Notes +Release 3.6.0 (Build 2018120300) +First stable release. Compatibile with 3.6, 3.5, 3.4 and 3.3. + Release BETA3.3.4 (Build 2018062800) GHISSUE-1 - Added hooks to module form to include metadata form elements in the module settings page. GHISSUE-10 - Implemented Privacy API for GDPR compliance. diff --git a/context/category/tests/behat/enable_category.feature b/context/category/tests/behat/enable_category.feature index 9c45d4d..d2984cc 100644 --- a/context/category/tests/behat/enable_category.feature +++ b/context/category/tests/behat/enable_category.feature @@ -16,13 +16,13 @@ Feature: Enable category context plugin | user | course | role | | teacher1 | C1 | editingteacher | And I log in as "admin" - And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata" + And I navigate to "Plugins > Local plugins > Metadata" in site administration And I set the field "id_s_metadatacontext_category_metadataenabled" to "1" And I press "Save changes" Then the field "s_metadatacontext_category_metadataenabled" matches value "1" - And I navigate to "Courses" node in "Site administration" + And I navigate to "Courses" in site administration Then I should see "Category metadata" - And I navigate to "Category metadata" node in "Site administration > Courses" + And I navigate to "Courses > Category metadata" in site administration Then I should see "Category metadata" And I should see "Create a new profile field:" And I should see "Create a new profile category" @@ -36,9 +36,9 @@ Feature: Enable category context plugin Then I should see "Category metadata" And I should see "Creation date" - And I navigate to "Courses" node in "Site administration" + And I navigate to "Courses" in site administration And I press "Blocks editing on" - And I navigate to "Manage courses and categories" node in "Site administration > Courses" + And I navigate to "Courses > Manage courses and categories" in site administration Then I should see "Miscellaneous" And I add the "Administration" block And I follow "Edit this category" @@ -54,7 +54,7 @@ Feature: Enable category context plugin And I press "Save changes" And I should see "Metadata saved" - And I navigate to "Manage courses and categories" node in "Site administration > Courses" + And I navigate to "Courses > Manage courses and categories" in site administration And I follow "Edit this category" And I follow "Category metadata" Then I should see "Creation date" diff --git a/context/cohort/tests/behat/enable_cohort.feature b/context/cohort/tests/behat/enable_cohort.feature index 85733b2..f96f4a6 100644 --- a/context/cohort/tests/behat/enable_cohort.feature +++ b/context/cohort/tests/behat/enable_cohort.feature @@ -16,14 +16,14 @@ Feature: Enable cohort context plugin | user | course | role | | teacher1 | C1 | editingteacher | And I log in as "admin" - And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata" + And I navigate to "Plugins > Local plugins > Metadata" in site administration And I set the field "id_s_metadatacontext_cohort_metadataenabled" to "1" And I press "Save changes" Then the field "s_metadatacontext_cohort_metadataenabled" matches value "1" - And I navigate to "Users" node in "Site administration" + And I navigate to "Users" in site administration Then I should see "Cohort metadata" - And I navigate to "Cohort metadata" node in "Site administration > Users" + And I navigate to "Users > Cohort metadata" in site administration Then I should see "Cohort metadata" And I should see "Create a new profile field:" And I should see "Create a new profile category" @@ -35,7 +35,7 @@ Feature: Enable cohort context plugin Then I should see "Cohort metadata" And I should see "Cohort Manager ID" - And I navigate to "Cohorts" node in "Site administration > Users > Accounts" + And I navigate to "Users > Accounts > Cohorts" in site administration And I press "Blocks editing on" And I follow "Add new cohort" Then I should see "Add new cohort" @@ -52,7 +52,7 @@ Feature: Enable cohort context plugin And I set the field "id_local_metadata_field_managerid" to "MANAGER001" And I press "Save changes" And I should see "Metadata saved" - And I navigate to "Cohorts" node in "Site administration > Users > Accounts" + And I navigate to " Users > Accounts > Cohorts" in site administration And I should see "Cohort One" And I click on "Edit" "link" in the "//table[@id='cohorts']//tr[1]//td[6]" "xpath_element" And I should see "Edit cohort" diff --git a/context/course/tests/behat/enable_course.feature b/context/course/tests/behat/enable_course.feature index 5745729..2188fb5 100644 --- a/context/course/tests/behat/enable_course.feature +++ b/context/course/tests/behat/enable_course.feature @@ -16,14 +16,14 @@ Feature: Enable course context plugin | user | course | role | | teacher1 | C1 | editingteacher | And I log in as "admin" - And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata" + And I navigate to "Plugins > Local plugins > Metadata" in site administration And I set the field "id_s_metadatacontext_course_metadataenabled" to "1" And I press "Save changes" Then the field "s_metadatacontext_course_metadataenabled" matches value "1" - And I navigate to "Courses" node in "Site administration" + And I navigate to "Courses" in site administration Then I should see "Course metadata" - And I navigate to "Course metadata" node in "Site administration > Courses" + And I navigate to "Courses > Course metadata" in site administration Then I should see "Course metadata" And I should see "Create a new profile field:" And I should see "Create a new profile category" diff --git a/context/group/tests/behat/enable_group.feature b/context/group/tests/behat/enable_group.feature index 5ad3452..23d5645 100644 --- a/context/group/tests/behat/enable_group.feature +++ b/context/group/tests/behat/enable_group.feature @@ -19,14 +19,14 @@ Feature: Enable group context plugin | user | course | role | | teacher1 | C1 | editingteacher | And I log in as "admin" - And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata" + And I navigate to "Plugins > Local plugins > Metadata" in site administration And I set the field "id_s_metadatacontext_group_metadataenabled" to "1" And I press "Save changes" Then the field "s_metadatacontext_group_metadataenabled" matches value "1" - And I navigate to "Courses" node in "Site administration" + And I navigate to "Courses" in site administration Then I should see "Group metadata" - And I navigate to "Group metadata" node in "Site administration > Courses" + And I navigate to "Courses > Group metadata" in site administration Then I should see "Group metadata" And I should see "Create a new profile field:" And I should see "Create a new profile category" @@ -49,7 +49,7 @@ Feature: Enable group context plugin And I am on "Course 1" course homepage And I turn editing mode on - And I navigate to "Groups" node in "Course administration > Users" + And I navigate to "Users > Groups" in current page administration And I set the field "Groups" to "Group A" And I press "Edit group settings" And I add the "Administration" block diff --git a/context/module/tests/behat/enable_module.feature b/context/module/tests/behat/enable_module.feature index 8724f9c..fb7e610 100644 --- a/context/module/tests/behat/enable_module.feature +++ b/context/module/tests/behat/enable_module.feature @@ -19,14 +19,14 @@ Feature: Enable module context plugin | user | course | role | | teacher1 | C1 | editingteacher | And I log in as "admin" - And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata" + And I navigate to "Plugins > Local plugins > Metadata" in site administration And I set the field "id_s_metadatacontext_module_metadataenabled" to "1" And I press "Save changes" Then the field "s_metadatacontext_module_metadataenabled" matches value "1" - And I navigate to "Plugins" node in "Site administration" + And I navigate to "Plugins" in site administration Then I should see "Module metadata" - And I navigate to "Module metadata" node in "Site administration > Plugins" + And I navigate to "Plugins > Module metadata" in site administration Then I should see "Module metadata" And I should see "Create a new profile field:" And I should see "Create a new profile category" diff --git a/context/user/tests/behat/enable_user.feature b/context/user/tests/behat/enable_user.feature index a4680fb..6510527 100644 --- a/context/user/tests/behat/enable_user.feature +++ b/context/user/tests/behat/enable_user.feature @@ -16,14 +16,14 @@ Feature: Enable user context plugin | user | course | role | | teacher1 | C1 | editingteacher | And I log in as "admin" - And I navigate to "Settings" node in "Site administration > Plugins > Local plugins > Metadata" + And I navigate to "Plugins > Local plugins > Metadata" in site administration And I set the field "id_s_metadatacontext_user_metadataenabled" to "1" And I press "Save changes" Then the field "s_metadatacontext_user_metadataenabled" matches value "1" - And I navigate to "Users" node in "Site administration" + And I navigate to "Users" in site administration Then I should see "User metadata" - And I navigate to "User metadata" node in "Site administration > Users" + And I navigate to "Users > User metadata" in site administration Then I should see "User metadata" And I should see "Create a new profile field:" And I should see "Create a new profile category" @@ -35,7 +35,7 @@ Feature: Enable user context plugin Then I should see "User metadata" And I should see "I accept the site policy" - And I navigate to "Browse list of users" node in "Site administration > Users > Accounts" + And I navigate to "Users > Accounts > Browse list of users" in site administration And I follow "Teacher 1" Then I should see "Metadata" And I should see "I accept the site policy" diff --git a/version.php b/version.php index 2e77325..20be28c 100644 --- a/version.php +++ b/version.php @@ -22,8 +22,8 @@ */ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2017070104; -$plugin->release = 'BETA3.3.4 (Build 2018062800)'; -$plugin->maturity = MATURITY_BETA; +$plugin->version = 2018120100; +$plugin->release = '3.6.0 (Build 2018120300)'; +$plugin->maturity = MATURITY_STABLE; $plugin->requires = 2016052300; // Moodle 3.1 release and upwards. $plugin->component = 'local_metadata'; \ No newline at end of file