Merge branch '4.2' into 4

composer.json

@@ -18,9 +18,6 @@
     "require-dev": {
         "silverstripe/recipe-testing": "^3",
         "squizlabs/php_codesniffer": "^3",
-        "silverstripe/widgets": "^3",
-        "silverstripe/comments": "^4",
-        "silverstripe/content-widget": "^3",
         "silverstripe/standards": "^1",
         "phpstan/extension-installer": "^1.3"
     },
@@ -44,10 +41,6 @@
             "email": "[email protected]"
         }
     ],
-    "suggest": {
-        "silverstripe/widgets": "Some widgets come with the blog which are compatible with the widgets module.",
-        "silverstripe/comments": "This module adds comments to your blog."
-    },
     "scripts": {
         "lint": "vendor/bin/phpcs src/ tests/",
         "lint-clean": "vendor/bin/phpcbf src/ tests/"

tests/behat/features/blog.feature

@@ -4,8 +4,6 @@ Feature: Create a blog
 
   Background:
     Given the "group" "EDITOR" has permissions "CMS_ACCESS_CMSMain"
-    And I add an extension "SilverStripe\Widgets\Extensions\WidgetPageExtension" to the "Page" class
-    And I add an extension "SilverStripe\Comments\Extensions\CommentsExtension" to the "Page" class
 
     And an "image" "Uploads/file1.jpg"
     And I am logged in as a member of "EDITOR" group
@@ -16,18 +14,6 @@ Feature: Create a blog
     And I select the "Blog" radio button
     And I press the "Create" button
 
-    # Add widgets
-    And I click the "Widgets" CMS tab
-    And I uncheck "Inherit Sidebar From Parent"
-    And I add the "Content" widget
-    And I add the "Archive" widget
-    And I add the "Blog Tags" widget
-    And I fill in the "Content" widget field "Title" with "My content widget title"
-    And I fill in the "Content" widget HTML field "Content" with "<p>Content widget content</p>"
-    And I fill in the "Archive" widget field "Title" with "My archive widget title"
-    And I fill in the "Blog Tags" widget field "Title" with "My blog tags widget title"
-    And I press the "Save" button
-
     # Logout
     And I go to "/Security/login"
     And I press the "Log in as someone else" button
@@ -78,11 +64,6 @@ Feature: Create a blog
     Then I should see "New Blog"
     And I should see "New Post"
 
-    # Widgets
-    And I should see "My content widget title"
-    And the rendered HTML should contain "<p>Content widget content</p>"
-    And I should see "My blog tags widget title"
-
     # Hyperlink to "New Post"
     Then the rendered HTML should contain "href=\"/new-blog/new-post"
 
@@ -99,28 +80,3 @@ Feature: Create a blog
     # Test that blog post shows in tag view
     When I go to "/new-blog/tag/my-tag"
     Then I should see "New Post"
-
-    # Commenting
-    When I click "New Post" in the ".post-summary" element
-    Then I should see "New Post"
-    When I fill in "Your name" with "My Name"
-    And I fill in "Email" with "[email protected]"
-    And I fill in "Comments" with "My comments"
-    When I press the "Post" button
-    Then I should see "New Post"
-
-    # Commenting is bizarly not working in behat, even though it works during manual testing on my local
-    # Moderation
-    # When I am logged in as a member of "EDITOR" group
-    # When I go to "/admin/pages"
-    # And I follow "New Blog"
-    # And I click the "Blog Posts" CMS tab
-    # And I click on the ".ss-gridfield-item" element
-    # And I click the "Comments" CMS tab
-    # Then I should see "New (1)"
-    # When I click the "New (1)" CMS tab
-    # Then I should see "[email protected]"
-    # When I click on the ".action-menu__toggle" element
-    # And I press the "Spam" button
-    # And I wait for 2 seconds
-    # Then I should not see "[email protected]"