Merge branch 'MDL-62514-master' of git://github.com/andrewnicols/moodle

robjoyce · Jan 30, 2019 · 0c715af · 0c715af
2 parents 62b942a + bebb976
commit 0c715af
Show file tree

Hide file tree

Showing 14 changed files with 395 additions and 202 deletions.
diff --git a/cohort/tests/behat/upload_cohort_users.feature b/cohort/tests/behat/upload_cohort_users.feature
@@ -18,9 +18,11 @@ Feature: Upload users to a cohort
     And I am on "Course 1" course homepage
     And I add "Cohort sync" enrolment method with:
       | Cohort | Cohort 1 |
+    And I should see "Cohort sync (Cohort 1 - Student)"
     And I am on "Course 2" course homepage
     And I add "Cohort sync" enrolment method with:
       | Cohort | Cohort 2 |
+    And I should see "Cohort sync (Cohort 2 - Student)"
     When I navigate to "Users > Accounts > Upload users" in site administration
     And I upload "lib/tests/fixtures/upload_users_cohorts.csv" file to "File" filemanager
     And I press "Upload users"

diff --git a/lib/amd/build/form-autocomplete.min.js b/lib/amd/build/form-autocomplete.min.js
diff --git a/lib/amd/build/inplace_editable.min.js b/lib/amd/build/inplace_editable.min.js