Merge pull request #172 from creative-commoners/pulls/4/review-behat-…

…tests

ENH Replace ADMIN permissions with less permissions in Behat test

tests/behat/features/content-reviews.feature

@@ -6,14 +6,17 @@ Feature: Set up reviews
   Background:
     # Note: the review date is deliberately in the past
     Given a "page" "My page" with "Content"="<p>Welcome</p>", "NextReviewDate"="01/01/2017", "ReviewPeriodDays"="1"
-    And the "group" "EDITOR group" has permissions "CMS_ACCESS_LeftAndMain" and "FILE_EDIT_ALL"
-    And the "group" "FILEONLY group" has permissions "FILE_EDIT_ALL"
-    And a "member" "Ed" belonging to "EDITOR group" with "Email"="[email protected]"
-    And a "member" "Phil" belonging to "FILEONLY group" with "Email"="[email protected]"
-    # Login in as EDITOR once https://github.com/silverstripe/silverstripe-contentreview/pull/155 is merged
-    # And I am logged in with "EDITOR" permissions
-    And I am logged in with "ADMIN" permissions
+    And the "group" "ADMIN group" has permissions "Full administrative rights"
+    And the "group" "EDITOR" has permissions "CMS_ACCESS_CMSMain" and "EDIT_CONTENT_REVIEW_FIELDS"
+    And the "group" "AUTHOR" has permissions and  "CMS_ACCESS_LeftAndMain"
+    And the "group" "FILEONLY" has permissions "FILE_EDIT_ALL"
+    And the "group" "CMS_MAIN" has permissions "CMS_ACCESS_CMSMain"
+    And a "member" "Ed" belonging to "AUTHOR" with "Email"="[email protected]"
+    And a "member" "Phil" belonging to "FILEONLY" with "Email"="[email protected]"
+    And a "member" "Anna" belonging to "CMS_MAIN" with "Email"="[email protected]"
+    And I am logged in as a member of "EDITOR" group
     And I go to "admin/pages"
+    And I wait for 1 second
     And I click on "My page" in the tree
     And I click the "Settings" CMS tab
     And I click the "Content review" CMS tab
@@ -24,10 +27,11 @@ Feature: Set up reviews
 
     # Test adding individual member based on them having access to the Pages section fo the CMS
     Then the "#Form_EditForm_OwnerUsers" select element should have an option with an "Ed" label
+    And the "#Form_EditForm_OwnerUsers" select element should have an option with an "Anna" label
     And the "#Form_EditForm_OwnerUsers" select element should not have an option with a "Phil" label
 
     # Test adding groups
-    Then the "#Form_EditForm_OwnerGroups" select element should have an option with an "EDITOR group" label
+    Then the "#Form_EditForm_OwnerGroups" select element should have an option with an "EDITOR" label
 
     # Required to avoid "unsaved changed" browser dialog
     Then I press the "Save" button
@@ -37,7 +41,7 @@ Feature: Set up reviews
     And I wait for 1 second
     Then I should not see the ".content-review__button" element
     When I press the "Save" button
-    And I select "ADMIN group" from "Groups"
+    And I select "EDITOR" from "Groups"
     And I press the "Save" button
     Then I should see the ".content-review__button" element
     When I click on the ".content-review__button" element

tests/behat/features/set-up-reviews.feature

@@ -6,7 +6,8 @@ Feature: Set up reviews
   Background:
     # Note: the review date is deliberately in the past
     Given a "page" "Home" with "Content"="<p>Welcome</p>", "NextReviewDate"="01/01/2017", "ReviewPeriodDays"="1"
-    And I am logged in with "ADMIN" permissions
+    And the "group" "EDITOR" has permissions "CMS_ACCESS_CMSMain" and "EDIT_CONTENT_REVIEW_FIELDS"
+    And I am logged in as a member of "EDITOR" group
     And I go to "admin/pages"
 
   @javascript
@@ -18,7 +19,7 @@ Feature: Set up reviews
     When I click the "Content review" CMS tab
     And I select "Custom settings" from "Options" input group
     And I wait for 1 second
-    And I select "ADMIN group" from "Groups"
+    And I select "EDITOR" from "Groups"
     And I press "Save"
     Then I should see a "Content due for review" button
 
@@ -29,7 +30,7 @@ Feature: Set up reviews
     And I click the "Content review" CMS tab
     And I select "Custom settings" from "Options" input group
     And I wait for 1 seconds
-    And I select "ADMIN group" from "Groups"
+    And I select "EDITOR" from "Groups"
     And I press "Save"
     And I follow "Content due for review"
     And I wait for 3 seconds