MDL-69863 behat: Scenario tidy up

Author: andrewnicols

blocks/accessreview/tests/behat/accessreview.feature

@@ -3,24 +3,28 @@ Feature: Block accessreview
   In order to overview accessibility information on my course
   As a manager
   I can add the accessreview block in a course
+
   Background:
     Given the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1        | topics |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
+
   Scenario: View accessreview block on a course
-    Given I add the "Accessibility Review" block
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    When I add the "Accessibility Review" block
     Then I should see "Accessibility Review"
     And I should see "No accessibility results data was found."
+
   Scenario: Hide/show accessreview view
-    Given I add the "Accessibility Review" block
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    When I add the "Accessibility Review" block
     Then I should see "Accessibility Review"
     And I should see "No accessibility results data was found."
     And I click on "Actions menu" "icon" in the "Accessibility Review" "block"
     And I follow "Hide Accessibility Review block"
-    Then I should not see "No accessibility results data was found."
+    And I should not see "No accessibility results data was found."
     And I click on "Actions menu" "icon" in the "Accessibility Review" "block"
     And I follow "Show Accessibility Review block"
-    Then I should see "No accessibility results data was found."
-    
+    And I should see "No accessibility results data was found."

blocks/accessreview/tests/behat/accessreview_results.feature

@@ -3,19 +3,21 @@ Feature: Block accessreview results
   In order to overview accessibility information on my course
   As a manager
   I can add the accessreview block in a course after running the scheduled task
+
   Background:
-    Given I log in as "admin"
-    And the following "courses" exist:
+    Given the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1        | topics |
     And the following "activities" exist:
       | activity | name      | intro                     | course | idnumber |
       | label    | Label one | <b>Bold text is bold.</b> | C1     | id001    |
     And I run the scheduled task "\tool_brickfield\task\bulk_process_courses"
+
+  Scenario: View accessreview block results on a course
+    Given I log in as "admin"
     And I am on "Course 1" course homepage with editing mode on
-    And I add the "Accessibility Review" block
+    When I add the "Accessibility Review" block
     Then I should see "Accessibility Review"
-  Scenario: View accessreview block results on a course
     And I should not see "No accessibility results data was found."
     And I should see "Image"
     And I should see "Layout"
@@ -25,8 +27,12 @@ Feature: Block accessreview results
     And I should see "Text"
     And I should see "View"
     And I should see "Toggle highlighting"
+
   Scenario: Toggle highlighting on/off
-    And I should see "Toggle highlighting"
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    When I add the "Accessibility Review" block
+    Then I should see "Toggle highlighting"
     And ".block_accessreview_view" "css_element" should be visible
-    When I click on "Toggle highlighting" "text"
-    Then ".block_accessreview_view" "css_element" should not be visible
+    And I click on "Toggle highlighting" "text"
+    And ".block_accessreview_view" "css_element" should not be visible