diff --git a/admin/tool/behat/cli/util_single_run.php b/admin/tool/behat/cli/util_single_run.php index c42a908ced6..fa90359f174 100644 --- a/admin/tool/behat/cli/util_single_run.php +++ b/admin/tool/behat/cli/util_single_run.php @@ -189,9 +189,11 @@ if ($options['install']) { exit($code); } else if ($options['updatesteps']) { - $behatstepfile = __DIR__ . "/../../../../behat_features_step_count.json"; if (defined('BEHAT_FEATURE_STEP_FILE') && BEHAT_FEATURE_STEP_FILE) { $behatstepfile = BEHAT_FEATURE_STEP_FILE; + } else { + echo "BEHAT_FEATURE_STEP_FILE is not set, please ensure you set this to writable file" . PHP_EOL; + exit(1); } // Rewrite config file to ensure we have all the features covered. @@ -265,7 +267,7 @@ function print_update_step_output($process, $featurestepfile) { $exitcode = -1; } - echo PHP_EOL; + echo PHP_EOL. "Updated step count in " . $featurestepfile . PHP_EOL; return $exitcode; } diff --git a/behat_features_step_count.json b/behat_features_step_count.json deleted file mode 100644 index f0963e1cf23..00000000000 --- a/behat_features_step_count.json +++ /dev/null @@ -1,286 +0,0 @@ -{ - "course\/tests\/behat\/course_category_management_listing.feature": "859", - "grade\/tests\/behat\/grade_aggregation.feature": "746", - "course\/tests\/behat\/course_controls.feature": "648", - "grade\/tests\/behat\/grade_scales.feature": "566", - "course\/tests\/behat\/course_resort.feature": "481", - "grade\/tests\/behat\/grade_single_item_scales.feature": "434", - "grade\/tests\/behat\/grade_calculated_weights.feature": "369", - "grade\/tests\/behat\/grade_scales_aggregation.feature": "349", - "mod\/forum\/tests\/behat\/discussion_subscriptions.feature": "291", - "grade\/tests\/behat\/grade_natural_normalisation.feature": "288", - "admin\/tool\/monitor\/tests\/behat\/subscription.feature": "285", - "course\/tests\/behat\/category_resort.feature": "256", - "course\/tests\/behat\/category_change_visibility.feature": "234", - "course\/tests\/behat\/category_management.feature": "225", - "admin\/tool\/behat\/tests\/behat\/data_generators.feature": "218", - "admin\/tool\/monitor\/tests\/behat\/rule.feature": "213", - "mod\/quiz\/tests\/behat\/editing_add.feature": "207", - "grade\/grading\/form\/rubric\/tests\/behat\/edit_rubric.feature": "204", - "blocks\/navigation\/tests\/behat\/expand_courses_node.feature": "189", - "course\/format\/social\/tests\/behat\/social_adjust_discussion_count.feature": "184", - "admin\/tool\/behat\/tests\/behat\/get_and_set_fields.feature": "176", - "mod\/workshop\/tests\/behat\/workshop_assessment.feature": "162", - "badges\/tests\/behat\/award_badge.feature": "158", - "group\/tests\/behat\/update_groups.feature": "150", - "availability\/tests\/behat\/edit_availability.feature": "147", - "mod\/wiki\/tests\/behat\/wiki_search.feature": "140", - "mod\/forum\/tests\/behat\/track_read_posts.feature": "136", - "blocks\/recent_activity\/tests\/behat\/structural_changes.feature": "132", - "mod\/assign\/tests\/behat\/quickgrading.feature": "132", - "grade\/tests\/behat\/grade_contribution_with_extra_credit.feature": "129", - "mod\/lesson\/tests\/behat\/link_to_gradebook.feature": "128", - "mod\/forum\/tests\/behat\/discussion_navigation.feature": "126", - "grade\/report\/singleview\/tests\/behat\/singleview.feature": "120", - "mod\/assign\/tests\/behat\/grading_status.feature": "116", - "grade\/tests\/behat\/grade_point_maximum.feature": "114", - "mod\/glossary\/tests\/behat\/search_entries.feature": "113", - "backup\/util\/ui\/tests\/behat\/restore_moodle2_courses.feature": "110", - "mod\/quiz\/tests\/behat\/editing_repaginate.feature": "110", - "blocks\/activity_modules\/tests\/behat\/block_activity_modules.feature": "108", - "mod\/assign\/tests\/behat\/outcome_grading.feature": "104", - "question\/tests\/behat\/preview_question.feature": "102", - "group\/tests\/behat\/groups_import.feature": "99", - "group\/tests\/behat\/auto_creation.feature": "98", - "report\/outline\/tests\/behat\/outline.feature": "98", - "mod\/assign\/tests\/behat\/prevent_submission_changes.feature": "97", - "blocks\/comments\/tests\/behat\/add_comment.feature": "96", - "course\/tests\/behat\/paged_course_navigation.feature": "96", - "cohort\/tests\/behat\/access_visible_cohorts.feature": "96", - "grade\/tests\/behat\/grade_view.feature": "94", - "grade\/tests\/behat\/grade_override_letter.feature": "94", - "availability\/tests\/behat\/display_availability.feature": "94", - "mod\/forum\/tests\/behat\/discussion_display.feature": "92", - "course\/format\/weeks\/tests\/behat\/edit_delete_sections.feature": "90", - "mod\/quiz\/tests\/behat\/editing_set_marks_with_attempts.feature": "89", - "mod\/lesson\/tests\/behat\/lesson_edit_pages.feature": "88", - "course\/format\/topics\/tests\/behat\/edit_delete_sections.feature": "87", - "report\/outline\/tests\/behat\/user.feature": "86", - "admin\/tool\/filetypes\/tests\/behat\/add_filetypes.feature": "86", - "mod\/lesson\/tests\/behat\/lesson_number_of_student_attempts.feature": "86", - "mod\/glossary\/tests\/behat\/categories.feature": "85", - "mod\/assign\/feedback\/editpdf\/tests\/behat\/annotate_pdf.feature": "84", - "mod\/wiki\/tests\/behat\/wiki_comments.feature": "83", - "report\/participation\/tests\/behat\/filter_participation.feature": "83", - "mod\/lesson\/tests\/behat\/lesson_navigation.feature": "82", - "question\/tests\/behat\/question_categories.feature": "81", - "group\/tests\/behat\/create_groups.feature": "80", - "course\/tests\/behat\/course_change_visibility.feature": "79", - "mod\/lesson\/tests\/behat\/lesson_with_clusters.feature": "79", - "blocks\/glossary_random\/tests\/behat\/glossary_random.feature": "79", - "mod\/lesson\/tests\/behat\/lesson_practice.feature": "78", - "group\/tests\/behat\/delete_groups.feature": "76", - "cohort\/tests\/behat\/upload_cohorts.feature": "76", - "mod\/assign\/tests\/behat\/group_submission.feature": "76", - "question\/tests\/behat\/sort_questions.feature": "75", - "mod\/choice\/tests\/behat\/publish_results.feature": "73", - "mod\/quiz\/tests\/behat\/editing_click_delete_icon.feature": "71", - "report\/loglive\/tests\/behat\/loglive_report.feature": "71", - "blog\/tests\/behat\/comment.feature": "70", - "calendar\/tests\/behat\/calendar.feature": "70", - "completion\/tests\/behat\/restrict_section_availability.feature": "69", - "grade\/export\/txt\/tests\/behat\/export.feature": "69", - "blocks\/navigation\/tests\/behat\/view_my_courses.feature": "69", - "availability\/condition\/profile\/tests\/behat\/availability_profile.feature": "68", - "mod\/forum\/tests\/behat\/forum_subscriptions.feature": "68", - "mod\/forum\/tests\/behat\/edit_post_student.feature": "66", - "report\/log\/tests\/behat\/filter_log.feature": "65", - "availability\/condition\/grade\/tests\/behat\/availability_grade.feature": "64", - "question\/format\/xml\/tests\/behat\/import_export.feature": "64", - "mod\/quiz\/tests\/behat\/editing_click_move_icon.feature": "64", - "mod\/forum\/tests\/behat\/forum_subscriptions_availability.feature": "62", - "course\/tests\/behat\/create_delete_course.feature": "62", - "blocks\/tests\/behat\/manage_blocks.feature": "62", - "user\/tests\/behat\/delete_users.feature": "61", - "mod\/quiz\/tests\/behat\/settings_form_fields_disableif.feature": "60", - "mod\/wiki\/tests\/behat\/wiki_formats.feature": "59", - "grade\/tests\/behat\/grade_mingrade.feature": "59", - "mod\/lesson\/tests\/behat\/questions_images.feature": "59", - "course\/tests\/behat\/activities_edit_completion.feature": "59", - "mod\/forum\/tests\/behat\/edit_post_teacher.feature": "59", - "mod\/quiz\/tests\/behat\/editing_set_marks_no_attempts.feature": "59", - "mod\/lesson\/tests\/behat\/lesson_edit_cluster.feature": "58", - "mod\/wiki\/tests\/behat\/collaborative_individual.feature": "57", - "mod\/forum\/tests\/behat\/separate_group_discussions.feature": "57", - "mod\/quiz\/tests\/behat\/completion_condition_passing_grade.feature": "56", - "availability\/condition\/group\/tests\/behat\/availability_group.feature": "55", - "mod\/quiz\/tests\/behat\/completion_condition_attempts_used.feature": "55", - "lib\/editor\/atto\/plugins\/image\/tests\/behat\/image.feature": "55", - "course\/tests\/behat\/section_highlighting.feature": "54", - "mod\/forum\/tests\/behat\/separate_group_single_group_discussions.feature": "53", - "course\/tests\/behat\/move_activities.feature": "52", - "blocks\/tests\/behat\/hidden_block_region.feature": "52", - "course\/tests\/behat\/activities_visibility_icons.feature": "52", - "lib\/editor\/atto\/plugins\/accessibilitychecker\/tests\/behat\/accessibilitychecker.feature": "52", - "mod\/quiz\/tests\/behat\/add_quiz.feature": "51", - "mod\/lesson\/tests\/behat\/teacher_grade_essays.feature": "51", - "report\/eventlist\/tests\/behat\/mainsection.feature": "51", - "mod\/wiki\/tests\/behat\/edit_tags.feature": "51", - "report\/log\/tests\/behat\/user_log.feature": "50", - "grade\/tests\/behat\/grade_UI_settings.feature": "50", - "enrol\/self\/tests\/behat\/self_enrolment.feature": "50", - "course\/tests\/behat\/add_activities.feature": "49", - "mod\/lesson\/tests\/behat\/lesson_essay_question.feature": "49", - "grade\/grading\/form\/rubric\/tests\/behat\/reuse_own_rubrics.feature": "48", - "mod\/book\/tests\/behat\/log_entries.feature": "48", - "mod\/data\/tests\/behat\/view_entries.feature": "48", - "grade\/grading\/form\/rubric\/tests\/behat\/publish_rubric_templates.feature": "48", - "availability\/condition\/grouping\/tests\/behat\/availability_grouping.feature": "47", - "admin\/tool\/behat\/tests\/behat\/nasty_strings.feature": "47", - "mod\/assign\/feedback\/editpdf\/tests\/behat\/group_annotations.feature": "46", - "lib\/editor\/tinymce\/tests\/behat\/edit_available_icons.feature": "46", - "mod\/book\/tests\/behat\/show_hide_chapters.feature": "46", - "grade\/report\/history\/tests\/behat\/basic_functionality.feature": "46", - "mod\/wiki\/tests\/behat\/page_history.feature": "45", - "mod\/assign\/tests\/behat\/edit_previous_feedback.feature": "45", - "question\/tests\/behat\/delete_questions.feature": "45", - "cohort\/tests\/behat\/add_cohort.feature": "45", - "admin\/tests\/behat\/filter_users.feature": "45", - "cohort\/tests\/behat\/view_cohorts.feature": "45", - "mod\/wiki\/tests\/behat\/preview_page.feature": "44", - "mod\/lesson\/tests\/behat\/lesson_progress_bar.feature": "44", - "admin\/tool\/langimport\/tests\/behat\/manage_langpacks.feature": "44", - "group\/tests\/behat\/id_uniqueness.feature": "44", - "repository\/tests\/behat\/create_shortcut.feature": "44", - "backup\/util\/ui\/tests\/behat\/backup_courses.feature": "44", - "mod\/lesson\/tests\/behat\/lesson_review.feature": "43", - "mod\/lesson\/tests\/behat\/date_availability.feature": "42", - "completion\/tests\/behat\/restrict_activity_by_date.feature": "41", - "mod\/glossary\/tests\/behat\/entries_require_approval.feature": "41", - "user\/tests\/behat\/view_full_profile.feature": "41", - "course\/tests\/behat\/move_sections.feature": "40", - "completion\/tests\/behat\/restrict_activity_by_grade.feature": "40", - "mod\/assign\/tests\/behat\/comment_inline.feature": "39", - "mod\/assign\/tests\/behat\/submission_comments.feature": "39", - "course\/tests\/behat\/section_visibility.feature": "39", - "message\/tests\/behat\/display_history.feature": "39", - "mod\/data\/tests\/behat\/add_entries.feature": "39", - "mod\/assign\/tests\/behat\/grant_extension.feature": "38", - "mod\/lesson\/tests\/behat\/completion_condition_end_reached.feature": "38", - "blocks\/course_summary\/tests\/behat\/block_course_summary_course.feature": "38", - "question\/tests\/behat\/copy_questions.feature": "37", - "blocks\/participants\/tests\/behat\/block_participants_course.feature": "37", - "blocks\/navigation\/tests\/behat\/expand_my_courses_setting.feature": "37", - "mod\/book\/tests\/behat\/create_chapters.feature": "37", - "mod\/choice\/tests\/behat\/multiple_options.feature": "36", - "mod\/feedback\/tests\/behat\/show_nonrespondents.feature": "36", - "admin\/tool\/behat\/tests\/behat\/edit_permissions.feature": "36", - "course\/tests\/behat\/force_group_mode.feature": "36", - "cohort\/tests\/behat\/upload_cohort_users.feature": "35", - "mod\/assign\/tests\/behat\/allow_another_attempt.feature": "35", - "mod\/choice\/tests\/behat\/publish_results_anonymously.feature": "35", - "message\/tests\/behat\/manage_contacts.feature": "34", - "blocks\/html\/tests\/behat\/multiple_instances.feature": "34", - "message\/tests\/behat\/send_message.feature": "34", - "admin\/tool\/behat\/tests\/behat\/basic_actions.feature": "33", - "course\/tests\/behat\/frontpage_display_modes.feature": "33", - "mod\/choice\/tests\/behat\/change_response.feature": "32", - "enrol\/guest\/tests\/behat\/guest_access.feature": "32", - "admin\/tool\/uploadcourse\/tests\/behat\/create.feature": "32", - "blocks\/tests\/behat\/return_block_original_state.feature": "32", - "mod\/lesson\/tests\/behat\/lesson_informations_at_end.feature": "32", - "lib\/editor\/atto\/plugins\/align\/tests\/behat\/align.feature": "31", - "availability\/condition\/date\/tests\/behat\/availability_date.feature": "31", - "mod\/glossary\/tests\/behat\/print_friendly_version.feature": "30", - "mod\/assign\/tests\/behat\/display_grade.feature": "30", - "repository\/tests\/behat\/overwrite_file.feature": "30", - "course\/tests\/behat\/edit_settings.feature": "30", - "mod\/assign\/tests\/behat\/file_submission.feature": "30", - "blocks\/tests\/behat\/configure_block_throughout_site.feature": "30", - "course\/tests\/behat\/course_creation.feature": "29", - "admin\/tool\/availabilityconditions\/tests\/behat\/manage_conditions.feature": "29", - "completion\/tests\/behat\/teacher_manual_completion.feature": "29", - "lib\/editor\/atto\/plugins\/table\/tests\/behat\/table.feature": "29", - "question\/tests\/behat\/edit_questions.feature": "29", - "blocks\/html\/tests\/behat\/configuring_html_block.feature": "28", - "blocks\/course_summary\/tests\/behat\/block_course_summary_frontpage.feature": "28", - "admin\/tests\/behat\/upload_users.feature": "28", - "course\/tests\/behat\/max_number_sections.feature": "27", - "course\/tests\/behat\/restrict_available_activities.feature": "27", - "course\/tests\/behat\/activities_group_icons.feature": "27", - "mod\/lesson\/tests\/behat\/time_limit.feature": "27", - "mod\/assign\/tests\/behat\/filter_by_marker.feature": "26", - "user\/tests\/behat\/table_sorting.feature": "26", - "mod\/assign\/tests\/behat\/online_submissions.feature": "26", - "blocks\/tests\/behat\/restrict_available_blocks.feature": "26", - "course\/tests\/behat\/course_search.feature": "25", - "mod\/forum\/tests\/behat\/completion_condition_number_discussions.feature": "25", - "course\/tests\/behat\/rename_roles.feature": "25", - "badges\/tests\/behat\/add_badge.feature": "25", - "completion\/tests\/behat\/enable_manual_complete_mark.feature": "24", - "lib\/editor\/atto\/plugins\/equation\/tests\/behat\/equation.feature": "24", - "mod\/forum\/tests\/behat\/single_forum_discussion.feature": "24", - "availability\/condition\/completion\/tests\/behat\/availability_completion.feature": "24", - "blocks\/news_items\/tests\/behat\/display_news.feature": "24", - "mod\/lesson\/tests\/behat\/password_protection.feature": "24", - "mod\/lesson\/tests\/behat\/import_fillintheblank_question.feature": "24", - "mod\/scorm\/tests\/behat\/add_scorm.feature": "23", - "admin\/tool\/behat\/tests\/behat\/manipulate_forms.feature": "23", - "my\/tests\/behat\/restrict_available_blocks.feature": "23", - "mod\/forum\/tests\/behat\/forum_subscriptions_management.feature": "23", - "mod\/glossary\/tests\/behat\/entries_always_editable.feature": "21", - "auth\/tests\/behat\/login.feature": "21", - "lib\/editor\/atto\/plugins\/indent\/tests\/behat\/indent.feature": "21", - "blocks\/html\/tests\/behat\/course_block.feature": "21", - "lib\/editor\/atto\/plugins\/accessibilityhelper\/tests\/behat\/accessibilityhelper.feature": "21", - "lib\/editor\/atto\/plugins\/italic\/tests\/behat\/italic.feature": "20", - "mod\/lesson\/tests\/behat\/import_images.feature": "20", - "repository\/tests\/behat\/cancel_add_file.feature": "20", - "mod\/forum\/tests\/behat\/add_forum.feature": "20", - "lib\/editor\/atto\/plugins\/bold\/tests\/behat\/bold.feature": "20", - "backup\/util\/ui\/tests\/behat\/duplicate_activities.feature": "20", - "files\/tests\/behat\/course_files.feature": "20", - "lib\/editor\/atto\/plugins\/media\/tests\/behat\/media.feature": "20", - "course\/tests\/behat\/category_role_assignment.feature": "20", - "message\/tests\/behat\/message_participants.feature": "19", - "mod\/choice\/tests\/behat\/limit_responses.feature": "19", - "blocks\/comments\/tests\/behat\/delete_comment.feature": "19", - "course\/tests\/behat\/activities_indentation.feature": "19", - "admin\/tool\/uploadcourse\/tests\/behat\/update.feature": "18", - "repository\/tests\/behat\/zip_and_unzip.feature": "18", - "mod\/forum\/tests\/behat\/my_forum_posts.feature": "18", - "grade\/export\/xml\/tests\/behat\/export.feature": "18", - "message\/tests\/behat\/search_history.feature": "18", - "question\/format\/gift\/tests\/behat\/import_export.feature": "18", - "blocks\/login\/tests\/behat\/login_block.feature": "18", - "mod\/survey\/tests\/behat\/survey_types.feature": "18", - "admin\/tool\/behat\/tests\/behat\/list_steps.feature": "18", - "repository\/recent\/tests\/behat\/add_recent.feature": "17", - "blocks\/tests\/behat\/add_blocks.feature": "16", - "message\/tests\/behat\/block_users.feature": "16", - "admin\/tests\/behat\/set_admin_settings_value.feature": "16", - "lib\/editor\/atto\/plugins\/link\/tests\/behat\/link.feature": "16", - "blocks\/tests\/behat\/hide_blocks.feature": "16", - "backup\/util\/ui\/tests\/behat\/import_course.feature": "15", - "my\/tests\/behat\/reset_page.feature": "15", - "blocks\/participants\/tests\/behat\/block_participants_frontpage.feature": "15", - "mod\/label\/tests\/behat\/label_visibility.feature": "14", - "repository\/tests\/behat\/create_folders.feature": "14", - "question\/format\/webct\/tests\/behat\/importcalculated.feature": "14", - "question\/format\/webct\/tests\/behat\/import.feature": "14", - "mod\/glossary\/tests\/behat\/prevent_duplicate_entries.feature": "14", - "course\/tests\/behat\/activities_edit_with_block_dock.feature": "13", - "blocks\/glossary_random\/tests\/behat\/glossary_random_frontpage.feature": "13", - "mod\/choice\/tests\/behat\/add_choice.feature": "13", - "admin\/tests\/behat\/display_short_names.feature": "12", - "admin\/tool\/monitor\/tests\/behat\/disabled.feature": "12", - "repository\/tests\/behat\/delete_files.feature": "12", - "lib\/editor\/atto\/plugins\/clear\/tests\/behat\/clear.feature": "12", - "repository\/upload\/tests\/behat\/upload_file.feature": "11", - "my\/tests\/behat\/add_blocks.feature": "11", - "lib\/editor\/atto\/plugins\/charmap\/tests\/behat\/charmap.feature": "11", - "lib\/editor\/atto\/plugins\/subscript\/tests\/behat\/subscript.feature": "10", - "lib\/editor\/atto\/plugins\/strike\/tests\/behat\/strike.feature": "10", - "lib\/editor\/atto\/plugins\/superscript\/tests\/behat\/superscript.feature": "10", - "lib\/editor\/atto\/plugins\/title\/tests\/behat\/title.feature": "10", - "lib\/editor\/atto\/plugins\/underline\/tests\/behat\/underline.feature": "10", - "user\/tests\/behat\/reset_page.feature": "10", - "lib\/editor\/atto\/plugins\/unorderedlist\/tests\/behat\/unorderedlist.feature": "9", - "user\/tests\/behat\/edituserpassword.feature": "9", - "lib\/editor\/atto\/plugins\/orderedlist\/tests\/behat\/orderedlist.feature": "9", - "user\/tests\/behat\/add_blocks.feature": "8", - "lib\/editor\/atto\/plugins\/collapse\/tests\/behat\/collapse.feature": "6", - "lib\/editor\/atto\/plugins\/html\/tests\/behat\/html.feature": "6", - "report\/usersessions\/tests\/behat\/usersessions_report.feature": "3", - "admin\/tool\/behat\/tests\/behat\/test_environment.feature": "2" -} \ No newline at end of file diff --git a/lib/behat/classes/behat_config_manager.php b/lib/behat/classes/behat_config_manager.php index 641789ca22d..61c7f856c32 100644 --- a/lib/behat/classes/behat_config_manager.php +++ b/lib/behat/classes/behat_config_manager.php @@ -416,14 +416,12 @@ class behat_config_manager { if (!$behattimingfile || !$behattimingdata = @json_decode(file_get_contents($behattimingfile), true)) { // No data available, fall back to relying on steps data. - $stepfile = __DIR__ . "/../../../behat_features_step_count.json"; - + $stepfile = ""; if (defined('BEHAT_FEATURE_STEP_FILE') && BEHAT_FEATURE_STEP_FILE) { $stepfile = BEHAT_FEATURE_STEP_FILE; } // We should never get this. But in case we can't do this then fall back on simple splitting. - if (!$stepfile || !$behattimingdata = @json_decode(file_get_contents($stepfile), true)) { - echo "No step/timing information available, falling back on simple distribution" . PHP_EOL; + if (empty($stepfile) || !$behattimingdata = @json_decode(file_get_contents($stepfile), true)) { return false; } }