diff --git a/CHANGES.md b/CHANGES.md index 8384652d5cd..bb85efdf095 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,10 @@ moodle-theme_boost_union Changes ------- +### Unreleased + +* 2024-10-14 - Test: Change tests/fixtures/*.jpg to tests/fixtures/*.png to prevent resizing issues with JPG images + ### v4.4-r2 * 2024-10-09 - Bugfix: Course category breadcrumbs were broken on the course enrolment page due to MDL-80974 and were removed, resolves #727. diff --git a/templates/advertisementtiles.mustache b/templates/advertisementtiles.mustache index 804a26169f5..64b0af01afb 100644 --- a/templates/advertisementtiles.mustache +++ b/templates/advertisementtiles.mustache @@ -57,7 +57,7 @@ { "title": "", "content": "This text is shown in light font color", - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg1.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg1.png", "linktitle": "", "link": "", "no": 3, diff --git a/templates/settings-additionalresources-filelist.mustache b/templates/settings-additionalresources-filelist.mustache index 30f79d4d30d..94b2253e338 100644 --- a/templates/settings-additionalresources-filelist.mustache +++ b/templates/settings-additionalresources-filelist.mustache @@ -26,12 +26,12 @@ { "files": [ { - "fileicon": "Image (JPEG)", + "fileicon": "Image (PNG)", "filename": "foo.jpg", - "filetype": "image/jpeg", + "filetype": "image/png", "filesize": "38.5 KB", - "fileurlpersistent": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/0/foo.jpg", - "fileurlrevisioned": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/1666077095/foo.jpg" + "fileurlpersistent": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/0/foo.png", + "fileurlrevisioned": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/1666077095/foo.png" } ] } diff --git a/templates/settings-customfonts-filelist.mustache b/templates/settings-customfonts-filelist.mustache index 51a03a9f448..e9b23699b36 100644 --- a/templates/settings-customfonts-filelist.mustache +++ b/templates/settings-customfonts-filelist.mustache @@ -26,12 +26,12 @@ { "files": [ { - "fileicon": "Image (JPEG)", - "filename": "foo.jpg", - "filetype": "image/jpeg", + "fileicon": "Image (+####)", + "filename": "foo.png", + "filetype": "image/png", "filesize": "38.5 KB", - "fileurlpersistent": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/0/foo.jpg", - "fileurlrevisioned": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/1666077095/foo.jpg" + "fileurlpersistent": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/0/foo.png", + "fileurlrevisioned": "http://localhost/pluginfile.php/1/theme_boost_union/additionalresources/1666077095/foo.png" } ] } diff --git a/templates/slider.mustache b/templates/slider.mustache index 3cc2214c826..c79432e5de2 100644 --- a/templates/slider.mustache +++ b/templates/slider.mustache @@ -61,7 +61,7 @@ }, "slides": [ { - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg1.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg1.png", "backgroundimagealt": "The background image 1", "captionorcontent": true, "caption": "The caption 1", @@ -77,7 +77,7 @@ "slideto": 0 }, { - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg2.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg2.png", "backgroundimagealt": "The background image 2", "captionorcontent": true, "caption": "The caption 2", @@ -93,7 +93,7 @@ "slideto": 1 }, { - "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg3.jpg", + "backgroundimageurl": "https://raw.githubusercontent.com/moodle-an-hochschulen/moodle-theme_boost_union/main/tests/fixtures/login_bg3.png", "backgroundimagealt": "The background image 3", "captionorcontent": true, "caption": "The caption 3", diff --git a/tests/behat/theme_boost_union_contentsettings_advertisementtiles.feature b/tests/behat/theme_boost_union_contentsettings_advertisementtiles.feature index cc0fa47616f..752af628273 100644 --- a/tests/behat/theme_boost_union_contentsettings_advertisementtiles.feature +++ b/tests/behat/theme_boost_union_contentsettings_advertisementtiles.feature @@ -188,7 +188,7 @@ Feature: Configuring the theme_boost_union plugin for the "Advertisement tiles" And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Advertisement tiles" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Advertisement tile 1 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Advertisement tile 1 background image" filemanager And I press "Save changes" And I am on site homepage And Behat debugging is enabled @@ -197,7 +197,7 @@ Feature: Configuring the theme_boost_union plugin for the "Advertisement tiles" And I follow "Log in" And I log in as "teacher1" And I am on site homepage - Then "//div[@id='themeboostunionadvtile1']/*[1][contains(@style, 'pluginfile.php/1/theme_boost_union/tilebackgroundimage1/0/login_bg1.jpg')]" "xpath_element" should exist + Then "//div[@id='themeboostunionadvtile1']/*[1][contains(@style, 'pluginfile.php/1/theme_boost_union/tilebackgroundimage1/0/login_bg1.png')]" "xpath_element" should exist And "//div[@id='themeboostunionadvtile2']/*[1][contains(@style, 'pluginfile.php')]" "xpath_element" should not exist Scenario Outline: Setting: Advertisement tiles - Define the tile (min-)height. @@ -227,7 +227,7 @@ Feature: Configuring the theme_boost_union plugin for the "Advertisement tiles" And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Advertisement tiles" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Advertisement tile 1 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Advertisement tile 1 background image" filemanager And I press "Save changes" And I am on site homepage And Behat debugging is enabled diff --git a/tests/behat/theme_boost_union_contentsettings_slider.feature b/tests/behat/theme_boost_union_contentsettings_slider.feature index 6dcb97daacf..483cad3fa95 100644 --- a/tests/behat/theme_boost_union_contentsettings_slider.feature +++ b/tests/behat/theme_boost_union_contentsettings_slider.feature @@ -18,7 +18,7 @@ Feature: Configuring the theme_boost_union plugin for the "Slider" tab on the "C And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 1 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 1 background image" filemanager And I press "Save changes" And I am on site homepage And Behat debugging is enabled @@ -194,7 +194,7 @@ Feature: Configuring the theme_boost_union plugin for the "Slider" tab on the "C When I log in as "teacher1" And I am on site homepage Then "#themeboostunionslide1 > img" "css_element" should exist - And the "src" attribute of "#themeboostunionslide1 > img" "css_element" should contain "pluginfile.php/1/theme_boost_union/slidebackgroundimage1/0/login_bg1.jpg" + And the "src" attribute of "#themeboostunionslide1 > img" "css_element" should contain "pluginfile.php/1/theme_boost_union/slidebackgroundimage1/0/login_bg1.png" And the "alt" attribute of "#themeboostunionslide1 > img" "css_element" should contain "This is the image description" Scenario: Setting: Slider - Display an individual slide only if an image is uploaded @@ -262,16 +262,16 @@ Feature: Configuring the theme_boost_union plugin for the "Slider" tab on the "C And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 2 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 2 background image" filemanager # For a strange reason, Behat fails if we upload all images at once. So we simply save the form after each upload. And I press "Save changes" And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 3 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 3 background image" filemanager And I press "Save changes" And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 4 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 4 background image" filemanager And I press "Save changes" And I am on site homepage And Behat debugging is enabled @@ -323,16 +323,16 @@ Feature: Configuring the theme_boost_union plugin for the "Slider" tab on the "C And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 2 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 2 background image" filemanager # For a strange reason, Behat fails if we upload all images at once. So we simply save the form after each upload. And I press "Save changes" And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 4 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 4 background image" filemanager And I press "Save changes" And I navigate to "Appearance > Boost Union > Content" in site administration And I click on "Slider" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Slide 6 background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Slide 6 background image" filemanager And I press "Save changes" And I am on site homepage And Behat debugging is enabled diff --git a/tests/behat/theme_boost_union_looksettings_course.feature b/tests/behat/theme_boost_union_looksettings_course.feature index 8f2c3f89560..9d2cbdfcd65 100644 --- a/tests/behat/theme_boost_union_looksettings_course.feature +++ b/tests/behat/theme_boost_union_looksettings_course.feature @@ -28,7 +28,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L When I log in as "teacher1" And I am on "Course 1" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on site homepage And I log out @@ -37,7 +37,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And I log in as "" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.jpg')]" "xpath_element" should exist + And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.png')]" "xpath_element" should exist Examples: | role | @@ -66,7 +66,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L When I log in as "teacher1" And I am on "Course 1" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on site homepage And I log out @@ -90,7 +90,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Course" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg2.jpg" file to "Fallback course header image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg2.png" file to "Fallback course header image" filemanager And I press "Save changes" And Behat debugging is enabled And I am on site homepage @@ -100,7 +100,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And I log in as "" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '1/theme_boost_union/courseheaderimagefallback/0/login_bg2.jpg')]" "xpath_element" should exist + And "//div[@id='courseheaderimage' and contains(@style, '1/theme_boost_union/courseheaderimagefallback/0/login_bg2.png')]" "xpath_element" should exist Examples: | role | @@ -116,7 +116,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Course" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg2.jpg" file to "Fallback course header image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg2.png" file to "Fallback course header image" filemanager And I press "Save changes" And Behat debugging is enabled And I am on site homepage @@ -126,9 +126,9 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And I log in as "teacher1" And I am on "Course 1" course homepage And "//div[@id='courseheaderimage']" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '1/theme_boost_union/courseheaderimagefallback/0/login_bg2.jpg')]" "xpath_element" should exist + And "//div[@id='courseheaderimage' and contains(@style, '1/theme_boost_union/courseheaderimagefallback/0/login_bg2.png')]" "xpath_element" should exist And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on site homepage And I log out @@ -137,8 +137,8 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And I log in as "" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '1/theme_boost_union/courseheaderimagefallback/0/login_bg2.jpg')]" "xpath_element" should not exist - And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.jpg')]" "xpath_element" should exist + And "//div[@id='courseheaderimage' and contains(@style, '1/theme_boost_union/courseheaderimagefallback/0/login_bg2.png')]" "xpath_element" should not exist + And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.png')]" "xpath_element" should exist Examples: | role | @@ -153,11 +153,11 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L When I log in as "teacher1" And I am on "Course 1" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on "Course 2" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg2.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg2.png" file to "Course image" filemanager And I press "Save and display" And I am on site homepage And I log out @@ -166,12 +166,12 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L And I log in as "" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.jpg')]" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg2.jpg')]" "xpath_element" should not exist + And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.png')]" "xpath_element" should exist + And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg2.png')]" "xpath_element" should not exist And I am on "Course 2" course homepage And "//div[@id='courseheaderimage']" "xpath_element" should exist - And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.jpg')]" "xpath_element" should not exist - And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg2.jpg')]" "xpath_element" should exist + And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg1.png')]" "xpath_element" should not exist + And "//div[@id='courseheaderimage' and contains(@style, '/course/overviewfiles/login_bg2.png')]" "xpath_element" should exist Examples: | role | @@ -187,7 +187,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L When I log in as "teacher1" And I am on "Course 1" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist @@ -208,7 +208,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L When I log in as "teacher1" And I am on "Course 1" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist @@ -229,7 +229,7 @@ Feature: Configuring the theme_boost_union plugin for the "Course" tab on the "L When I log in as "teacher1" And I am on "Course 1" course homepage And I click on "Settings" "link" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Course image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Course image" filemanager And I press "Save and display" And I am on "Course 1" course homepage Then "//div[@id='courseheaderimage']" "xpath_element" should exist diff --git a/tests/behat/theme_boost_union_looksettings_loginpage.feature b/tests/behat/theme_boost_union_looksettings_loginpage.feature index 06b07f179f3..7a33d8220fe 100644 --- a/tests/behat/theme_boost_union_looksettings_loginpage.feature +++ b/tests/behat/theme_boost_union_looksettings_loginpage.feature @@ -17,7 +17,7 @@ Feature: Configuring the theme_boost_union plugin for the "Login page" tab on th And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Login page" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Login page background images" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Login page background images" filemanager And I press "Save changes" And Behat debugging is enabled And I log out @@ -32,9 +32,9 @@ Feature: Configuring the theme_boost_union plugin for the "Login page" tab on th And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Login page" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Login page background images" filemanager - And I upload "theme/boost_union/tests/fixtures/login_bg2.jpg" file to "Login page background images" filemanager - And I upload "theme/boost_union/tests/fixtures/login_bg3.jpg" file to "Login page background images" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Login page background images" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg2.png" file to "Login page background images" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg3.png" file to "Login page background images" filemanager And I press "Save changes" And Behat debugging is enabled And I log out @@ -55,7 +55,7 @@ Feature: Configuring the theme_boost_union plugin for the "Login page" tab on th And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Login page" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Login page background images" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Login page background images" filemanager And I press "Save changes" And Behat debugging is enabled And I log out @@ -74,8 +74,8 @@ Feature: Configuring the theme_boost_union plugin for the "Login page" tab on th And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Login page" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Login page background images" filemanager - And I set the field "Display text for login background images" to "login_bg1.jpg|Copyright by SplitShire on pexels.com|dark" + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Login page background images" filemanager + And I set the field "Display text for login background images" to "login_bg1.png|Copyright by SplitShire on pexels.com|dark" And I press "Save changes" And Behat debugging is enabled And I log out @@ -88,8 +88,8 @@ Feature: Configuring the theme_boost_union plugin for the "Login page" tab on th And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Login page" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Login page background images" filemanager - And I set the field "Display text for login background images" to ".jpg|Copyright by SplitShire on pexels.com|dark" + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Login page background images" filemanager + And I set the field "Display text for login background images" to ".png|Copyright by SplitShire on pexels.com|dark" And I press "Save changes" And Behat debugging is enabled And I log out @@ -107,8 +107,8 @@ Feature: Configuring the theme_boost_union plugin for the "Login page" tab on th And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Login page" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Login page background images" filemanager - And I set the field "Display text for login background images" to "login_bg1.jpg|Copyright by SplitShire on pexels.com|" + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Login page background images" filemanager + And I set the field "Display text for login background images" to "login_bg1.png|Copyright by SplitShire on pexels.com|" And I press "Save changes" And Behat debugging is enabled And I log out diff --git a/tests/behat/theme_boost_union_looksettings_resources.feature b/tests/behat/theme_boost_union_looksettings_resources.feature index 241622e3682..b05da55d677 100644 --- a/tests/behat/theme_boost_union_looksettings_resources.feature +++ b/tests/behat/theme_boost_union_looksettings_resources.feature @@ -10,18 +10,18 @@ Feature: Configuring the theme_boost_union plugin for the "Resources" tab on the And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Resources" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Additional resources" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Additional resources" filemanager And I press "Save changes" And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Resources" "link" in the "#adminsettings .nav-tabs" "css_element" Then I should see "Additional resources list" And ".settings-additionalresources-filelist" "css_element" should exist - And ".settings-additionalresources-filelist .list-group-item .icon[title='Image (JPEG)']" "css_element" should exist + And ".settings-additionalresources-filelist .list-group-item .icon[title='Image (PNG)']" "css_element" should exist And ".settings-additionalresources-filelist .list-group-item .icon[src$='/f/image']" "css_element" should exist - And I should see "MIME type: image/jpeg" in the ".settings-additionalresources-filelist" "css_element" - And I should see "Size: 38.5" in the ".settings-additionalresources-filelist" "css_element" + And I should see "MIME type: image/png" in the ".settings-additionalresources-filelist" "css_element" + And I should see "Size: 205.4" in the ".settings-additionalresources-filelist" "css_element" And I should see "URL (persistent):" in the ".settings-additionalresources-filelist" "css_element" - And I should see "/pluginfile.php/1/theme_boost_union/additionalresources/0/login_bg1.jpg" in the ".settings-additionalresources-filelist" "css_element" + And I should see "/pluginfile.php/1/theme_boost_union/additionalresources/0/login_bg1.png" in the ".settings-additionalresources-filelist" "css_element" And I should see "URL (revisioned):" in the ".settings-additionalresources-filelist" "css_element" # Checking the revisioned URL is not possible currently with Behat without writing a custom step. We accept this for now. And Behat debugging is enabled diff --git a/tests/behat/theme_boost_union_looksettings_sitebranding.feature b/tests/behat/theme_boost_union_looksettings_sitebranding.feature index 12a91169895..18e98cd0779 100644 --- a/tests/behat/theme_boost_union_looksettings_sitebranding.feature +++ b/tests/behat/theme_boost_union_looksettings_sitebranding.feature @@ -161,7 +161,7 @@ Feature: Configuring the theme_boost_union plugin for the "Site branding" tab on And Behat debugging is disabled And I navigate to "Appearance > Boost Union > Look" in site administration And I click on "Site branding" "link" in the "#adminsettings .nav-tabs" "css_element" - And I upload "theme/boost_union/tests/fixtures/login_bg1.jpg" file to "Background image" filemanager + And I upload "theme/boost_union/tests/fixtures/login_bg1.png" file to "Background image" filemanager And I press "Save changes" And Behat debugging is enabled And I am on site homepage diff --git a/tests/behat/theme_boost_union_smartmenusettings_menuitems_presentation.feature b/tests/behat/theme_boost_union_smartmenusettings_menuitems_presentation.feature index 7f801658ff9..6871c9895f5 100644 --- a/tests/behat/theme_boost_union_smartmenusettings_menuitems_presentation.feature +++ b/tests/behat/theme_boost_union_smartmenusettings_menuitems_presentation.feature @@ -297,10 +297,10 @@ Feature: Configuring the theme_boost_union plugin on the "Smart menus" page, app Then DOM element ".boost-union-menubar .dropdown-menu.show .content-block" should have computed style "background-color" "rgb(3, 31, 195)" And I click on ".action-edit" "css_element" in the "Resources" "table_row" And I expand all fieldsets - And I upload "theme/boost_union/tests/fixtures/backimg.jpg" file to "Card image" filemanager + And I upload "theme/boost_union/tests/fixtures/backimg.png" file to "Card image" filemanager And I click on "Save changes" "button" Then I should see smart menu "Quick links" item "Resources" in location "Main, Menu" - And the image at "//div[contains(@class, 'primary-navigation')]//img[contains(@src, 'pluginfile.php') and contains(@src, '/theme_boost_union/smartmenus_itemimage/')]" "xpath_element" should be identical to "theme/boost_union/tests/fixtures/backimg.jpg" + And the image at "//div[contains(@class, 'primary-navigation')]//img[contains(@src, 'pluginfile.php') and contains(@src, '/theme_boost_union/smartmenus_itemimage/')]" "xpath_element" should be identical to "theme/boost_union/tests/fixtures/backimg.png" @javascript Scenario: Smartmenu: Menu items: Presentation - Add a smart menu item with multilang tags diff --git a/tests/fixtures/backimg.jpg b/tests/fixtures/backimg.jpg deleted file mode 100644 index 8575322cb23..00000000000 Binary files a/tests/fixtures/backimg.jpg and /dev/null differ diff --git a/tests/fixtures/backimg.png b/tests/fixtures/backimg.png new file mode 100644 index 00000000000..6d2c2ecf3ca Binary files /dev/null and b/tests/fixtures/backimg.png differ diff --git a/tests/fixtures/login_bg1.jpg b/tests/fixtures/login_bg1.jpg deleted file mode 100644 index 7082377f13a..00000000000 Binary files a/tests/fixtures/login_bg1.jpg and /dev/null differ diff --git a/tests/fixtures/login_bg1.png b/tests/fixtures/login_bg1.png new file mode 100644 index 00000000000..f8eb85671f6 Binary files /dev/null and b/tests/fixtures/login_bg1.png differ diff --git a/tests/fixtures/login_bg2.jpg b/tests/fixtures/login_bg2.jpg deleted file mode 100644 index 7082377f13a..00000000000 Binary files a/tests/fixtures/login_bg2.jpg and /dev/null differ diff --git a/tests/fixtures/login_bg2.png b/tests/fixtures/login_bg2.png new file mode 100644 index 00000000000..f8eb85671f6 Binary files /dev/null and b/tests/fixtures/login_bg2.png differ diff --git a/tests/fixtures/login_bg3.jpg b/tests/fixtures/login_bg3.jpg deleted file mode 100644 index 7082377f13a..00000000000 Binary files a/tests/fixtures/login_bg3.jpg and /dev/null differ diff --git a/tests/fixtures/login_bg3.png b/tests/fixtures/login_bg3.png new file mode 100644 index 00000000000..f8eb85671f6 Binary files /dev/null and b/tests/fixtures/login_bg3.png differ