Merge branch 'MDL-44612-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE

mod/forum/tests/behat/edit_post_student.feature

@@ -40,7 +40,7 @@ Feature: Students can edit or delete their forum posts within a set time limit
     And I press "Continue"
     Then I should not see "Forum post subject"
 
-  @javascript
+  @javascript @block_recent_activity
   Scenario: Time limit expires
     Given I log out
     And I log in as "admin"
@@ -52,6 +52,8 @@ Feature: Students can edit or delete their forum posts within a set time limit
     And I log out
     And I log in as "student1"
     And I am on "Course 1" course homepage
+    And I should see "New forum posts:" in the "Recent activity" "block"
+    And I should see "Forum post subject" in the "Recent activity" "block"
     When I wait "61" seconds
     And I follow "Forum post subject"
     Then I should not see "Edit" in the "region-main" "region"

mod/glossary/tests/behat/import_entries.feature

@@ -0,0 +1,34 @@
+@mod @mod_glossary
+Feature: Importing glossary entries
+  In order to add glossary entries by bulk
+  As a teacher
+  I need to be able to import glossary entries from a file
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1 | 0 |
+    And the following "users" exist:
+      | username    | firstname | lastname | email            |
+      | teacher1    | Terry1    | Teacher1 | teacher1@example.com |
+    And the following "course enrolments" exist:
+      | user        | course | role           |
+      | teacher1    | C1     | editingteacher |
+    And the following "activities" exist:
+      | activity | course | idnumber  | name        |
+      | glossary | C1     | glossary1 | Glossary 1  |
+
+  @javascript @block_recent_activity
+  Scenario: Importing glossary entries and checking the Recent activity block
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Recent activity" block
+    And I follow "Glossary 1"
+    And I navigate to "Import entries" in current page administration
+    And I upload "mod/glossary/tests/fixtures/texfilter_glossary_en.xml" file to "File to import" filemanager
+    When I press "Submit"
+    Then I should see "103" in the "Total entries:" "table_row"
+    And I should see "103" in the "Imported entries:" "table_row"
+    And I am on "Course 1" course homepage
+    And I should see "Added Glossary" in the "Recent activity" "block"
+    And I should see "New glossary entries:" in the "Recent activity" "block"