Merge branch '3.1.x' into 3441577-core-mr

scripts/src/ConverterCommand.php

@@ -742,11 +742,12 @@ class ConverterCommand extends Command {
   private static function copyGenericTest(string $new_module_path, string $core_dir): void {
     $parts = explode('/', $new_module_path);
     $module_name = array_pop($parts);
-    $original_test = "$core_dir/core/modules/action/tests/src/Functional/GenericTest.php";
+    $core_source_module = 'announcements_feed';
+    $original_test = "$core_dir/core/modules/$core_source_module/tests/src/Functional/GenericTest.php";
     $new_test = "$new_module_path/tests/src/Functional/GenericTest.php";
     $fs = new Filesystem();
     $fs->copy($original_test, $new_test);
-    static::replaceContents([new \SplFileInfo($new_test)], 'action', $module_name);
+    static::replaceContents([new \SplFileInfo($new_test)], $core_source_module, $module_name);
   }
 
   private function getContribModuleComposerJsonSection(string $section): array {