From c4af869ffe777618da14b9b81dea9db73d3dde5a Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 11 Oct 2021 13:05:09 +0800 Subject: [PATCH] MDL-71965 theme: Address behat failures * The helplink has changed so the language customisation check had to be updated to use a different selector. * The totop string has been moved from boost to classic only and the string must be moved too. * The new footer toggle may sit over the [next page] button for the timeline block for some browsers (Linux only). Changing the browser size to large resolves this. AMOS BEGIN CPY [totop,boost],[totop,classic] AMOS END --- .../tests/behat/customisation_create.feature | 10 ++++++---- .../timeline/tests/behat/block_timeline_dates.feature | 1 + theme/classic/lang/en/theme_classic.php | 3 ++- theme/classic/templates/footer.mustache | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/admin/tool/customlang/tests/behat/customisation_create.feature b/admin/tool/customlang/tests/behat/customisation_create.feature index a473c0c58fbb9..a2c7d62827bfb 100644 --- a/admin/tool/customlang/tests/behat/customisation_create.feature +++ b/admin/tool/customlang/tests/behat/customisation_create.feature @@ -21,13 +21,15 @@ Feature: Within a moodle instance, an administrator should be able to modify lan @javascript Scenario: Edit an string but don't save it to lang pack. When I press "Apply changes and continue editing" - Then I should see "Help and documentation" in the ".helplink" "css_element" - And I should not see "moodle documents" in the ".helplink" "css_element" + And I click on "Show footer" "button" + Then I should not see "moodle documents" in the "page-footer" "region" + And I should see "Help and documentation" in the "page-footer" "region" @javascript Scenario: Customize an string as admin and save it to lang pack. Given I press "Save changes to the language pack" And I should see "There are 1 modified strings." When I click on "Continue" "button" - Then I should see "moodle documents" in the ".helplink" "css_element" - And I should not see "Help and documentation" in the ".helplink" "css_element" + And I click on "Show footer" "button" + Then I should not see "Help and documentation" in the "page-footer" "region" + And I should see "moodle documents" in the "page-footer" "region" diff --git a/blocks/timeline/tests/behat/block_timeline_dates.feature b/blocks/timeline/tests/behat/block_timeline_dates.feature index 3e7810f66e931..bac375e83fd2a 100644 --- a/blocks/timeline/tests/behat/block_timeline_dates.feature +++ b/blocks/timeline/tests/behat/block_timeline_dates.feature @@ -30,6 +30,7 @@ Feature: The timeline block allows users to see upcoming activities | student1 | C1 | student | | student1 | C2 | student | | student1 | C3 | student | + And I change window size to "large" Scenario: Next 7 days in date view Given I log in as "student1" diff --git a/theme/classic/lang/en/theme_classic.php b/theme/classic/lang/en/theme_classic.php index e6f2da470cb85..5e43c4617825e 100644 --- a/theme/classic/lang/en/theme_classic.php +++ b/theme/classic/lang/en/theme_classic.php @@ -35,7 +35,8 @@ $string['presetfiles_desc'] = 'Preset files can be used to dramatically alter the appearance of the theme. See Boost presets for information on creating and sharing your own preset files, and see the Presets repository for presets that others have shared.'; $string['preset'] = 'Theme preset'; $string['preset_desc'] = 'Pick a preset to broadly change the look of the theme.'; +$string['privacy:metadata'] = 'The Classic theme does not store any personal data.'; $string['region-side-post'] = 'Right'; $string['region-side-pre'] = 'Left'; $string['sitetitle'] = 'Site title'; -$string['privacy:metadata'] = 'The Classic theme does not store any personal data.'; \ No newline at end of file +$string['totop'] = 'Go to top'; diff --git a/theme/classic/templates/footer.mustache b/theme/classic/templates/footer.mustache index 5bee4dffddf2f..4386580493479 100644 --- a/theme/classic/templates/footer.mustache +++ b/theme/classic/templates/footer.mustache @@ -29,7 +29,7 @@ }}