Merge "Behat Testsuite: Tidying up institution features (Bug #1446395)"

test/behat/features/institution/add_institution.feature

-@javascript @core_institution
+@javascript @core_institution @core_administration
 Feature: Create an Institution
    In order to create an institution
    As an admin I need to go Administration
@@ -14,8 +14,8 @@ Scenario: Creating an institution (selenium test)
     And I follow "Institutions"
     And I press "Add institution"
     And I fill in the following:
-    | Institution name   | institutionone  |
-    | Institution display name    | institution One |
+    | Institution name | institutionone  |
+    | Institution display name | institution One |
     And I press "Submit"
     # Verifying the institution has been created
     Then I should see "Institution added successfully"

test/behat/features/institution/Institution.feature → test/behat/features/institution/institution.feature

-@javascript @core @institution
+@javascript @core @core_institution
 Feature: Mahara users can be a member of an institution
   As a mahara user
   I can be a member of at least one institution
@@ -7,14 +7,12 @@ Feature: Mahara users can be a member of an institution
     Given the following "users" exist:
       | username | password | email | firstname | lastname | institution | authname | role |
       | userA | Password1 | test01@example.com | Pete | Mc | mahara | internal | member |
-      | userB | Password1 | test02@example.com | Son | Nguyen | mahara | internal | member |
-      | userC | Password1 | test03@example.com | Jack | Smith | mahara | internal | member |
-      | userD | Password1 | test04@example.com | Eden | Wilson | mahara | internal | member |
-    And the following "institutions" exist:
+
+     And the following "institutions" exist:
       | name | displayname | registerallowed | registerconfirm |
       | instone | Institution One | ON | OFF |
-      | insttwo | Institution Two | ON | OFF |
+
   Scenario: Register to an institution
-    Given I log in as "userB" with password "Password1"
+    Given I log in as "userA" with password "Password1"
     When I go to "account/institutions.php"
-    Then I should see "Request membership of an institution"
\ No newline at end of file
+    Then I should see "Request membership of an institution"

test/behat/features/institution/institution_ configuration.feature

-@javascript @core @core_institution
+@javascript @core @core_institution @core_administration
 Feature: Changing the configuration when adding an institution.
 In order to change the way an institution is configured
 As an admin