Merge branch '2.2' into 2

code/Forms/EditorEmailLinkFormFactory.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Admin\Forms;
 
+use SilverStripe\Forms\EmailField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\RequiredFields;
@@ -11,7 +12,7 @@ class EditorEmailLinkFormFactory extends LinkFormFactory
     protected function getFormFields($controller, $name, $context)
     {
         $fields = FieldList::create([
-            TextField::create(
+            EmailField::create(
                 'Link',
                 _t(__CLASS__.'.EMAIL', 'Email address')
             ),

tests/behat/features/manage-groups.feature

@@ -34,13 +34,6 @@ Feature: Manage groups
     And I press the "Create" button
     Then I should see "Validation Error"
 
-  Scenario: Members of a group with permissions
-    Given I go to "/Security/login"
-    And I press the "Log in as someone else" button
-    And I am logged in as a member of "BOB" group
-    When I go to "/my-page?stage=Stage"
-    Then I should not see "My page"
-
   Scenario: Members of a group with permissions can edit Group data
     Given I go to "/Security/login"
     And I press the "Log in as someone else" button
@@ -68,13 +61,6 @@ Feature: Manage groups
     And I click "Users" in the ".breadcrumbs-wrapper" element
     And I should see "General Editor"
 
-  Scenario: Members of a group with permissions cannot view draft content
-    Given I go to "/Security/login"
-    And I press the "Log in as someone else" button
-    And I am logged in as a member of "BOB" group
-    When I go to "/my-page?stage=Stage"
-    Then I should not see "My page"
-
   Scenario: Members of a group without permissions cannot view draft content
     Given I go to "/Security/login"
     And I press the "Log in as someone else" button

tests/behat/features/manage-roles.feature

@@ -0,0 +1,43 @@
+@javascript @retry
+Feature: Manage Roles
+  As a site administrator
+  I want to create and manage group roles on my site
+  So that I can control access to the CMS
+
+  Background:
+    Given a "group" "Jane"
+    And the "role" "This role is just another role"
+    And the "role" "View draft content" has permissions "View draft content"
+    And the "page" "My page"
+    And I am logged in with "ADMIN" permissions
+    And I go to "/admin/security"
+
+  Scenario: I can create a new role with permissions
+    When I click the "Roles" CMS tab
+    And I press the "Add Role" button
+    And I fill in "Title" with "MyRole"
+    And I check "View draft content"
+    And I press the "Create" button
+    Then I should not see "Validation Error"
+    And the "View draft content" checkbox should be checked
+
+  Scenario: Manage roles link works correctly
+    When I click the "Groups" CMS tab
+    And I click "Jane" in the "#Form_EditForm_groups" element
+    And I click the "Roles" CMS tab
+    And I click "Manage roles" in the "#Root_Roles" element
+    Then I should see "Add Role"
+    And I should see "This role is just another role"
+
+  Scenario: Members of a group with role permissions can view draft content
+    When I click the "Groups" CMS tab
+    And I click "Jane" in the "#Form_EditForm_groups" element
+    And I click the "Roles" CMS tab
+    And I select "View draft content" from "Roles[]"
+    And I press the "Save" button
+    Then I should not see "Validation Error"
+    Given I go to "/Security/login"
+    And I press the "Log in as someone else" button
+    And I am logged in as a member of "Jane" group
+    When I go to "/my-page?stage=Stage"
+    Then I should see "My page"