MDL-22077 forum: Deprecate unused helper trait

moodle · Apr 4, 2019 · 12a1f9c · 12a1f9c
1 parent 6243019
commit 12a1f9c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 173 deletions.
diff --git a/mod/forum/tests/helper.php b/mod/forum/tests/helper.php
diff --git a/mod/forum/tests/privacy_provider_test.php b/mod/forum/tests/privacy_provider_test.php
@@ -26,7 +26,7 @@
 
 global $CFG;
 
-require_once(__DIR__ . '/helper.php');
+require_once(__DIR__ . '/generator_trait.php');
 require_once($CFG->dirroot . '/rating/lib.php');
 
 use \mod_forum\privacy\provider;
@@ -45,7 +45,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
 
     // Include the mod_forum test helpers.
     // This includes functions to create forums, users, discussions, and posts.
-    use helper;
+    use mod_forum_tests_generator_trait;
 
     // Include the privacy helper trait for the ratings API.
     use \core_rating\phpunit\privacy_helper;

diff --git a/mod/forum/tests/rsslib_test.php b/mod/forum/tests/rsslib_test.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
-require_once(__DIR__ . '/helper.php');
+require_once(__DIR__ . '/generator_trait.php');
 require_once("{$CFG->dirroot}/mod/forum/rsslib.php");
 
 /**
@@ -37,7 +37,7 @@
 class mod_forum_rsslib_testcase extends advanced_testcase {
     // Include the mod_forum test helpers.
     // This includes functions to create forums, users, discussions, and posts.
-    use helper;
+    use mod_forum_tests_generator_trait;
 
     /**
      * Ensure that deleted posts are not included.

diff --git a/mod/forum/tests/subscriptions_test.php b/mod/forum/tests/subscriptions_test.php
@@ -25,13 +25,13 @@
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
-require_once($CFG->dirroot . '/mod/forum/lib.php');
-require_once(__DIR__ . '/helper.php');
+require_once(__DIR__ . '/generator_trait.php');
+require_once("{$CFG->dirroot}/mod/forum/lib.php");
 
 class mod_forum_subscriptions_testcase extends advanced_testcase {
     // Include the mod_forum test helpers.
     // This includes functions to create forums, users, discussions, and posts.
-    use helper;
+    use mod_forum_tests_generator_trait;
 
     /**
      * Test setUp.