Merge pull request #4660 from dpalou/MOBILE-4842

MOBILE-4842 behat: Fix self enrol behats due to MDL-87251

Author: crazyserver

src/core/features/enrol/tests/behat/self_enrol-501.feature

@@ -0,0 +1,48 @@
+@core_enrol @app @enrol @enrol_self @javascript @lms_upto5.1
+Feature: Users can auto-enrol themself in courses where self enrolment is allowed
+  In order to participate in courses while using the mobile app
+  As a user
+  I need to auto enrol me in courses
+
+  Background:
+    Given the Moodle site is compatible with this feature
+    And the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | student1 | Student | 1 | student1@example.com |
+      | student2 | Student | 2 | student2@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | format | initsections |
+      | Course 1 | C1        | topics | 1            |
+    And the following "course enrolments" exist:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+
+  Scenario: Self-enrolment enabled with simultaneous guest access
+    Given I log in as "teacher1"
+    And I am on the "Course 1" "enrolment methods" page
+    And I add "Self enrolment" enrolment method in "Course 1" with:
+      | Custom instance name     | Self enrolment (Student with password) |
+      | Enrolment key            | moodle_rules                           |
+    And I click on "Enable" "link" in the "Self enrolment (Student)" "table_row"
+    And I click on "Edit" "link" in the "Guest access" "table_row"
+    And I set the following fields to these values:
+      | Allow guest access | Yes |
+    And I press "Save changes"
+
+    When I entered the app as "student1"
+    And I press "Site home" in the app
+    And I press "Available courses" in the app
+    And I press "Course 1" in the app
+    Then I should find "Course summary" in the app
+    And I should find "Course" in the app
+    And I should find "Enrol me" in the app
+    And I should find "View course" in the app
+
+    When I press "Enrol me" in the app
+    Then I should find "Self enrolment (Student)" in the app
+    And I should find "Self enrolment (Student with password)" in the app
+
+    When I press "Self enrolment (Student)" in the app
+    Then I should find "Self enrolment (Student)" in the app
+    Then I should not find "Self enrolment (Student with password)" in the app

src/core/features/enrol/tests/behat/self_enrol.feature

@@ -1,11 +1,12 @@
-@core_enrol @app @enrol @enrol_self @javascript
+@core_enrol @app @enrol @enrol_self @javascript @lms_from5.1
 Feature: Users can auto-enrol themself in courses where self enrolment is allowed
   In order to participate in courses while using the mobile app
   As a user
   I need to auto enrol me in courses
 
   Background:
-    Given the following "users" exist:
+    Given the Moodle site is compatible with this feature
+    And the following "users" exist:
       | username | firstname | lastname | email |
       | teacher1 | Teacher | 1 | teacher1@example.com |
       | student1 | Student | 1 | student1@example.com |
@@ -124,9 +125,9 @@ Feature: Users can auto-enrol themself in courses where self enrolment is allowe
     Given I log in as "teacher1"
     And I am on the "Course 1" "enrolment methods" page
     And I add "Self enrolment" enrolment method in "Course 1" with:
-      | Custom instance name     | Self enrolment (Student with password) |
-      | Enrolment key            | moodle_rules           |
-    And I click on "Enable" "link" in the "Self enrolment (Student)" "table_row"
+      | Custom instance name     | Self enrolment as 'Student' with password |
+      | Enrolment key            | moodle_rules                              |
+    And I click on "Enable" "link" in the "Self enrolment as 'Student'" "table_row"
     And I click on "Edit" "link" in the "Guest access" "table_row"
     And I set the following fields to these values:
       | Allow guest access | Yes |
@@ -142,9 +143,9 @@ Feature: Users can auto-enrol themself in courses where self enrolment is allowe
     And I should find "View course" in the app
 
     When I press "Enrol me" in the app
-    Then I should find "Self enrolment (Student)" in the app
-    And I should find "Self enrolment (Student with password)" in the app
+    Then I should find "Self enrolment as 'Student'" in the app
+    And I should find "Self enrolment as 'Student' with password" in the app
 
-    When I press "Self enrolment (Student)" in the app
-    Then I should find "Self enrolment (Student)" in the app
-    Then I should not find "Self enrolment (Student with password)" in the app
+    When I press "Self enrolment as 'Student'" in the app
+    Then I should find "Self enrolment as 'Student'" in the app
+    Then I should not find "Self enrolment as 'Student' with password" in the app