MDL-58265 core_test: replace all uses of I follow course steps

Part of MDL-55611 epic.

diff --git a/admin/roles/tests/behat/override_roles_highlighting.feature b/admin/roles/tests/behat/override_roles_highlighting.feature
index f7e358f..f2eac7b 100644 (file)
--- a/admin/roles/tests/behat/override_roles_highlighting.feature
+++ b/admin/roles/tests/behat/override_roles_highlighting.feature
@@ -13,7 +13,7 @@ Feature: Highlight non-inherited permissions
 
   @javascript
   Scenario: Override a permission
-    Given I follow "Course fullname"
+    Given I am on course page "Course fullname"
     And I navigate to "Users > Permissions" in current page administration
     And I select "Manager (0)" from the "roleid" singleselect
     And I click on "Prohibit" "radio" in the "View added and updated modules in recent activity block" "table_row"

diff --git a/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature b/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature
index c0107b3..a7f3e5a 100644 (file)
--- a/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature
+++ b/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature
@@ -50,7 +50,7 @@ Feature: Manage availability conditions
     # OK, toggling works. Set the grade one to Hide and we'll go see if it actually worked.
     And I click on "Hide" "icon" in the "Restriction by grade" "table_row"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Page" to section "1"
     And I expand all fieldsets

diff --git a/admin/tool/behat/tests/behat/data_generators.feature b/admin/tool/behat/tests/behat/data_generators.feature
index 5560c83..db7a768 100644 (file)
--- a/admin/tool/behat/tests/behat/data_generators.feature
+++ b/admin/tool/behat/tests/behat/data_generators.feature
@@ -58,7 +58,7 @@ Feature: Set up contextual data for tests
       | Grouping 2 | C1 | GG2 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Users > Groups" in current page administration
     Then I should see "Group 1"
     And I should see "Group 2"
@@ -88,7 +88,7 @@ Feature: Set up contextual data for tests
       | mod/forum:replynews | Prevent | editingteacher | Course | C1 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Users > Permissions" in current page administration
     And I set the field "Advanced role override" to "Student (1)"
     Then "mod/forum:editanypost" capability has "Allow" permission
@@ -108,7 +108,7 @@ Feature: Set up contextual data for tests
       | user | course | role |
       | student1 | C1 | student |
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Topic 1"
 
   Scenario: Add role assigns
@@ -145,23 +145,23 @@ Feature: Set up contextual data for tests
     And I log out
     And I log in as "user2"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And "Turn editing on" "link" should exist in current page administration
     And I log out
     And I log in as "user3"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And "Turn editing on" "link" should exist in current page administration
     And I log out
     And I log in as "user4"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And "Turn editing on" "link" should exist in current page administration
     And I log out
     And I log in as "user5"
     And I should see "You are logged in as"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "You can not enrol yourself in this course."
 
   Scenario: Add modules
@@ -200,7 +200,7 @@ Feature: Set up contextual data for tests
       | assign     | Test assignment name with scale | Test assignment description   | C1     | assign1     | Test Scale 1 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Test assignment name"
     # Assignment 2.2 module type is disabled by default
     # And I should see "Test assignment22 name"
@@ -262,7 +262,7 @@ Feature: Set up contextual data for tests
       | GG1 | G1 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Users > Groups" in current page administration
     Then the "groups" select box should contain "Group 1 (1)"
     And the "groups" select box should contain "Group 2 (1)"
@@ -321,7 +321,7 @@ Feature: Set up contextual data for tests
       | Grade sub category 2 | C1 | Grade category 1 |
     When I log in as "admin"
     And I am on course index
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     Then I should see "Grade category 1"
     And I should see "Grade sub category 2"
@@ -345,7 +345,7 @@ Feature: Set up contextual data for tests
       | Test Grade Item 3 | C1 | Grade sub category 2 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should see "Test Grade Item 1"
     And I follow "Edit   Test Grade Item 1"
@@ -374,7 +374,7 @@ Feature: Set up contextual data for tests
       | Test Scale 1 | Disappointing, Good, Very good, Excellent |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Scales" in the course gradebook
     Then I should see "Test Scale 1"
     And I should see "Disappointing,  Good,  Very good,  Excellent"
@@ -396,7 +396,7 @@ Feature: Set up contextual data for tests
       | enableoutcomes | 1 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Outcomes"
     Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element"
     And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element"
@@ -425,7 +425,7 @@ Feature: Set up contextual data for tests
       | enableoutcomes | 1 |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should see "Test Outcome Grade Item 1"
     And I follow "Edit   Test Outcome Grade Item 1"
@@ -443,5 +443,5 @@ Feature: Set up contextual data for tests
       | online_users | Course       | C1        | course-view-*   | site-pre      |
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Online users"

diff --git a/admin/tool/behat/tests/behat/datetime_strings.feature b/admin/tool/behat/tests/behat/datetime_strings.feature
index 0b4e7e5..fcc2e2d 100644 (file)
--- a/admin/tool/behat/tests/behat/datetime_strings.feature
+++ b/admin/tool/behat/tests/behat/datetime_strings.feature
@@ -19,7 +19,7 @@ Feature: Transform date time string arguments
       | user     | course | role    |
       | teacher1 | C1     | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment name"
     And I should see "##yesterday##l, j F Y##"
     And I log out

diff --git a/admin/tool/behat/tests/behat/edit_permissions.feature b/admin/tool/behat/tests/behat/edit_permissions.feature
index c0e7cc0..bba0d7a 100644 (file)
--- a/admin/tool/behat/tests/behat/edit_permissions.feature
+++ b/admin/tool/behat/tests/behat/edit_permissions.feature
@@ -31,7 +31,7 @@ Feature: Edit capabilities
 
   Scenario: Course capabilities overrides
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Users > Permissions" in current page administration
     And I override the system permissions of "Student" role with:
       | mod/forum:deleteanypost | Prohibit |
@@ -45,7 +45,7 @@ Feature: Edit capabilities
 
   Scenario: Module capabilities overrides
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Forum" to section "1" and I fill the form with:
       | Forum name | I'm the name |

diff --git a/admin/tool/behat/tests/behat/get_and_set_fields.feature b/admin/tool/behat/tests/behat/get_and_set_fields.feature
index 4b467bc..bda108e 100644 (file)
--- a/admin/tool/behat/tests/behat/get_and_set_fields.feature
+++ b/admin/tool/behat/tests/behat/get_and_set_fields.feature
@@ -34,7 +34,7 @@ Feature: Verify that all form fields values can be get and set
       | wiki | C1 | wiki1 | Test this one | Test this one | Test this one | collaborative | 0 |
     And I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Reset" node in "Course administration"
     # Select (multi-select) - Checking "the select box should contain".
     And I expand all fieldsets
@@ -49,7 +49,7 @@ Feature: Verify that all form fields values can be get and set
     And the "Unenrol users" select box should not contain "Baker"
     And the "Unenrol users" select box should not contain "President, Baker"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I follow "Test this one"
     And I press "Create page"
@@ -100,7 +100,7 @@ Feature: Verify that all form fields values can be get and set
       | Default format | HTML |
       | Force format | 1 |
     And I press "Cancel"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     # Radio - Checking "I set the field" and "the field matches value".
     And I add a "Choice" to section "1" and I fill the form with:
       | Choice name | Test choice name |
@@ -116,7 +116,7 @@ Feature: Verify that all form fields values can be get and set
     And the field "two" matches value ""
     # Check if field xpath set/match works.
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I set the field with xpath "//input[@id='id_idnumber']" to "Course id number"
     And the field with xpath "//input[@name='idnumber']" matches value "Course id number"
@@ -129,7 +129,7 @@ Feature: Verify that all form fields values can be get and set
 
   @javascript
   Scenario: with JS enabled all form fields getters and setters works as expected
-    Then I follow "Course 1"
+    Then I am on course page "Course 1"
     And I navigate to "Users > Groups" in current page administration
     # Select (multi-select & AJAX) - Checking "I set the field" and "select box should contain".
     And I set the field "groups" to "Group 2"
@@ -141,7 +141,7 @@ Feature: Verify that all form fields values can be get and set
     And the "members" select box should contain "Student 2"
     And the "members" select box should not contain "Student 3"
     # Checkbox (AJAX) - Checking "I set the field" and "I set the following fields to these values".
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Lesson" to section "1"
     And I set the following fields to these values:
       | Name | Test lesson |

diff --git a/admin/tool/behat/tests/behat/manipulate_forms.feature b/admin/tool/behat/tests/behat/manipulate_forms.feature
index 5f5efdf..163eb4d 100644 (file)
--- a/admin/tool/behat/tests/behat/manipulate_forms.feature
+++ b/admin/tool/behat/tests/behat/manipulate_forms.feature
@@ -24,7 +24,7 @@ Feature: Forms manipulation
       | Course 1 | C1 | 0 |
     And I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Quiz" to section "1"
     When I expand all fieldsets

diff --git a/admin/tool/filetypes/tests/behat/add_filetypes.feature b/admin/tool/filetypes/tests/behat/add_filetypes.feature
index 0a9f39f..94de7ae 100644 (file)
--- a/admin/tool/filetypes/tests/behat/add_filetypes.feature
+++ b/admin/tool/filetypes/tests/behat/add_filetypes.feature
@@ -121,7 +121,7 @@ Feature: Add customised file types
     And I press "Save changes"
     # Create a resource activity and add it to a course
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add a "File" to section "1"
     And I set the following fields to these values:

diff --git a/admin/tool/monitor/tests/behat/rule.feature b/admin/tool/monitor/tests/behat/rule.feature
index 0d25c54..a85dee7 100644 (file)
--- a/admin/tool/monitor/tests/behat/rule.feature
+++ b/admin/tool/monitor/tests/behat/rule.feature
@@ -18,7 +18,7 @@ Feature: tool_monitor_rule
     And I navigate to "Event monitoring rules" node in "Site administration > Reports"
     And I click on "Enable" "link"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     And I press "Add a new rule"
     And I set the following fields to these values:
@@ -46,7 +46,7 @@ Feature: tool_monitor_rule
   Scenario: Add a rule on course level
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     When I press "Add a new rule"
     And I set the following fields to these values:
@@ -66,7 +66,7 @@ Feature: tool_monitor_rule
 
   Scenario: Delete a rule on course level
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     When I click on "Delete rule" "link"
     Then I should see "Are you sure you want to delete the rule \"New rule course level\"?"
@@ -76,7 +76,7 @@ Feature: tool_monitor_rule
 
   Scenario: Edit a rule on course level
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     When I click on "Edit rule" "link"
     And I set the following fields to these values:
@@ -95,7 +95,7 @@ Feature: tool_monitor_rule
 
   Scenario: Duplicate a rule on course level
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     When I click on "Duplicate rule" "link" in the "New rule course level" "table_row"
     Then I should see "Rule successfully duplicated"
@@ -154,7 +154,7 @@ Feature: tool_monitor_rule
 
   Scenario: Duplicate a rule on site level
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     When I click on "Duplicate rule" "link" in the "New rule site level" "table_row"
     Then I should see "Rule successfully duplicated"

diff --git a/admin/tool/monitor/tests/behat/subscription.feature b/admin/tool/monitor/tests/behat/subscription.feature
index 9acc86d..0fb4d72 100644 (file)
--- a/admin/tool/monitor/tests/behat/subscription.feature
+++ b/admin/tool/monitor/tests/behat/subscription.feature
@@ -23,7 +23,7 @@ Feature: tool_monitor_subscriptions
     And I navigate to "Event monitoring rules" node in "Site administration > Reports"
     And I click on "Enable" "link"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Event monitoring rules" node in "Course administration > Reports"
     And I press "Add a new rule"
     And I set the following fields to these values:
@@ -133,7 +133,7 @@ Feature: tool_monitor_subscriptions
     And I should see "Subscription successfully created"
     And "#toolmonitorsubs_r0" "css_element" should exist
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I trigger cron
     And I am on site homepage
     When I click on ".popover-region-notifications" "css_element"

diff --git a/admin/tool/recyclebin/tests/behat/backup_user_data.feature b/admin/tool/recyclebin/tests/behat/backup_user_data.feature
index 31065d0..9066468 100644 (file)
--- a/admin/tool/recyclebin/tests/behat/backup_user_data.feature
+++ b/admin/tool/recyclebin/tests/behat/backup_user_data.feature
@@ -23,7 +23,7 @@ Feature: Backup user data
   @javascript
   Scenario: Delete and restore a quiz with user data
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Quiz" to section "1" and I fill the form with:
       | Name        | Quiz 1                |
@@ -44,7 +44,7 @@ Feature: Backup user data
       | Feedback for the response 'False'. | So you think it is false                |
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Quiz 1"
     And I press "Attempt quiz now"
     And I click on "True" "radio" in the "First question" "question"
@@ -55,7 +55,7 @@ Feature: Backup user data
     And I should see "5.00 out of 10.00"
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I delete "Quiz 1" activity
     And I run all adhoc tasks
@@ -64,7 +64,7 @@ Feature: Backup user data
     And I click on "Restore" "link" in the "region-main" "region"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     When I navigate to "User report" in the course gradebook
     Then "Quiz 1" row "Grade" column of "user-grade" table should contain "5"
     And "Quiz 1" row "Percentage" column of "user-grade" table should contain "50"

diff --git a/admin/tool/recyclebin/tests/behat/basic_functionality.feature b/admin/tool/recyclebin/tests/behat/basic_functionality.feature
index 6b4ea5b..877a249 100644 (file)
--- a/admin/tool/recyclebin/tests/behat/basic_functionality.feature
+++ b/admin/tool/recyclebin/tests/behat/basic_functionality.feature
@@ -25,7 +25,7 @@ Feature: Basic recycle bin functionality
 
   Scenario: Restore a deleted assignment
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assign |
@@ -38,7 +38,7 @@ Feature: Basic recycle bin functionality
     And I should see "'Test assign' has been restored"
     And I wait to be redirected
     And I am on homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Test assign" in the "Topic 1" "section"
 
   Scenario: Restore a deleted course
@@ -64,7 +64,7 @@ Feature: Basic recycle bin functionality
   @javascript
   Scenario: Deleting a single item from the recycle bin
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assign |
@@ -84,7 +84,7 @@ Feature: Basic recycle bin functionality
   @javascript
   Scenario: Deleting all the items from the recycle bin
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assign 1 |

diff --git a/admin/tool/uploaduser/tests/behat/upload_users.feature b/admin/tool/uploaduser/tests/behat/upload_users.feature
index 7ee6235..f90acd2 100644 (file)
--- a/admin/tool/uploaduser/tests/behat/upload_users.feature
+++ b/admin/tool/uploaduser/tests/behat/upload_users.feature
@@ -33,8 +33,7 @@ Feature: Upload users
     And I should see "Tom Jones"
     And I should see "Trent Reznor"
     And I should see "reznor@example.com"
-    And I am on site homepage
-    And I follow "Maths"
+    And I am on course page "Maths"
     And I navigate to "Users > Groups" in current page administration
     And I set the field "groups" to "Section 1 (1)"
     And the "members" select box should contain "Tom Jones"

diff --git a/admin/tool/usertours/tests/behat/tour_filter.feature b/admin/tool/usertours/tests/behat/tour_filter.feature
index a0104d4..ff33cad 100644 (file)
--- a/admin/tool/usertours/tests/behat/tour_filter.feature
+++ b/admin/tool/usertours/tests/behat/tour_filter.feature
@@ -47,16 +47,16 @@ Feature: Apply tour filters to a tour
     And I log out
     And I log in as "editor1"
     And I am on site homepage
-    When I follow "Course 1"
+    When I am on course page "Course 1"
     Then I should not see "Welcome to your course tour."
     And I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Welcome to your course tour."
     And I click on "End tour" "button"
     And I log out
     And I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Welcome to your course tour."

diff --git a/availability/condition/completion/tests/behat/availability_completion.feature b/availability/condition/completion/tests/behat/availability_completion.feature
index 9ac9f37..6a1e447 100644 (file)
--- a/availability/condition/completion/tests/behat/availability_completion.feature
+++ b/availability/condition/completion/tests/behat/availability_completion.feature
@@ -22,7 +22,7 @@ Feature: availability_completion
     # Basic setup.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Add a Page with a completion tickbox.
@@ -49,7 +49,7 @@ Feature: availability_completion
     When I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Page 2 should not appear yet.
     Then I should not see "Page 2" in the "region-main" "region"

diff --git a/availability/condition/completion/tests/behat/conditional_bug.feature b/availability/condition/completion/tests/behat/conditional_bug.feature
index b2d3900..b780de4 100644 (file)
--- a/availability/condition/completion/tests/behat/conditional_bug.feature
+++ b/availability/condition/completion/tests/behat/conditional_bug.feature
@@ -19,7 +19,7 @@ Feature: Confirm that conditions on completion no longer cause a bug
   Scenario: Multiple completion conditions on glossary
     # Set up course.
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I expand all fieldsets
     And I set the field "Enable completion tracking" to "Yes"

diff --git a/availability/condition/date/tests/behat/availability_date.feature b/availability/condition/date/tests/behat/availability_date.feature
index 161080f..ce9e496 100644 (file)
--- a/availability/condition/date/tests/behat/availability_date.feature
+++ b/availability/condition/date/tests/behat/availability_date.feature
@@ -22,7 +22,7 @@ Feature: availability_date
     # Basic setup.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Add a Page with a date condition that does match (from the past).
@@ -56,7 +56,7 @@ Feature: availability_date
     When I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Page 1 should appear, but page 2 does not.
     Then I should see "Page 1" in the "region-main" "region"

diff --git a/availability/condition/grade/tests/behat/availability_grade.feature b/availability/condition/grade/tests/behat/availability_grade.feature
index 60f7920..e6cb28c 100644 (file)
--- a/availability/condition/grade/tests/behat/availability_grade.feature
+++ b/availability/condition/grade/tests/behat/availability_grade.feature
@@ -22,7 +22,7 @@ Feature: availability_grade
     # Basic setup.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Add an assignment.
@@ -71,7 +71,7 @@ Feature: availability_grade
     And I click on "Edit settings" "link" in the "P3" activity
     And I expand all fieldsets
     And the field "Maximum grade percentage (exclusive)" matches value ""
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Add a Page with a grade condition for 10%.
     And I add a "Page" to section "4"
@@ -92,7 +92,7 @@ Feature: availability_grade
     When I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Do the assignment.
     And I follow "A1"
@@ -111,7 +111,7 @@ Feature: availability_grade
     When I log out
     And I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Give the assignment 40%.
     And I follow "A1"
@@ -127,7 +127,7 @@ Feature: availability_grade
     And I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Check pages are visible.
     Then I should see "P2" in the "region-main" "region"

diff --git a/availability/condition/group/tests/behat/availability_group.feature b/availability/condition/group/tests/behat/availability_group.feature
index 31d65d2..65f6919 100644 (file)
--- a/availability/condition/group/tests/behat/availability_group.feature
+++ b/availability/condition/group/tests/behat/availability_group.feature
@@ -22,7 +22,7 @@ Feature: availability_group
     # Basic setup.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Start to add a Page. If there aren't any groups, there's no Group option.
@@ -40,7 +40,7 @@ Feature: availability_group
     # 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 site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Page" to section "1"
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
@@ -86,7 +86,7 @@ Feature: availability_group
     When I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # No pages should appear yet.
     Then I should not see "P1" in the "region-main" "region"
@@ -100,7 +100,7 @@ Feature: availability_group
     And I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # P1 (any groups) and P2 should show but not P3.
     Then I should see "P1" in the "region-main" "region"

diff --git a/availability/condition/grouping/tests/behat/availability_grouping.feature b/availability/condition/grouping/tests/behat/availability_grouping.feature
index 3c1ccb1..5d8affe 100644 (file)
--- a/availability/condition/grouping/tests/behat/availability_grouping.feature
+++ b/availability/condition/grouping/tests/behat/availability_grouping.feature
@@ -28,7 +28,7 @@ Feature: availability_grouping
     # Basic setup.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Start to add a Page. If there aren't any groupings, there's no Grouping option.
@@ -42,7 +42,7 @@ Feature: availability_grouping
     # 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 site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And the following "groupings" exist:
       | name | course | idnumber |
       | GX1  | C1     | GXI1     |
@@ -78,7 +78,7 @@ Feature: availability_grouping
     # Log back in as student.
     When I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # No pages should appear yet.
     Then I should not see "P1" in the "region-main" "region"
@@ -91,7 +91,7 @@ Feature: availability_grouping
       | GXI1     | GI1    |
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # P1 should show but not B2.
     Then I should see "P1" in the "region-main" "region"

diff --git a/availability/condition/profile/tests/behat/availability_profile.feature b/availability/condition/profile/tests/behat/availability_profile.feature
index a5b01b7..9a8b093 100644 (file)
--- a/availability/condition/profile/tests/behat/availability_profile.feature
+++ b/availability/condition/profile/tests/behat/availability_profile.feature
@@ -22,7 +22,7 @@ Feature: availability_profile
     # Basic setup.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Add
@@ -57,7 +57,7 @@ Feature: availability_profile
     When I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # I see P1 but not P2.
     Then I should see "P1" in the "region-main" "region"
@@ -83,7 +83,7 @@ Feature: availability_profile
 
     # Set Page activity which has requirement on this field.
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Page" to section "1"
     And I set the following fields to these values:
@@ -110,5 +110,5 @@ Feature: availability_profile
     And I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "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 0daeee2..eae600e 100644 (file)
--- a/availability/tests/behat/display_availability.feature
+++ b/availability/tests/behat/display_availability.feature
@@ -40,7 +40,7 @@ Feature: display_availability
     # Set up.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Add a Page with 1 restriction.
@@ -103,7 +103,7 @@ Feature: display_availability
     Given I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Page 1 display still there but should be dimmed and not a link.
     Then I should see "Page 1" in the "#section-1 .dimmed_text" "css_element"
@@ -124,7 +124,7 @@ Feature: display_availability
     # Set up.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Add a restriction to section 1 (visible to students).
@@ -148,7 +148,7 @@ Feature: display_availability
 
     # This is necessary because otherwise it fails in Chrome, see MDL-44959
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Add Pages to each section.
     And I add a "Page" to section "1" and I fill the form with:
@@ -173,7 +173,7 @@ Feature: display_availability
     Given I log out
     And I log in as "student1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # The contents of both sections should be hidden.
     Then I should not see "Page 1" in the "region-main" "region"

diff --git a/availability/tests/behat/edit_availability.feature b/availability/tests/behat/edit_availability.feature
index 7193088..6956c6b 100644 (file)
--- a/availability/tests/behat/edit_availability.feature
+++ b/availability/tests/behat/edit_availability.feature
@@ -33,7 +33,7 @@ Feature: edit_availability
       | enableavailability | 0 |
     When I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Page" to section "1"
     Then "Restrict access" "fieldset" should not exist
@@ -46,7 +46,7 @@ Feature: edit_availability
       | enableavailability | 1 |
 
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Page" to section "1"
     Then "Restrict access" "fieldset" should exist
 
@@ -58,7 +58,7 @@ Feature: edit_availability
   Scenario: Edit availability using settings in activity form
     # Set up.
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
     # Add a Page and check it has None in so far.
     And I turn editing mode on
@@ -150,7 +150,7 @@ Feature: edit_availability
     # Set up.
     Given I log in as "teacher1"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
     # Edit a section
@@ -172,7 +172,7 @@ Feature: edit_availability
       | enableavailability | 0 |
     And I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Forum" to section "1"
     When I expand all fieldsets
@@ -186,7 +186,7 @@ Feature: edit_availability
       | GX1  | C1     | GXI1     |
     And I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Forum" to section "1"
     And I set the following fields to these values:

diff --git a/backup/util/ui/tests/behat/duplicate_activities.feature b/backup/util/ui/tests/behat/duplicate_activities.feature
index 4c252d0..6b2cb8b 100644 (file)
--- a/backup/util/ui/tests/behat/duplicate_activities.feature
+++ b/backup/util/ui/tests/behat/duplicate_activities.feature
@@ -15,7 +15,7 @@ Feature: Duplicate activities
       | user | course | role |
       | teacher1 | C1 | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Database" to section "1" and I fill the form with:
       | Name | Test database name |

diff --git a/backup/util/ui/tests/behat/import_course.feature b/backup/util/ui/tests/behat/import_course.feature
index 111c339..ef28571 100644 (file)
--- a/backup/util/ui/tests/behat/import_course.feature
+++ b/backup/util/ui/tests/behat/import_course.feature
@@ -17,7 +17,7 @@ Feature: Import course's contents into another course
       | teacher1 | C1 | editingteacher |
       | teacher1 | C2 | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Database" to section "1" and I fill the form with:
       | Name | Test database name |

diff --git a/backup/util/ui/tests/behat/import_groups.feature b/backup/util/ui/tests/behat/import_groups.feature
index d574542..5bed8bc 100644 (file)
--- a/backup/util/ui/tests/behat/import_groups.feature
+++ b/backup/util/ui/tests/behat/import_groups.feature
@@ -25,7 +25,7 @@ Feature: Option to include groups and groupings when importing a course to anoth
       | Grouping 1 | C1 | GROUPING1 |
       | Grouping 2 | C1 | GROUPING2 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Include groups and groupings when importing a course to another course
     Given I import "Course 1" course into "Course 2" course using this options:

diff --git a/backup/util/ui/tests/behat/restore_moodle2_courses.feature b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
index 32c1cd7..1ec988e 100644 (file)
--- a/backup/util/ui/tests/behat/restore_moodle2_courses.feature
+++ b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
@@ -16,7 +16,7 @@ Feature: Restore Moodle 2 course backups
       | data | C3 | data1 | Test database name | Database description | 2 |
     And I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Forum" to section "1" and I fill the form with:
       | Forum name | Test forum name |
@@ -63,7 +63,7 @@ Feature: Restore Moodle 2 course backups
   Scenario: Restore a backup into the same course removing it's contents before that
     When I backup "Course 1" course using this options:
       | Confirmation | Filename | test_backup.mbz |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Forum" to section "1" and I fill the form with:
       | Forum name | Test forum post backup name |
       | Description | Test forum post backup description |

diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature
index a1d2fb4..17791c2 100644 (file)
--- a/badges/tests/behat/award_badge.feature
+++ b/badges/tests/behat/award_badge.feature
@@ -86,7 +86,7 @@ Feature: Award badges
       | student1 | C1 | student |
       | student2 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I follow "Add a new badge"
     And I set the following fields to these values:
@@ -106,7 +106,7 @@ Feature: Award badges
     And I press "Award badge"
     And I set the field "potentialrecipients[]" to "Student 1 (student1@example.com)"
     When I press "Award badge"
-    And I follow "Course Badge"
+    And I am on course page "Course Badge"
     Then I should see "Recipients (2)"
     And I log out
     And I log in as "student1"
@@ -128,7 +128,7 @@ Feature: Award badges
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
@@ -137,7 +137,7 @@ Feature: Award badges
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment name |
       | Description | Submit your online text |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I follow "Add a new badge"
     And I set the following fields to these values:
@@ -157,8 +157,8 @@ Feature: Award badges
     And I click on "Course 1" "link" in the "region-main" "region"
     Then I should not see "badges"
     And I am on homepage
-    And I follow "Course 1"
-    And I click on "Not completed: Test assignment name. Select to mark as complete." "icon"
+    And I am on course page "Course 1"
+    And I press "Mark as complete: Test assignment name"
     And I follow "Profile" in the user menu
     And I click on "Course 1" "link" in the "region-main" "region"
     Then I should see "Course Badge"
@@ -177,7 +177,7 @@ Feature: Award badges
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
@@ -192,7 +192,7 @@ Feature: Award badges
     And I click on "Condition: Activity completion" "link"
     And I set the field "Assignment - Test assignment name" to "1"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I follow "Add a new badge"
     And I set the following fields to these values:
@@ -212,7 +212,7 @@ Feature: Award badges
     And I click on "Course 1" "link" in the "region-main" "region"
     Then I should not see "badges"
     And I am on homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Not completed: Test assignment name. Select to mark as complete." "icon"
     And I log out
     # Completion cron won't mark the whole course completed unless the
@@ -242,7 +242,7 @@ Feature: Award badges
       | student1 | C1 | student |
       | student2 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     # Create course badge 1.
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I follow "Add a new badge"
@@ -325,7 +325,7 @@ Feature: Award badges
       | student1 | C1 | student |
       | student2 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I follow "Add a new badge"
     And I set the following fields to these values:
@@ -345,7 +345,7 @@ Feature: Award badges
     And I press "Award badge"
     And I set the field "potentialrecipients[]" to "Student 1 (student1@example.com)"
     When I press "Award badge"
-    And I follow "Course Badge"
+    And I am on course page "Course Badge"
     Then I should see "Recipients (2)"
     And I follow "Recipients (2)"
     And I press "Award badge"
@@ -353,5 +353,5 @@ Feature: Award badges
     And I press "Revoke badge"
     And I set the field "existingrecipients[]" to "Student 1 (student1@example.com)"
     When I press "Revoke badge"
-    And I follow "Course Badge"
+    And I am on course page "Course Badge"
     Then I should see "Recipients (0)"

diff --git a/blocks/activity_modules/tests/behat/block_activity_modules.feature b/blocks/activity_modules/tests/behat/block_activity_modules.feature
index 462ef80..5dd47ae 100644 (file)
--- a/blocks/activity_modules/tests/behat/block_activity_modules.feature
+++ b/blocks/activity_modules/tests/behat/block_activity_modules.feature
@@ -110,48 +110,48 @@ Feature: Block activity modules
 
     When I log in as "admin"
     And I am on course index
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Activities" block
     And I click on "Assignments" "link" in the "Activities" "block"
     Then I should see "Test assignment name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Chats" "link" in the "Activities" "block"
     And I should see "Test chat name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Choices" "link" in the "Activities" "block"
     And I should see "Test choice name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Databases" "link" in the "Activities" "block"
     And I should see "Test database name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Feedback" "link" in the "Activities" "block"
     And I should see "Test feedback name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Forums" "link" in the "Activities" "block"
     And I should see "Test forum name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "External tools" "link" in the "Activities" "block"
     And I should see "Test lti name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Quizzes" "link" in the "Activities" "block"
     And I should see "Test quiz name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Glossaries" "link" in the "Activities" "block"
     And I should see "Test glossary name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "SCORM packages" "link" in the "Activities" "block"
     And I should see "Test scorm name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Lessons" "link" in the "Activities" "block"
     And I should see "Test lesson name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Wikis" "link" in the "Activities" "block"
     And I should see "Test wiki name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Workshop" "link" in the "Activities" "block"
     And I should see "Test workshop name"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I click on "Resources" "link" in the "Activities" "block"
     And I should see "Test book name"
     And I should see "Test page name"

diff --git a/blocks/activity_results/tests/behat/addblockinactivity.feature b/blocks/activity_results/tests/behat/addblockinactivity.feature
index de4a149..4e917d7 100644 (file)
--- a/blocks/activity_results/tests/behat/addblockinactivity.feature
+++ b/blocks/activity_results/tests/behat/addblockinactivity.feature
@@ -25,30 +25,30 @@ Feature: The activity results block displays student scores
       | student4 | C1 | student |
       | student5 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment 1 |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment 2 |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment 3 |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add a "Page" to section "1"
     And I set the following fields to these values:
       | Name | Test page name |
       | Description | Test page description |
       | Page content | This is a page |
     And I press "Save and return to course"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Test page name"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
@@ -58,7 +58,7 @@ Feature: The activity results block displays student scores
     And I give the grade "60.00" to the user "Student 4" for the grade item "Test assignment 1"
     And I give the grade "50.00" to the user "Student 5" for the grade item "Test assignment 1"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on a non-graded activity to show 3 high scores
     Given I follow "Test page name"
@@ -84,19 +84,19 @@ Feature: The activity results block displays student scores
     And I configure the "Activity results" block
     Then the field "id_config_activitygradeitemid" matches value "Test assignment 1"
     And I press "Cancel"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 2"
     And I add the "Activity results" block
     And I configure the "Activity results" block
     And the field "id_config_activitygradeitemid" matches value "Test assignment 2"
     And I press "Cancel"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 3"
     And I add the "Activity results" block
     And I configure the "Activity results" block
     And the field "id_config_activitygradeitemid" matches value "Test assignment 3"
     And I press "Cancel"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test page name"
     And I add the "Activity results" block
     And I configure the "Activity results" block

diff --git a/blocks/activity_results/tests/behat/addunconfiguredblock.feature b/blocks/activity_results/tests/behat/addunconfiguredblock.feature
index f53d8ea..d28476d 100644 (file)
--- a/blocks/activity_results/tests/behat/addunconfiguredblock.feature
+++ b/blocks/activity_results/tests/behat/addunconfiguredblock.feature
@@ -15,7 +15,7 @@ Feature: The activity results block doesn't displays student scores for unconfig
       | user | course | role |
       | teacher1 | C1 | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
   Scenario: Add the block to a the course

diff --git a/blocks/activity_results/tests/behat/addunsupportedactivity.feature b/blocks/activity_results/tests/behat/addunsupportedactivity.feature
index d3f5c99..14d7784 100644 (file)
--- a/blocks/activity_results/tests/behat/addunsupportedactivity.feature
+++ b/blocks/activity_results/tests/behat/addunsupportedactivity.feature
@@ -15,7 +15,7 @@ Feature: The activity results block doesn't display student scores for unsupport
       | user | course | role |
       | teacher1 | C1 | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
 
   Scenario: Try to configure the block to use an activity without grades

diff --git a/blocks/activity_results/tests/behat/defaultsettings.feature b/blocks/activity_results/tests/behat/defaultsettings.feature
index ca45c84..f7d0a44 100644 (file)
--- a/blocks/activity_results/tests/behat/defaultsettings.feature
+++ b/blocks/activity_results/tests/behat/defaultsettings.feature
@@ -24,13 +24,13 @@ Feature: The activity results block can have administrator set defaults
       | config_gradeformat | 2 | block_activity_results |
       | config_nameformat  | 2 | block_activity_results |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add the "Activity results" block
     When I configure the "Activity results" block
     And the following fields match these values:
@@ -48,13 +48,13 @@ Feature: The activity results block can have administrator set defaults
       | config_showworst        | 0 | block_activity_results |
       | config_showworst_locked | 1 | block_activity_results |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add the "Activity results" block
     When I configure the "Activity results" block
     And the following fields match these values:

diff --git a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature
index 620aac1..81511ce 100644 (file)
--- a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature
@@ -25,13 +25,13 @@ Feature: The activity results block displays student high scores
       | student4 | C1 | student |
       | student5 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment"
@@ -40,7 +40,7 @@ Feature: The activity results block displays student high scores
     And I give the grade "60.00" to the user "Student 4" for the grade item "Test assignment"
     And I give the grade "50.00" to the user "Student 5" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 0 high scores
     Given I add the "Activity results" block

diff --git a/blocks/activity_results/tests/behat/highscoreswithscales.feature b/blocks/activity_results/tests/behat/highscoreswithscales.feature
index d121c97..191933e 100644 (file)
--- a/blocks/activity_results/tests/behat/highscoreswithscales.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithscales.feature
@@ -25,14 +25,14 @@ Feature: The activity results block displays students high scores in group as sc
       | student4 | C1 | student |
       | student5 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Scales" in the course gradebook
     And I press "Add a new scale"
     And I set the following fields to these values:
       | Name | My Scale |
       | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
@@ -40,7 +40,7 @@ Feature: The activity results block displays students high scores in group as sc
       | assignsubmission_file_enabled | 0 |
       | id_grade_modgrade_type | Scale |
       | id_grade_modgrade_scale | My Scale |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment"
@@ -49,7 +49,7 @@ Feature: The activity results block displays students high scores in group as sc
     And I give the grade "Average" to the user "Student 4" for the grade item "Test assignment"
     And I give the grade "Not good enough" to the user "Student 5" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 high score
     Given I add the "Activity results" block

diff --git a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature
index 6b9c972..c295748 100644 (file)
--- a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature
@@ -42,14 +42,14 @@ Feature: The activity results block displays student in group high scores as sca
       | student5 | G3 |
       | student6 | G3 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Scales" in the course gradebook
     And I press "Add a new scale"
     And I set the following fields to these values:
       | Name | My Scale |
       | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
@@ -58,7 +58,7 @@ Feature: The activity results block displays student in group high scores as sca
       | id_grade_modgrade_type | Scale |
       | id_grade_modgrade_scale | My Scale |
       | Group mode | Separate groups |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment"
@@ -68,7 +68,7 @@ Feature: The activity results block displays student in group high scores as sca
     And I give the grade "Good" to the user "Student 5" for the grade item "Test assignment"
     And I give the grade "Average" to the user "Student 6" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Try to configure the block on the course page to show 1 high score
     Given I add the "Activity results" block
@@ -83,7 +83,7 @@ Feature: The activity results block displays student in group high scores as sca
     And I should see "Excellent!" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 1" in the "Activity results" "block"
     And I should see "Excellent!" in the "Activity results" "block"
 
@@ -104,7 +104,7 @@ Feature: The activity results block displays student in group high scores as sca
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student3"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 3" in the "Activity results" "block"
     And I should see "Very good" in the "Activity results" "block"
     And I should see "Student 4" in the "Activity results" "block"
@@ -125,7 +125,7 @@ Feature: The activity results block displays student in group high scores as sca
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User S1" in the "Activity results" "block"
     And I should see "Excellent!" in the "Activity results" "block"
     And I should see "User S2" in the "Activity results" "block"
@@ -146,7 +146,7 @@ Feature: The activity results block displays student in group high scores as sca
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User" in the "Activity results" "block"
     And I should see "Excellent!" in the "Activity results" "block"
     And I should see "Very good" in the "Activity results" "block"

diff --git a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature
index 0c1ccdd..bb53eb6 100644 (file)
--- a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature
@@ -42,14 +42,14 @@ Feature: The activity results block displays student in separate groups scores
       | student5 | G3 |
       | student6 | G3 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
       | Group mode | Separate groups |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
@@ -59,7 +59,7 @@ Feature: The activity results block displays student in separate groups scores
     And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment"
     And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 high score
     Given I add the "Activity results" block
@@ -89,7 +89,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "95.00/100.00" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 1" in the "Activity results" "block"
     And I should see "100.00/100.00" in the "Activity results" "block"
 
@@ -107,7 +107,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "95.00" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 1" in the "Activity results" "block"
     And I should see "100.00" in the "Activity results" "block"
 
@@ -130,7 +130,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "75%" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 1" in the "Activity results" "block"
     And I should see "100%" in the "Activity results" "block"
     And I should see "Student 2" in the "Activity results" "block"
@@ -154,7 +154,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "75.00/100.00" in the "Activity results" "block"
     And I log out
     And I log in as "student3"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 3" in the "Activity results" "block"
     And I should see "90.00/100.00" in the "Activity results" "block"
     And I should see "Student 4" in the "Activity results" "block"
@@ -178,7 +178,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "75.00" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 1" in the "Activity results" "block"
     And I should see "100.00" in the "Activity results" "block"
     And I should see "Student 2" in the "Activity results" "block"
@@ -200,7 +200,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "75.00%" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User S1" in the "Activity results" "block"
     And I should see "100.00%" in the "Activity results" "block"
     And I should see "User S2" in the "Activity results" "block"
@@ -222,7 +222,7 @@ Feature: The activity results block displays student in separate groups scores
     And I should see "75.00%" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User" in the "Activity results" "block"
     And I should see "100.00%" in the "Activity results" "block"
     And I should see "90.00%" in the "Activity results" "block"

diff --git a/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature b/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature
index 0e64d05..576b8ff 100644 (file)
--- a/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature
@@ -42,14 +42,14 @@ Feature: The activity results block displays student in visible groups scores
       | student5 | G3 |
       | student6 | G3 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
       | Group mode | Visible groups |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
@@ -59,7 +59,7 @@ Feature: The activity results block displays student in visible groups scores
     And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment"
     And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 high score
     Given I add the "Activity results" block
@@ -87,7 +87,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 1" in the "Activity results" "block"
     And I should see "95.00/100.00" in the "Activity results" "block"
 
@@ -103,7 +103,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 1" in the "Activity results" "block"
     And I should see "95.00" in the "Activity results" "block"
 
@@ -120,7 +120,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 1" in the "Activity results" "block"
     And I should see "95%" in the "Activity results" "block"
     And I should see "Group 2" in the "Activity results" "block"
@@ -140,7 +140,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 1" in the "Activity results" "block"
     And I should see "95.00/100.00" in the "Activity results" "block"
     And I should see "Group 2" in the "Activity results" "block"
@@ -160,7 +160,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 1" in the "Activity results" "block"
     And I should see "95.00" in the "Activity results" "block"
     And I should see "Group 2" in the "Activity results" "block"
@@ -180,7 +180,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group" in the "Activity results" "block"
     And I should see "95.00%" in the "Activity results" "block"
     And I should see "85.00%" in the "Activity results" "block"
@@ -198,7 +198,7 @@ Feature: The activity results block displays student in visible groups scores
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group" in the "Activity results" "block"
     And I should see "95.00%" in the "Activity results" "block"
     And I should see "85.00%" in the "Activity results" "block"

diff --git a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature
index e2c8729..5dfa377 100644 (file)
--- a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature
@@ -25,13 +25,13 @@ Feature: The activity results block displays student low scores
       | student4 | C1 | student |
       | student5 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment"
@@ -40,7 +40,7 @@ Feature: The activity results block displays student low scores
     And I give the grade "60.00" to the user "Student 4" for the grade item "Test assignment"
     And I give the grade "50.00" to the user "Student 5" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 low score
     Given I add the "Activity results" block

diff --git a/blocks/activity_results/tests/behat/lowscoreswithscales.feature b/blocks/activity_results/tests/behat/lowscoreswithscales.feature
index 5068a7b..dadd855 100644 (file)
--- a/blocks/activity_results/tests/behat/lowscoreswithscales.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithscales.feature
@@ -25,14 +25,14 @@ Feature: The activity results block displays student low scores as scales
       | student4 | C1 | student |
       | student5 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Scales" in the course gradebook
     And I press "Add a new scale"
     And I set the following fields to these values:
       | Name | My Scale |
       | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
@@ -40,7 +40,7 @@ Feature: The activity results block displays student low scores as scales
       | assignsubmission_file_enabled | 0 |
       | id_grade_modgrade_type | Scale |
       | id_grade_modgrade_scale | My Scale |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment"
@@ -49,7 +49,7 @@ Feature: The activity results block displays student low scores as scales
     And I give the grade "Average" to the user "Student 4" for the grade item "Test assignment"
     And I give the grade "Not good enough" to the user "Student 5" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 low score
     Given I add the "Activity results" block

diff --git a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature
index 30602ff..64a59a7 100644 (file)
--- a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature
@@ -42,14 +42,14 @@ Feature: The activity results block displays students in groups low scores as sc
       | student5 | G3 |
       | student6 | G3 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Scales" in the course gradebook
     And I press "Add a new scale"
     And I set the following fields to these values:
       | Name | My Scale |
       | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
@@ -58,7 +58,7 @@ Feature: The activity results block displays students in groups low scores as sc
       | id_grade_modgrade_type | Scale |
       | id_grade_modgrade_scale | My Scale |
       | Group mode | Separate groups |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment"
@@ -68,7 +68,7 @@ Feature: The activity results block displays students in groups low scores as sc
     And I give the grade "Good" to the user "Student 5" for the grade item "Test assignment"
     And I give the grade "Average" to the user "Student 6" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Try to configure the block on the course page to show 1 low score
     Given I add the "Activity results" block
@@ -83,7 +83,7 @@ Feature: The activity results block displays students in groups low scores as sc
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 6" in the "Activity results" "block"
     And I should see "Average" in the "Activity results" "block"
 
@@ -102,7 +102,7 @@ Feature: The activity results block displays students in groups low scores as sc
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student3"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 3" in the "Activity results" "block"
     And I should see "Very good" in the "Activity results" "block"
     And I should see "Student 4" in the "Activity results" "block"
@@ -122,7 +122,7 @@ Feature: The activity results block displays students in groups low scores as sc
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User S5" in the "Activity results" "block"
     And I should see "Good" in the "Activity results" "block"
     And I should see "User S6" in the "Activity results" "block"
@@ -142,7 +142,7 @@ Feature: The activity results block displays students in groups low scores as sc
     And I should see "Good" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User" in the "Activity results" "block"
     And I should see "Good" in the "Activity results" "block"
     And I should see "Average" in the "Activity results" "block"

diff --git a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature
index 5d73692..71500e4 100644 (file)
--- a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature
@@ -42,14 +42,14 @@ Feature: The activity results block displays students in separate groups scores
       | student5 | G3 |
       | student6 | G3 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
       | Group mode | Separate groups |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
@@ -59,7 +59,7 @@ Feature: The activity results block displays students in separate groups scores
     And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment"
     And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 low score
     Given I add the "Activity results" block
@@ -89,7 +89,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75.00/100.00" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 6" in the "Activity results" "block"
     And I should see "70.00/100.00" in the "Activity results" "block"
 
@@ -107,7 +107,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75.00" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 6" in the "Activity results" "block"
     And I should see "70.00" in the "Activity results" "block"
 
@@ -128,7 +128,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75%" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 6" in the "Activity results" "block"
     And I should see "70%" in the "Activity results" "block"
     And I should see "Student 5" in the "Activity results" "block"
@@ -150,7 +150,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75.00/100.00" in the "Activity results" "block"
     And I log out
     And I log in as "student3"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 3" in the "Activity results" "block"
     And I should see "90.00/100.00" in the "Activity results" "block"
     And I should see "Student 4" in the "Activity results" "block"
@@ -172,7 +172,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75.00" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Student 5" in the "Activity results" "block"
     And I should see "80.00" in the "Activity results" "block"
     And I should see "Student 6" in the "Activity results" "block"
@@ -193,7 +193,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75.00%" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User S1" in the "Activity results" "block"
     And I should see "100.00%" in the "Activity results" "block"
     And I should see "User S2" in the "Activity results" "block"
@@ -214,7 +214,7 @@ Feature: The activity results block displays students in separate groups scores
     And I should see "75.00%" in the "Activity results" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "User" in the "Activity results" "block"
     And I should see "100.00%" in the "Activity results" "block"
     And I should see "90.00%" in the "Activity results" "block"

diff --git a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature
index e137f92..b8488ca 100644 (file)
--- a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature
@@ -42,14 +42,14 @@ Feature: The activity results block displays student in visible groups low score
       | student5 | G3 |
       | student6 | G3 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment |
       | Description | Offline text |
       | assignsubmission_file_enabled | 0 |
       | Group mode | Visible groups |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
@@ -59,7 +59,7 @@ Feature: The activity results block displays student in visible groups low score
     And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment"
     And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment"
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   Scenario: Configure the block on the course page to show 1 low score
     Given I add the "Activity results" block
@@ -87,7 +87,7 @@ Feature: The activity results block displays student in visible groups low score
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 3" in the "Activity results" "block"
     And I should see "75.00/100.00" in the "Activity results" "block"
 
@@ -103,7 +103,7 @@ Feature: The activity results block displays student in visible groups low score
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 3" in the "Activity results" "block"
     And I should see "75.00" in the "Activity results" "block"
 
@@ -124,7 +124,7 @@ Feature: The activity results block displays student in visible groups low score
     And I should see "75%" in the "Activity results" "block"
     And I log out
     And I log in as "student5"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Group 2" in the "Activity results" "block"
     And I should see "85%" in the "Activity results" "block"
     And I should see "Group 3" in the "Activity results" "block"
@@ -142,7 +142,7 @@ Feature: The activity results block displays student in visible groups low score
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 2" in the "Activity results" "block"
     And I should see "85.00/100.00" in the "Activity results" "block"
     And I should see "Group 3" in the "Activity results" "block"
@@ -160,7 +160,7 @@ Feature: The activity results block displays student in visible groups low score
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group 2" in the "Activity results" "block"
     And I should see "85.00" in the "Activity results" "block"
     And I should see "Group 3" in the "Activity results" "block"
@@ -178,7 +178,7 @@ Feature: The activity results block displays student in visible groups low score
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group" in the "Activity results" "block"
     And I should see "85.00%" in the "Activity results" "block"
     And I should see "75.00%" in the "Activity results" "block"
@@ -195,7 +195,7 @@ Feature: The activity results block displays student in visible groups low score
     And I press "Save changes"
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Group" in the "Activity results" "block"
     And I should see "85.00%" in the "Activity results" "block"
     And I should see "75.00%" in the "Activity results" "block"

diff --git a/blocks/badges/tests/behat/block_badges.feature b/blocks/badges/tests/behat/block_badges.feature
index e9da78a..5c8a233 100644 (file)
--- a/blocks/badges/tests/behat/block_badges.feature
+++ b/blocks/badges/tests/behat/block_badges.feature
@@ -21,14 +21,14 @@ Feature: Enable Block Badges in a course without badges
       | enablebadges | 0 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Latest badges" block
     Then I should see "Badges are not enabled on this site." in the "Latest badges" "block"
 
   Scenario: Add the block to a the course when badges are enabled
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Latest badges" block
     Then I should see "You have no badges to display" in the "Latest badges" "block"

diff --git a/blocks/badges/tests/behat/block_badges_course.feature b/blocks/badges/tests/behat/block_badges_course.feature
index 3f16fa4..88415ab 100644 (file)
--- a/blocks/badges/tests/behat/block_badges_course.feature
+++ b/blocks/badges/tests/behat/block_badges_course.feature
@@ -15,7 +15,7 @@ Feature: Enable Block Badges in a course
       | user | course | role |
       | teacher1 | C1 | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     # Issue badge 1 of 2
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I set the following fields to these values:
@@ -54,7 +54,7 @@ Feature: Enable Block Badges in a course
 
   Scenario: Add the recent badges block to a course.
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Latest badges" block
     Then I should see "Badge 1" in the "Latest badges" "block"
@@ -62,7 +62,7 @@ Feature: Enable Block Badges in a course
 
   Scenario: Add the recent badges block to a course and limit it to only display 1 badge.
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Latest badges" block
     And I configure the "Latest badges" block

diff --git a/blocks/badges/tests/behat/block_badges_dashboard.feature b/blocks/badges/tests/behat/block_badges_dashboard.feature
index 3f87995..6240fe4 100644 (file)
--- a/blocks/badges/tests/behat/block_badges_dashboard.feature
+++ b/blocks/badges/tests/behat/block_badges_dashboard.feature
@@ -15,7 +15,7 @@ Feature: Enable Block Badges on the dashboard and view awarded badges
       | user | course | role |
       | teacher1 | C1 | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     # Issue badge 1 of 2
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I set the following fields to these values:

diff --git a/blocks/badges/tests/behat/block_badges_frontpage.feature b/blocks/badges/tests/behat/block_badges_frontpage.feature
index c6b0425..edb484b 100644 (file)
--- a/blocks/badges/tests/behat/block_badges_frontpage.feature
+++ b/blocks/badges/tests/behat/block_badges_frontpage.feature
@@ -20,7 +20,7 @@ Feature: Enable Block Badges on the frontpage and view awarded badges
     And I add the "Latest badges" block
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     # Issue badge 1 of 2
     And I navigate to "Add a new badge" node in "Course administration > Badges"
     And I set the following fields to these values:

diff --git a/blocks/blog_menu/tests/behat/block_blog_menu.feature b/blocks/blog_menu/tests/behat/block_blog_menu.feature
index b93728f..87b516f 100644 (file)
--- a/blocks/blog_menu/tests/behat/block_blog_menu.feature
+++ b/blocks/blog_menu/tests/behat/block_blog_menu.feature
@@ -21,7 +21,7 @@ Feature: Enable Block blog menu in a course
       | enableblogs | 0 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Blog menu" block
     Then I should see "Blogging is disabled!" in the "Blog menu" "block"
@@ -32,7 +32,7 @@ Feature: Enable Block blog menu in a course
       | useblogassociations | 0 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Blog menu" block
     Then I should see "Blog entries" in the "Blog menu" "block"
@@ -47,7 +47,7 @@ Feature: Enable Block blog menu in a course
       | useblogassociations | 1 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Blog menu" block
     Then I should see "Blog entries" in the "Blog menu" "block"
@@ -62,7 +62,7 @@ Feature: Enable Block blog menu in a course
       | enablerssfeeds | 0 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Blog menu" block
     Then I should not see "Blog RSS feed" in the "Blog menu" "block"
@@ -74,7 +74,7 @@ Feature: Enable Block blog menu in a course
       | enablerssfeeds | 1 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Blog menu" block
     Then I should see "Blog RSS feed" in the "Blog menu" "block"

diff --git a/blocks/blog_menu/tests/behat/block_blog_menu_activity.feature b/blocks/blog_menu/tests/behat/block_blog_menu_activity.feature
index 6b8001f..fcd297a 100644 (file)
--- a/blocks/blog_menu/tests/behat/block_blog_menu_activity.feature
+++ b/blocks/blog_menu/tests/behat/block_blog_menu_activity.feature
@@ -19,7 +19,7 @@ Feature: Enable Block blog menu in an activity
       | student1 | C1 | student |
       | student2 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment 1 |
@@ -31,7 +31,7 @@ Feature: Enable Block blog menu in an activity
 
   Scenario: Students use the blog menu block to post blogs
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add a new entry"
     When I set the following fields to these values:
@@ -41,7 +41,7 @@ Feature: Enable Block blog menu in an activity
     Then I should see "S1 First Blog"
     And I should see "This is my awesome blog!"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Blog entries"
     And I should see "S1 First Blog"
@@ -49,7 +49,7 @@ Feature: Enable Block blog menu in an activity
 
   Scenario: Students use the blog menu block to view their blogs about the activity
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -61,7 +61,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "Associated Assignment: Test assignment 1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
@@ -72,7 +72,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My unrelated blog!"
     And I should not see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -83,7 +83,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My course blog is better!"
     And I should see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     When I follow "View my entries about this Assignment"
     Then I should see "S2 First Blog"
@@ -92,7 +92,7 @@ Feature: Enable Block blog menu in an activity
 
   Scenario: Students use the blog menu block to view all blogs about the assignment
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -104,7 +104,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "Associated Assignment: Test assignment 1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
@@ -115,7 +115,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My unrelated blog!"
     And I should not see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -126,7 +126,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My course blog is better!"
     And I should see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     When I follow "View all entries about this Assignment"
     Then I should see "S1 First Blog"
@@ -135,7 +135,7 @@ Feature: Enable Block blog menu in an activity
 
   Scenario: Students use the blog menu block to view all their blog entries
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -147,7 +147,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "Associated Assignment: Test assignment 1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
@@ -158,7 +158,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My unrelated blog!"
     And I should not see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -169,7 +169,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My course blog is better!"
     And I should see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     When I follow "Blog entries"
     Then I should see "S2 First Blog"
@@ -178,7 +178,7 @@ Feature: Enable Block blog menu in an activity
 
   Scenario: Teacher searches for student blogs
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -190,7 +190,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "Associated Assignment: Test assignment 1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
@@ -201,7 +201,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "My unrelated blog!"
     And I should not see "Associated Assignment: Test assignment 1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     And I set the following fields to these values:
@@ -213,7 +213,7 @@ Feature: Enable Block blog menu in an activity
     And I should see "Associated Assignment: Test assignment 1"
     And I log out
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I set the field "blogsearchquery" to "First"
     And I press "Search"

diff --git a/blocks/blog_menu/tests/behat/block_blog_menu_course.feature b/blocks/blog_menu/tests/behat/block_blog_menu_course.feature
index 76ceb37..5ea35dd 100644 (file)
--- a/blocks/blog_menu/tests/behat/block_blog_menu_course.feature
+++ b/blocks/blog_menu/tests/behat/block_blog_menu_course.feature
@@ -19,14 +19,14 @@ Feature: Students can use block blog menu in a course
       | student1 | C1 | student |
       | student2 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Blog menu" block
     And I log out
 
   Scenario: Students use the blog menu block to post blogs
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add a new entry"
     When I set the following fields to these values:
       | Entry title | S1 First Blog |
@@ -35,14 +35,14 @@ Feature: Students can use block blog menu in a course
     Then I should see "S1 First Blog"
     And I should see "This is my awesome blog!"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Blog entries"
     And I should see "S1 First Blog"
     And I should see "This is my awesome blog!"
 
   Scenario: Students use the blog menu block to view their blogs about the course
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S1 First Blog |
@@ -53,7 +53,7 @@ Feature: Students can use block blog menu in a course
     And I should see "Associated Course: C1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
       | Entry title | S2 Second Blog |
@@ -63,7 +63,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My unrelated blog!"
     And I should not see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S2 First Blog |
@@ -73,7 +73,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My course blog is better!"
     And I should see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     When I follow "View my entries about this course"
     Then I should see "S2 First Blog"
     And I should not see "S2 Second Blog"
@@ -81,7 +81,7 @@ Feature: Students can use block blog menu in a course
 
   Scenario: Students use the blog menu block to view all blogs about the course
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S1 First Blog |
@@ -92,7 +92,7 @@ Feature: Students can use block blog menu in a course
     And I should see "Associated Course: C1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
       | Entry title | S2 Second Blog |
@@ -102,7 +102,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My unrelated blog!"
     And I should not see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S2 First Blog |
@@ -112,7 +112,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My course blog is better!"
     And I should see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     When I follow "View all entries for this course"
     Then I should see "S1 First Blog"
     And I should see "S2 First Blog"
@@ -120,7 +120,7 @@ Feature: Students can use block blog menu in a course
 
   Scenario: Students use the blog menu block to view all their blog entries
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S1 First Blog |
@@ -131,7 +131,7 @@ Feature: Students can use block blog menu in a course
     And I should see "Associated Course: C1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
       | Entry title | S2 Second Blog |
@@ -141,7 +141,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My unrelated blog!"
     And I should not see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S2 First Blog |
@@ -151,7 +151,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My course blog is better!"
     And I should see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     When I follow "Blog entries"
     Then I should see "S2 First Blog"
     And I should see "S2 Second Blog"
@@ -159,7 +159,7 @@ Feature: Students can use block blog menu in a course
 
   Scenario: Teacher searches for student blogs
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S1 First Blog |
@@ -170,7 +170,7 @@ Feature: Students can use block blog menu in a course
     And I should see "Associated Course: C1"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add a new entry"
     And I set the following fields to these values:
       | Entry title | S2 Second Blog |
@@ -180,7 +180,7 @@ Feature: Students can use block blog menu in a course
     And I should see "My unrelated blog!"
     And I should not see "Associated Course: C1"
     And I follow "Dashboard"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     And I set the following fields to these values:
       | Entry title | S2 First Blog |
@@ -191,7 +191,7 @@ Feature: Students can use block blog menu in a course
     And I should see "Associated Course: C1"
     And I log out
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I set the field "blogsearchquery" to "First"
     And I press "Search"
     Then I should see "S1 First Blog"

diff --git a/blocks/blog_recent/tests/behat/block_blog_recent.feature b/blocks/blog_recent/tests/behat/block_blog_recent.feature
index 6c3f73b..e5c1508 100644 (file)
--- a/blocks/blog_recent/tests/behat/block_blog_recent.feature
+++ b/blocks/blog_recent/tests/behat/block_blog_recent.feature
@@ -21,14 +21,14 @@ Feature: Feature: Users can use the recent blog entries block to view recent blo
       | enableblogs | 0 |
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Recent blog entries" block
     Then I should see "Blogging is disabled!" in the "Recent blog entries" "block"
 
   Scenario: Add the recent blogs block to a course when there are not any blog posts
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Recent blog entries" block
     Then I should see "No recent entries" in the "Recent blog entries" "block"

diff --git a/blocks/blog_recent/tests/behat/block_blog_recent_activity.feature b/blocks/blog_recent/tests/behat/block_blog_recent_activity.feature
index fae3f4a..dae2c8c 100644 (file)
--- a/blocks/blog_recent/tests/behat/block_blog_recent_activity.feature
+++ b/blocks/blog_recent/tests/behat/block_blog_recent_activity.feature
@@ -19,7 +19,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
       | student1 | C1 | student |
       | student2 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment 1 |
@@ -32,7 +32,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
 
   Scenario: Students use the recent blog entries block to view blogs
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     When I set the following fields to these values:
@@ -48,7 +48,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
 
   Scenario: Students only see a few entries in the recent blog entries block
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test assignment 1"
     And I follow "Add an entry about this Assignment"
     # Blog 1 of 5
@@ -106,7 +106,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
     And I should see "This is my awesome blog!"
     Then I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I follow "Test assignment 1"
     And I configure the "Recent blog entries" block

diff --git a/blocks/blog_recent/tests/behat/block_blog_recent_course.feature b/blocks/blog_recent/tests/behat/block_blog_recent_course.feature
index f06fad3..7bf2e3a 100644 (file)
--- a/blocks/blog_recent/tests/behat/block_blog_recent_course.feature
+++ b/blocks/blog_recent/tests/behat/block_blog_recent_course.feature
@@ -17,7 +17,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Blog menu" block
     And I add the "Recent blog entries" block
@@ -25,7 +25,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
 
   Scenario: Students use the recent blog entries block to view blogs
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     When I set the following fields to these values:
       | Entry title | S1 First Blog |
@@ -40,7 +40,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
 
   Scenario: Students only see a few entries in the recent blog entries block
     Given I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Add an entry about this course"
     # Blog 1 of 5
     And I set the following fields to these values:
@@ -97,7 +97,7 @@ Feature: Students can use the recent blog entries block to view recent entries o
     And I should see "This is my awesome blog!"
     Then I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I configure the "Recent blog entries" block
     And I set the following fields to these values:

diff --git a/blocks/blog_tags/tests/behat/blogtag.feature b/blocks/blog_tags/tests/behat/blogtag.feature
index 60572e1..c6b06b3 100644 (file)
--- a/blocks/blog_tags/tests/behat/blogtag.feature
+++ b/blocks/blog_tags/tests/behat/blogtag.feature
@@ -21,7 +21,7 @@ Feature: Adding blog tag block
       | teacher1 | c1     | editingteacher |
       | student1 | c1     | student        |
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Blog tags" block
     # TODO MDL-57120 site "Blogs" link not accessible without navigation block.
@@ -37,7 +37,7 @@ Feature: Adding blog tag block
     And I press "Save changes"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to course participants
     And I click on "Course blogs" "link" in the "Navigation" "block"
     And I follow "Blog about this Course"

diff --git a/blocks/calendar_month/tests/behat/block_calendar_month.feature b/blocks/calendar_month/tests/behat/block_calendar_month.feature
index e4952e8..7503e3a 100644 (file)
--- a/blocks/calendar_month/tests/behat/block_calendar_month.feature
+++ b/blocks/calendar_month/tests/behat/block_calendar_month.feature
@@ -21,7 +21,7 @@ Feature: Enable the calendar block in a course and test it's functionality
 
   Scenario: Add the block to a the course
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Calendar" block
     Then I should see "Events key" in the "Calendar" "block"
@@ -34,7 +34,7 @@ Feature: Enable the calendar block in a course and test it's functionality
       | id_name | Site Event |
     And I log out
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I hover over today in the calendar
@@ -48,13 +48,13 @@ Feature: Enable the calendar block in a course and test it's functionality
       | id_name | Site Event |
     And I log out
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I create a calendar event with form data:
       | id_eventtype | Course |
       | id_name | Course Event |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Hide global events"
     And I hover over today in the calendar
     Then I should not see "Site Event"
@@ -63,31 +63,31 @@ Feature: Enable the calendar block in a course and test it's functionality
   @javascript
   Scenario: View a course event in the calendar block
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I create a calendar event with form data:
       | id_eventtype | Course |
       | id_name | Course Event |
-    When I follow "Course 1"
+    When I am on course page "Course 1"
     And I hover over today in the calendar
     Then I should see "Course Event"
 
   @javascript
   Scenario: Filter course events in the calendar block
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I create a calendar event with form data:
       | id_eventtype | Course |
       | id_name | Course Event |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I create a calendar event with form data:
       | id_eventtype | User |
       | id_name | User Event |
     When I am on homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Hide course events"
     And I hover over today in the calendar
     Then I should not see "Course Event"
@@ -96,32 +96,32 @@ Feature: Enable the calendar block in a course and test it's functionality
   @javascript
   Scenario: View a user event in the calendar block
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I create a calendar event with form data:
       | id_eventtype | User |
       | id_name | User Event |
     When I am on homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I hover over today in the calendar
     Then I should see "User Event"
 
   @javascript
   Scenario: Filter user events in the calendar block
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I create a calendar event with form data:
       | id_eventtype | Course |
       | id_name | Course Event |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I create a calendar event with form data:
       | id_eventtype | User |
       | id_name | User Event |
     When I am on homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Hide user events"
     And I hover over today in the calendar
     Then I should not see "User Event"
@@ -138,7 +138,7 @@ Feature: Enable the calendar block in a course and test it's functionality
       | student1 | G1 |
       | student2 | G2 |
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I set the following fields to these values:
       | id_groupmode | Separate groups |
@@ -152,12 +152,12 @@ Feature: Enable the calendar block in a course and test it's functionality
       | id_name | Group Event |
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I hover over today in the calendar
     And I should see "Group Event"
     And I log out
     And I log in as "student2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I hover over today in the calendar
     And I should not see "Group Event"
 
@@ -172,7 +172,7 @@ Feature: Enable the calendar block in a course and test it's functionality
       | student1 | G1 |
       | student2 | G2 |
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Edit settings" node in "Course administration"
     And I set the following fields to these values:
       | id_groupmode | Separate groups |
@@ -183,14 +183,14 @@ Feature: Enable the calendar block in a course and test it's functionality
     And I create a calendar event with form data:
       | id_eventtype | Course |
       | id_name | Course Event 1 |
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I create a calendar event with form data:
       | id_eventtype | Group |
       | id_groupid | Group 1 |
       | id_name | Group Event 1 |
     And I log out
     Then I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Hide group events"
     And I hover over today in the calendar
     And I should not see "Group Event 1"

diff --git a/blocks/calendar_month/tests/behat/block_calendar_month_course.feature b/blocks/calendar_month/tests/behat/block_calendar_month_course.feature
index 1c59a60..e87bd08 100644 (file)
--- a/blocks/calendar_month/tests/behat/block_calendar_month_course.feature
+++ b/blocks/calendar_month/tests/behat/block_calendar_month_course.feature
@@ -21,7 +21,7 @@ Feature: Enable the calendar block in a course
       | id_name | Site Event |
     And I log out
     Then I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Calendar" block
     And I hover over today in the calendar

diff --git a/blocks/comments/tests/behat/add_comment.feature b/blocks/comments/tests/behat/add_comment.feature
index 7aa437f..d400237 100644 (file)
--- a/blocks/comments/tests/behat/add_comment.feature
+++ b/blocks/comments/tests/behat/add_comment.feature
@@ -17,12 +17,12 @@ Feature: Add a comment to the comments block
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Comments" block
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
 
   @javascript
   Scenario: Add a comment with Javascript enabled
@@ -69,7 +69,7 @@ Feature: Add a comment to the comments block
     And I add "Super test comment 31" comment to comments block
     Then I should see "Super test comment 01"
     And I should see "Super test comment 31"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should not see "Super test comment 01"
     And I should not see "Super test comment 02"
     And I should not see "Super test comment 16"

diff --git a/blocks/comments/tests/behat/block_comment_activity.feature b/blocks/comments/tests/behat/block_comment_activity.feature
index d2a3180..d800674 100644 (file)
--- a/blocks/comments/tests/behat/block_comment_activity.feature
+++ b/blocks/comments/tests/behat/block_comment_activity.feature
@@ -20,7 +20,7 @@ Feature: Enable Block comments on an activity page and view comments
       | activity | course | idnumber | name           | intro                 |
       | page    | C1      | page1    | Test page name | Test page description |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I follow "Test page name"
     And I add the "Comments" block
@@ -28,7 +28,7 @@ Feature: Enable Block comments on an activity page and view comments
     And I add "I'm a comment from the teacher" comment to comments block
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test page name"
     And I follow "Show comments"
     Then I should see "I'm a comment from the teacher"

diff --git a/blocks/comments/tests/behat/block_comment_course.feature b/blocks/comments/tests/behat/block_comment_course.feature
index c3acbc4..9ee5143 100644 (file)
--- a/blocks/comments/tests/behat/block_comment_course.feature
+++ b/blocks/comments/tests/behat/block_comment_course.feature
@@ -17,13 +17,13 @@ Feature: Enable Block comments on a course page and view comments
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Comments" block
     And I follow "Show comments"
     And I add "I'm a comment from the teacher" comment to comments block
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Show comments"
     Then I should see "I'm a comment from the teacher"

diff --git a/blocks/comments/tests/behat/delete_comment.feature b/blocks/comments/tests/behat/delete_comment.feature
index 73f78dd..52421fc 100644 (file)
--- a/blocks/comments/tests/behat/delete_comment.feature
+++ b/blocks/comments/tests/behat/delete_comment.feature
@@ -18,16 +18,16 @@ Feature: Delete comment block messages
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Comments" block
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add "Comment from student1" comment to comments block
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I add "Comment from teacher1" comment to comments block
     When I delete "Comment from student1" comment from comments block
     Then I should not see "Comment from student1"

diff --git a/blocks/completionstatus/tests/behat/block_completionstatus.feature b/blocks/completionstatus/tests/behat/block_completionstatus.feature
index 9fd8295..f01348e 100644 (file)
--- a/blocks/completionstatus/tests/behat/block_completionstatus.feature
+++ b/blocks/completionstatus/tests/behat/block_completionstatus.feature
@@ -19,7 +19,7 @@ Feature: Enable Block Completion in a course
 
   Scenario: Add the block to a the course where completion is disabled
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I navigate to "Edit settings" node in "Course administration"
     And I set the following fields to these values:
@@ -30,7 +30,7 @@ Feature: Enable Block Completion in a course
 
   Scenario: Add the block to a the course where completion is not set
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Course completion status" block
     Then I should see "No completion criteria set for this course" in the "Course completion status" "block"
@@ -40,7 +40,7 @@ Feature: Enable Block Completion in a course
       | activity | course | idnumber | name           | intro                 |
       | page     | C1     | page1    | Test page name | Test page description |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I follow "Test page name"
     And I navigate to "Edit settings" in current page administration

diff --git a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature
index 0a31bb7..2d207c6 100644 (file)
--- a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature
+++ b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature
@@ -22,7 +22,7 @@ Feature: Enable Block Completion in a course using activity completion
 
   Scenario: Add the block to a the course and add course completion items
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I follow "Test page name"
     And I navigate to "Edit settings" in current page administration
@@ -38,13 +38,13 @@ Feature: Enable Block Completion in a course using activity completion
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Status: Not yet started" in the "Course completion status" "block"
     And I should see "0 of 1" in the "Activity completion" "table_row"
 
   Scenario: Add the block to a the course and add course completion items
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I follow "Test page name"
     And I navigate to "Edit settings" in current page administration
@@ -60,14 +60,14 @@ Feature: Enable Block Completion in a course using activity completion
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I follow "Test page name"
     And I follow "C1"
     Then I should see "Status: Pending" in the "Course completion status" "block"
     And I should see "0 of 1" in the "Activity completion" "table_row"
     And I trigger cron
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "1 of 1" in the "Activity completion" "table_row"
     And I follow "More details"
     And I should see "Yes" in the "Activity completion" "table_row"

diff --git a/blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature b/blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
index 7d4c3f6..bc3c00c 100644 (file)
--- a/blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
+++ b/blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
@@ -21,7 +21,7 @@ Feature: Enable Block Completion in a course using manual completion by others
 
   Scenario: Add the block to a the course and mark a student complete.
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Course completion status" block
     And I navigate to "Course completion" node in "Course administration"
@@ -31,12 +31,12 @@ Feature: Enable Block Completion in a course using manual completion by others
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Status: Not yet started" in the "Course completion status" "block"
     And I should see "No" in the "Teacher" "table_row"
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Course completion" node in "Course administration > Reports"
     And I follow "Click to mark user complete"
     # Running completion task just after clicking sometimes fail, as record
@@ -46,7 +46,7 @@ Feature: Enable Block Completion in a course using manual completion by others
     And I am on site homepage
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Status: Complete" in the "Course completion status" "block"
     And I should see "Yes" in the "Teacher" "table_row"
     And I follow "More details"
@@ -54,7 +54,7 @@ Feature: Enable Block Completion in a course using manual completion by others
 
   Scenario: Add the block to a the course and require multiple roles to mark a student complete.
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Course completion status" block
     And I navigate to "Course completion" node in "Course administration"
@@ -66,18 +66,18 @@ Feature: Enable Block Completion in a course using manual completion by others
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Status: Not yet started" in the "Course completion status" "block"
     And I should see "No" in the "Teacher" "table_row"
     And I should see "No" in the "Non-editing teacher" "table_row"
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Course completion" node in "Course administration > Reports"
     And I follow "Click to mark user complete"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Status: In progress" in the "Course completion status" "block"
     And I should see "Yes" in the "Teacher" "table_row"
     And I should see "No" in the "Non-editing teacher" "table_row"
@@ -86,7 +86,7 @@ Feature: Enable Block Completion in a course using manual completion by others
     And I should see "No" in the "Marked complete by Non-editing teacher" "table_row"
     And I log out
     And I log in as "teacher2"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I navigate to "Course completion" node in "Course administration > Reports"
     And I follow "Click to mark user complete"
     # Running completion task just after clicking sometimes fail, as record
@@ -96,7 +96,7 @@ Feature: Enable Block Completion in a course using manual completion by others
     And I am on site homepage
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Status: Complete" in the "Course completion status" "block"
     And I should see "Yes" in the "Teacher" "table_row"
     And I should see "Yes" in the "Non-editing teacher" "table_row"

diff --git a/blocks/completionstatus/tests/behat/block_completionstatus_manual_self.feature b/blocks/completionstatus/tests/behat/block_completionstatus_manual_self.feature
index 81b0298..e46596f 100644 (file)
--- a/blocks/completionstatus/tests/behat/block_completionstatus_manual_self.feature
+++ b/blocks/completionstatus/tests/behat/block_completionstatus_manual_self.feature
@@ -17,7 +17,7 @@ Feature: Enable Block Completion in a course using manual self completion
       | teacher1 | C1     | editingteacher |
       | student1 | C1     | student        |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Course completion status" block
     And I add the "Self completion" block
@@ -28,7 +28,7 @@ Feature: Enable Block Completion in a course using manual self completion
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Status: Not yet started" in the "Course completion status" "block"
     And I should see "No" in the "Self completion" "table_row"
     And I follow "Complete course"
@@ -40,7 +40,7 @@ Feature: Enable Block Completion in a course using manual self completion
     And I wait "1" seconds
     And I run the scheduled task "core\task\completion_regular_task"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Status: Complete" in the "Course completion status" "block"
     And I should see "Yes" in the "Self completion" "table_row"
     And I follow "More details"

diff --git a/blocks/course_list/tests/behat/block_course_list_category.feature b/blocks/course_list/tests/behat/block_course_list_category.feature
index c427300..ebb64e4 100644 (file)
--- a/blocks/course_list/tests/behat/block_course_list_category.feature
+++ b/blocks/course_list/tests/behat/block_course_list_category.feature
@@ -58,7 +58,7 @@ Feature: Enable the course_list block on a category page and view it's contents
     And I should see "Course 2" in the "My courses" "block"
     And I should see "Course 3" in the "My courses" "block"
     And I should not see "Course 4" in the "My courses" "block"
-    And I follow "Course 3"
+    And I am on course page "Course 3"
     And I should see "Course 3"
 
   Scenario: Add the course list block on category page and view as an admin

diff --git a/blocks/course_list/tests/behat/block_course_list_course.feature b/blocks/course_list/tests/behat/block_course_list_course.feature
index 0441dfb..393da8e 100644 (file)
--- a/blocks/course_list/tests/behat/block_course_list_course.feature
+++ b/blocks/course_list/tests/behat/block_course_list_course.feature
@@ -27,7 +27,7 @@ Feature: Enable the course_list block on a course page and view it's contents
 
   Scenario: Add the course list block on course page and navigate to the course listing
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Courses" block
     Then I should see "Course 1" in the "My courses" "block"
@@ -39,20 +39,20 @@ Feature: Enable the course_list block on a course page and view it's contents
 
   Scenario: Add the course list block on course page and navigate to another course
     Given I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Courses" block
     Then I should see "Course 1" in the "My courses" "block"
     And I should see "Course 2" in the "My courses" "block"
     And I should see "Course 3" in the "My courses" "block"
     And I should not see "Course 4" in the "My courses" "block"
-    And I follow "Course 3"
+    And I am on course page "Course 3"
     And I should see "Course 3"
 
   Scenario: Add the course list block on course page and view as an admin
     Given I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Courses" block
     Then I should see "Miscellaneous" in the "Course categories" "block"
@@ -68,7 +68,7 @@ Feature: Enable the course_list block on a course page and view it's contents
     Given the following config values are set as admin:
       | block_course_list_hideallcourseslink | 1 |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Courses" block
     Then I should not see "All courses" in the "My courses" "block"
@@ -81,7 +81,7 @@ Feature: Enable the course_list block on a course page and view it's contents
       | admin | C1 | editingteacher |
     And I log in as "admin"
     And I am on site homepage
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     When I add the "Courses" block
     Then I should not see "Miscellaneous" in the "My courses" "block"

diff --git a/blocks/course_list/tests/behat/block_course_list_dashboard.feature b/blocks/course_list/tests/behat/block_course_list_dashboard.feature
index 33f5059..42211ed 100644 (file)
--- a/blocks/course_list/tests/behat/block_course_list_dashboard.feature
+++ b/blocks/course_list/tests/behat/block_course_list_dashboard.feature
@@ -44,7 +44,7 @@ Feature: Enable the course_list block on the dashboard and view it's contents
     And I should see "Course 2" in the "My courses" "block"
     And I should see "Course 3" in the "My courses" "block"
     And I should not see "Course 4" in the "My courses" "block"
-    And I follow "Course 3"
+    And I am on course page "Course 3"
     And I should see "Course 3"
 
   Scenario: Add the course list block on the dashboard and view as an admin

diff --git a/blocks/course_list/tests/behat/block_course_list_frontpage.feature b/blocks/course_list/tests/behat/block_course_list_frontpage.feature
index e13a380..02189f1 100644 (file)
--- a/blocks/course_list/tests/behat/block_course_list_frontpage.feature
+++ b/blocks/course_list/tests/behat/block_course_list_frontpage.feature
@@ -52,7 +52,7 @@ Feature: Enable the course_list block on the frontpage and view it's contents
     And I should see "Course 2" in the "My courses" "block"
     And I should see "Course 3" in the "My courses" "block"
     And I should not see "Course 4" in the "My courses" "block"
-    And I follow "Course 3"
+    And I am on course page "Course 3"
     And I should see "Course 3"
 
   Scenario: Add the course list block on the frontpage page and view as an admin

diff --git a/blocks/course_summary/tests/behat/block_course_summary_course.feature b/blocks/course_summary/tests/behat/block_course_summary_course.feature
index defb9f7..e8ff436 100644 (file)
--- a/blocks/course_summary/tests/behat/block_course_summary_course.feature
+++ b/blocks/course_summary/tests/behat/block_course_summary_course.feature
@@ -17,21 +17,21 @@ Feature: Course summary block used in a course
       | student1    | C101   | student |
       | teacher1    | C101   | editingteacher |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Course/site summary" block
     And I log out
 
   Scenario: Student can view course summary
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then "Course summary" "block" should exist
     And I should see "Course summary" in the "Course summary" "block"
     And I should see "Proved the course summary block works!" in the "Course summary" "block"
 
   Scenario: Teacher can not see edit icon when edit mode is off
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "Proved the course summary block works!" in the "Course summary" "block"
     And I should see "Course summary" in the "Course summary" "block"
     And "Edit" "link" should not exist in the "Course summary" "block"

diff --git a/blocks/glossary_random/tests/behat/glossary_random.feature b/blocks/glossary_random/tests/behat/glossary_random.feature
index 974a1ff..73eebd0 100644 (file)
--- a/blocks/glossary_random/tests/behat/glossary_random.feature
+++ b/blocks/glossary_random/tests/behat/glossary_random.feature
@@ -19,13 +19,13 @@ Feature: Random glossary entry block is used in a course
 
   Scenario: Student can not see the block if it is not configured
     When I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Random glossary entry" block
     Then I should see "Please configure this block using the edit icon" in the "block_glossary_random" "block"
     And I log out
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And "block_glossary_random" "block" should not exist
     And I log out
 
@@ -34,7 +34,7 @@ Feature: Random glossary entry block is used in a course
       | activity | name         | intro                     | course | idnumber  | defaultapproval |
       | glossary | GlossaryAuto | Test glossary description | C1     | glossary1 | 1               |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Random glossary entry" block
     And I configure the "block_glossary_random" block
@@ -45,14 +45,14 @@ Feature: Random glossary entry block is used in a course
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "There are no entries yet in the chosen glossary" in the "AutoGlossaryblock" "block"
     And I click on "Add a new entry" "link" in the "AutoGlossaryblock" "block"
     And I set the following fields to these values:
       | Concept    | Concept1    |
       | Definition | Definition1 |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Concept1" in the "AutoGlossaryblock" "block"
     And I should see "Definition1" in the "AutoGlossaryblock" "block"
     And I should not see "There are no entries yet in the chosen glossary" in the "AutoGlossaryblock" "block"
@@ -61,7 +61,7 @@ Feature: Random glossary entry block is used in a course
       | Concept    | Concept2    |
       | Definition | Definition2 |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     # Only the last entry appears in the block
     And I should not see "Concept1" in the "AutoGlossaryblock" "block"
     And I should not see "Definition1" in the "AutoGlossaryblock" "block"
@@ -78,7 +78,7 @@ Feature: Random glossary entry block is used in a course
       | activity | name           | intro                     | course | idnumber  | defaultapproval |
       | glossary | GlossaryManual | Test glossary description | C1     | glossary2 | 0               |
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Random glossary entry" block
     And I configure the "block_glossary_random" block
@@ -89,18 +89,18 @@ Feature: Random glossary entry block is used in a course
     And I press "Save changes"
     And I log out
     When I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     Then I should see "There are no entries yet in the chosen glossary" in the "ManualGlossaryblock" "block"
     And I click on "Add a new entry" "link" in the "ManualGlossaryblock" "block"
     And I set the following fields to these values:
       | Concept    | Concept1    |
       | Definition | Definition1 |
     And I press "Save changes"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "There are no entries yet in the chosen glossary" in the "ManualGlossaryblock" "block"
     And I log out
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "There are no entries yet in the chosen glossary" in the "ManualGlossaryblock" "block"
     And I follow "GlossaryManual"
     And I follow "Waiting approval"

diff --git a/blocks/glossary_random/tests/behat/glossary_random_global.feature b/blocks/glossary_random/tests/behat/glossary_random_global.feature
index 2eea426..eabde28 100644 (file)
--- a/blocks/glossary_random/tests/behat/glossary_random_global.feature
+++ b/blocks/glossary_random/tests/behat/glossary_random_global.feature
@@ -24,7 +24,7 @@ Feature: Random glossary entry block linking to global glossary
   Scenario: View random (last) entry in the global glossary
     When I log in as "admin"
     And I am on site homepage
-    And I follow "Course 2"
+    And I am on course page "Course 2"
     And I follow "Tips and Tricks"
     And I press "Add a new entry"
     And I set the following fields to these values:
@@ -34,7 +34,7 @@ Feature: Random glossary entry block linking to global glossary
     And I log out
     # As a teacher add a block to the course page linking to the global glossary.
     And I log in as "teacher1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I turn editing mode on
     And I add the "Random glossary entry" block
     And I configure the "block_glossary_random" block
@@ -49,7 +49,7 @@ Feature: Random glossary entry block linking to global glossary
     And I log out
     # Student who can't see the module is still able to view entries in this block (because the glossary was marked as global)
     And I log in as "student1"
-    And I follow "Course 1"
+    And I am on course page "Course 1"
     And I should see "Never come late" in the "Tip of the day" "block"
     And I should not see "Add a new entry" in the "Tip of the day" "block"
     And I should see "View all entries" in the "Tip of the day" "block"
@@ -57,7 +57,7 @@ Feature: Random glossary entry block linking to global glossary
 
   Scenario: Removing the global glossary that is used in random glossary block
     And I log in as "teacher1"
-