MDL-49412 availability: Fix behat failures

Part of MDL-45774

diff --git a/availability/condition/completion/tests/behat/availability_completion.feature b/availability/condition/completion/tests/behat/availability_completion.feature
index b31b7c6..3d95470 100644 (file)
--- a/availability/condition/completion/tests/behat/availability_completion.feature
+++ b/availability/condition/completion/tests/behat/availability_completion.feature
@@ -24,6 +24,7 @@ Feature: availability_completion
   Scenario: Test condition
     # Basic setup.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -50,6 +51,7 @@ Feature: availability_completion
     # Log back in as student.
     When I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # Page 2 should not appear yet.

diff --git a/availability/condition/date/tests/behat/availability_date.feature b/availability/condition/date/tests/behat/availability_date.feature
index d026849..925781d 100644 (file)
--- a/availability/condition/date/tests/behat/availability_date.feature
+++ b/availability/condition/date/tests/behat/availability_date.feature
@@ -23,6 +23,7 @@ Feature: availability_date
   Scenario: Test condition
     # Basic setup.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -56,6 +57,7 @@ Feature: availability_date
     # Log back in as student.
     When I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # Page 1 should appear, but page 2 does not.

diff --git a/availability/condition/grade/tests/behat/availability_grade.feature b/availability/condition/grade/tests/behat/availability_grade.feature
index 01681d7..5014b84 100644 (file)
--- a/availability/condition/grade/tests/behat/availability_grade.feature
+++ b/availability/condition/grade/tests/behat/availability_grade.feature
@@ -23,6 +23,7 @@ Feature: availability_grade
   Scenario: Test condition
     # Basic setup.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -78,6 +79,7 @@ Feature: availability_grade
     # Log in as student without a grade yet.
     When I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # Do the assignment.
@@ -96,6 +98,7 @@ Feature: availability_grade
     # Log back in as teacher.
     When I log out
     And I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # Give the assignment 40%.
@@ -109,6 +112,7 @@ Feature: availability_grade
     # Log back in as student.
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # Check pages are visible.

diff --git a/availability/condition/group/tests/behat/availability_group.feature b/availability/condition/group/tests/behat/availability_group.feature
index d2637d6..d3c2b06 100644 (file)
--- a/availability/condition/group/tests/behat/availability_group.feature
+++ b/availability/condition/group/tests/behat/availability_group.feature
@@ -23,6 +23,7 @@ Feature: availability_group
   Scenario: Test condition
     # Basic setup.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -40,7 +41,7 @@ Feature: availability_group
       | G2       | C1     | GI2      |
     # This step used to be 'And I follow "C1"', but Chrome thinks the breadcrumb
     # is not clickable, so we'll go via the home page instead.
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And I add a "Page" to section "1"
     And I expand all fieldsets
@@ -86,6 +87,7 @@ Feature: availability_group
     # Log back in as student.
     When I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # No pages should appear yet.
@@ -99,6 +101,7 @@ Feature: availability_group
       | student1 | GI1   |
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # P1 (any groups) and P2 should show but not P3.

diff --git a/availability/condition/grouping/tests/behat/availability_grouping.feature b/availability/condition/grouping/tests/behat/availability_grouping.feature
index 6d14604..e33b588 100644 (file)
--- a/availability/condition/grouping/tests/behat/availability_grouping.feature
+++ b/availability/condition/grouping/tests/behat/availability_grouping.feature
@@ -29,6 +29,7 @@ Feature: availability_grouping
   Scenario: Test condition
     # Basic setup.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -42,7 +43,7 @@ Feature: availability_grouping
     # Back to course page but add groups.
     # This step used to be 'And I follow "C1"', but Chrome thinks the breadcrumb
     # is not clickable, so we'll go via the home page instead.
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And the following "groupings" exist:
       | name | course | idnumber |
@@ -91,6 +92,7 @@ Feature: availability_grouping
       | grouping | group  |
       | GXI1     | GI1    |
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # P1 should show but not B2.

diff --git a/availability/condition/profile/tests/behat/availability_profile.feature b/availability/condition/profile/tests/behat/availability_profile.feature
index 720be7d..5a24d0a 100644 (file)
--- a/availability/condition/profile/tests/behat/availability_profile.feature
+++ b/availability/condition/profile/tests/behat/availability_profile.feature
@@ -23,6 +23,7 @@ Feature: availability_profile
   Scenario: Test condition
     # Basic setup.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -57,6 +58,7 @@ Feature: availability_profile
     # Log back in as student.
     When I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # I see P1 but not P2.
@@ -82,7 +84,7 @@ Feature: availability_profile
     And I click on "Update profile" "button"
 
     # Set Page activity which has requirement on this field.
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Page" to section "1"
@@ -109,5 +111,6 @@ Feature: availability_profile
     # Log out and back in as student. Should be able to see activity.
     And I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
     Then I should see "P1" in the "region-main" "region"

diff --git a/availability/tests/behat/display_availability.feature b/availability/tests/behat/display_availability.feature
index 519f16c..a6cfb85 100644 (file)
--- a/availability/tests/behat/display_availability.feature
+++ b/availability/tests/behat/display_availability.feature
@@ -41,6 +41,7 @@ Feature: display_availability
   Scenario: Activity availability display
     # Set up.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -103,6 +104,7 @@ Feature: display_availability
     # Change to student view.
     Given I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # Page 1 display still there but should be dimmed and not a link.
@@ -123,6 +125,7 @@ Feature: display_availability
   Scenario: Section availability display
     # Set up.
     Given I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -146,7 +149,7 @@ Feature: display_availability
     And I press "Save changes"
 
     # This is necessary because otherwise it fails in Chrome, see MDL-44959
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
 
     # Add Pages to each section.
@@ -171,6 +174,7 @@ Feature: display_availability
     # Change to student view.
     Given I log out
     And I log in as "student1"
+    And I am on site homepage
     And I follow "Course 1"
 
     # The contents of both sections should be hidden.

diff --git a/availability/tests/behat/edit_availability.feature b/availability/tests/behat/edit_availability.feature
index 00ca518..0af20b5 100644 (file)
--- a/availability/tests/behat/edit_availability.feature
+++ b/availability/tests/behat/edit_availability.feature
@@ -30,6 +30,7 @@ Feature: edit_availability
 
   Scenario: Confirm the 'enable availability' option is working
     When I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Page" to section "1"
@@ -42,6 +43,7 @@ Feature: edit_availability
     And the following config values are set as admin:
       | enableavailability | 1 |
 
+    And I am on site homepage
     And I follow "Course 1"
     And I add a "Page" to section "1"
     Then "Restrict access" "fieldset" should exist
@@ -149,6 +151,7 @@ Feature: edit_availability
     Given the following config values are set as admin:
       | enableavailability | 1 |
     And I log in as "teacher1"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
 
@@ -168,6 +171,7 @@ Feature: edit_availability
   Scenario: 'Add group/grouping access restriction' button unavailable
     # Button does not exist when conditional access restrictions are turned off.
     Given I log in as "admin"
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Forum" to section "1"
@@ -183,7 +187,7 @@ Feature: edit_availability
       | name | course | idnumber |
       | GX1  | C1     | GXI1     |
     And I log in as "admin"
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Forum" to section "1"