From e60127001ccfeb7c06ad7ea234787a8a6e0acf9d Mon Sep 17 00:00:00 2001 From: Kirill Lakhov Date: Mon, 13 Feb 2023 12:28:58 +0300 Subject: [PATCH] Upgrade Cypress to 12.x (#5681) ### Motivation and context ### How has this been tested? ### Checklist - [ ] I submit my changes into the `develop` branch - [ ] I have added a description of my changes into the [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file - [ ] I have updated the documentation accordingly - [ ] I have added tests to cover my changes - [ ] I have linked related issues (see [GitHub docs]( https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) - [ ] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning), [cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning)) ### License - [ ] I submit _my code changes_ under the same [MIT License]( https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project. Feel free to contact the maintainers if that's a concern. --- .github/workflows/full.yml | 6 +-- .github/workflows/main.yml | 6 +-- .github/workflows/schedule.yml | 6 +-- tests/.eslintrc.js | 1 + tests/cypress.config.js | 39 +++++++++++++++ tests/cypress.json | 30 ------------ .../case_20_objects_ordering_feature.js | 0 .../case_22_tag_annotation_mode.js | 0 .../case_24_delete_unlock_lock_object.js | 0 ...4_drawing_with_predefined_number_points.js | 0 ...e_36_always_show_object_details_feature.js | 0 .../case_37_object_make_copy.js | 0 .../case_53_object_propagate.js | 0 .../actions_objects/case_54_redraw_feature.js | 0 .../case_55_repeat_draw_feature.js | 0 .../actions_objects/case_59_edit_handler.js | 0 .../case_60_autoborder_feature.js | 0 .../case_99_save_filtered_object_in_AAM.js | 0 .../case_108_rotated_bounding_boxes.js | 0 ...ase_10_polygon_shape_track_label_points.js | 0 .../case_115_ellipse_shape_track_label.js | 0 ...e_11_polylines_shape_track_label_points.js | 0 .../case_12_points_shape_track_label.js | 0 .../case_13_merge_split_features.js | 0 .../case_14_appearance_features.js | 0 .../case_15_group_features.js | 0 .../case_16_z_order_features.js | 0 .../case_17_lock_hide_features.js | 0 ...7_cropping_polygon_in_some_corner_cases.js | 0 .../case_8_rectangle_shape_track_label.js | 0 .../case_9_cuboid_shape_track_label.js | 0 .../actions_objects2/case_delete_frame.js | 1 - .../case_113_new_organization_pipeline.js | 4 -- .../case_103_project_export.js | 0 .../case_104_project_export_3d.js | 2 +- .../case_114_backup_restore_project.js | 2 +- ...g_project_by_inserting_labels_from_task.js | 0 ...kup_restore_project_to_various_storages.js | 0 .../case_57_project_label_deleting_feature.js | 0 .../case_94_move_task_between_projects.js | 0 .../case_95_move_task_to_project.js | 2 +- .../case_98_models_page.js | 0 .../issue_2625_delete_project_via_actions.js | 0 ...ng_more_one_tasks_from_project_per_time.js | 2 +- .../base_actions_project_task_user.js | 0 .../case_65_manifest/demo_manifest.jsonl | 0 .../case_65_manifest/image_case_65_1.png | Bin .../case_65_manifest/image_case_65_2.png | Bin .../assets/case_65_manifest/manifest.jsonl | 0 ...mber_of_points_in_polygon_approximation.js | 0 .../case_102_create_link_shape_frame.js | 4 +- .../case_110_settings_smooth_image_option.js | 0 ...case_117_paste_labels_from_another_task.js | 0 .../case_51_settings_auto_save.js | 0 .../case_52_dump_upload_annotation.js | 0 .../case_58_task_label_deleting_feature.js | 0 .../case_61_create_task_set_issue_tracker.js | 0 .../case_65_create_task_with_manifest.js | 0 .../case_66_rename_label_raw_editor.js | 0 .../case_67_intelligent_polygon_cropping.js | 0 .../case_68_saving_settings_local_storage.js | 0 .../case_70_mutable_attribute.js | 0 .../actions_tasks/case_71_shortcuts_window.js | 0 .../case_72_hotkeys_change_labels.js | 0 .../actions_tasks/case_75_overlap_size.js | 0 ...case_96_create_save_undo_save_redo_save.js | 0 .../actions_tasks/continue_frame_n.js | 0 ..._import_annotations_frames_dots_in_name.js | 0 .../case_39_issue_2572_rename_task.js | 1 + .../case_69_filters_sorting_jobs.js | 0 .../task_changes_status_after_initial_save.js | 0 .../actions_tasks/task_rectangles_only.js | 0 .../case_101_opencv_basic_actions.js | 0 ...ttings_text_size_position_label_content.js | 4 +- .../case_21_canvas_color_feature.js | 0 .../case_23_canvas_grid_feature.js | 0 .../case_25_canvas_bitmap_feature.js | 0 ..._brightness_contrast_saturation_feature.js | 0 .../case_27_undo_redo_feature.js | 0 .../case_29_settings_player_step.js | 0 .../case_30_collapse_sidebar_appearance.js | 0 ...e_31_label_constructor_color_name_label.js | 0 ...ute_annotation_mode_zoom_margin_feature.js | 0 .../case_33_button_continue_label_editor.js | 0 ...create_task_without_necessary_arguments.js | 0 .../case_41_add_delete_label_attribute.js | 0 ...change_label_name_via_label_constructor.js | 0 ...3_create_label_with_existing_label_name.js | 0 ..._try_create_task_incorrect_dataset_repo.js | 0 .../case_97_export_import_task.js | 0 .../assets/case_109/preview_AWS_S3_BUCKET.png | Bin .../case_109/preview_AZURE_CONTAINER.png | Bin .../case_109/preview_GOOGLE_CLOUD_STORAGE.png | Bin .../assets/case_90/case_90_context_image.zip | Bin .../actions_tasks3/case_105_cloud_storage.js | 0 .../case_107_connected_file_share.js | 0 .../case_109_dummy_cloud_storage.js | 7 ++- .../actions_tasks3/case_112_tus_upload.js | 0 ...t_storage_for_import_export_annotations.js | 0 ...k_storage_for_import_export_annotations.js | 0 ...m_storage_for_import_export_annotations.js | 0 .../actions_tasks3/case_118_multi_tasks.js | 0 .../case_18_filters_functionality.js | 0 .../case_19_all_image_rotate_features.js | 0 .../case_1_create_delete_task_label_color.js | 0 .../case_3_task_start_stop_step_frame.js | 0 ...44_changing_default_value_for_attribute.js | 0 .../case_45_open_the_task_button.js | 0 ...ate_task_with_files_from_remote_sources.js | 0 .../actions_tasks3/case_47_export_dataset.js | 0 ...se_48_issue_2663_annotations_statistics.js | 0 ..._settings_show_all_interpolation_tracks.js | 0 .../case_50_settings_player_speed.js | 0 .../actions_tasks3/case_5_image_rotate.js | 0 .../actions_tasks3/case_6_image_scale_fit.js | 0 .../actions_tasks3/case_74_drag_canvas.js | 0 .../actions_tasks3/case_7_image_scale_roi.js | 0 .../actions_tasks3/case_90_context_image.js | 0 .../case_106_email_confirmation_page.js | 0 .../actions_users/case_38_feedback_button.js | 0 .../case_73_reset_password_notification.js | 0 .../actions_users/issue_1810_login_logout.js | 5 +- ...ssue_2440_value_must_be_a_user_instance.js | 0 ...t_after_change_task_issue_point_firefox.js | 4 -- .../case_28_review_pipeline_feature.js | 0 .../case_2_register_user_change_pass.js | 0 .../case_4_assign_task_job_users.js | 1 - .../issue_1599_ch_user_registration.js | 0 .../issue_1599_pl_user_registration.js | 0 .../cypress/{integration => e2e}/auth_page.js | 9 +--- .../assets/test_canvas3d.zip | Bin ..._canvas3d_functionality_cuboid_grouping.js | 0 ...84_canvas3d_functionality_cuboid_redraw.js | 0 ...s3d_functionality_cuboid_cancel_drawing.js | 0 ...anvas3d_functionality_move_image_button.js | 0 ...87_canvas3d_functionality_cuboid_delete.js | 0 ...unctionality_save_job_remove_annotation.js | 0 .../case_89_canvas3d_functionality_filters.js | 6 +-- ...mp_upload_annotation_point_cloud_format.js | 0 ...pload_annotation_velodyne_points_format.js | 0 ...3_canvas3d_functionality_export_dataset.js | 0 ...56_canvas3d_functionality_basic_actions.js | 0 ...nality_control_button_mouse_interaction.js | 31 +++++++----- .../case_64_canvas3d_functionality_cuboid.js | 2 +- ..._78_canvas3d_functionality_cuboid_label.js | 0 ...vas3d_functionality_cuboid_context_menu.js | 4 +- ...canvas3d_functionality_cuboid_make_copy.js | 2 +- ...canvas3d_functionality_cuboid_propagate.js | 2 +- ...onality_cuboid_opacity_outlined_borders.js | 0 .../check_email_verification_system.js | 0 .../issue_1882_polygon_interpolation.js | 0 ...e_1886_point_coordinates_not_duplicated.js | 0 .../issues_prs/issue_1919_check_text_attr.js | 0 ..._error_canvas_is_busy_at_resize_element.js | 0 .../issue_1944_loading_screen_switch_job.js | 0 ..._2174_reset_zoom_in_tag_annotation_mode.js | 0 ...sue_2230_maintenance_popover_visibility.js | 0 ...06_ui_not_throw_error_specify_one_point.js | 0 .../issue_2411_deleting_attributes.js | 0 .../issue_2418_object_tag_same_labels.js | 0 .../issue_2485_navigation_empty_frames.js | 0 .../issue_2486_not_edit_object_aam.js | 0 ...ue_2487_extra_instances_canvas_grouping.js | 0 ...aying_attached_files_when_creating_task.js | 0 ...sue_2753_call_HOC_component_each_render.js | 0 .../issues_prs/issue_2807_polyline_editing.js | 0 .../issue_2992_crop_polygon_properly.js | 0 ..._with_object_dragging_and_go_next_frame.js | 0 ...rror_cannot_read_property_at_saving_job.js | 0 ..._fails_with_shape_dragging_over_sidebar.js | 0 ..._1368_points_track_invisible_next_frame.js | 0 .../issues_prs2/issue_1391_delete_point.js | 0 ...d_attribute_correspond_chosen_attribute.js | 0 .../issues_prs2/issue_1429_check_new_label.js | 0 .../issue_1433_hide_functionality.js | 0 ..._1438_cancel_multiple_paste_ui_not_lock.js | 0 .../issue_1439_blocked_object_info.js | 0 .../issue_1444_filter_property_shape.js | 0 .../issue_1498_message_ui_raw_labels_wrong.js | 0 .../issues_prs2/issue_1540_add_remove_tag.js | 0 .../issue_1568_cuboid_dump_annotation.js | 0 .../issue_1750_err_aam_switch_frames.js | 0 .../issue_1785_propagation_latest_frame.js | 0 ...sue_1819_first_part_split_track_visible.js | 0 ...ntext_menu_when_switching_another_frame.js | 0 .../issue_1825_tooltip_hidden_mouseout.js | 0 ...sue_1841_hidden_points_cuboids_grouping.js | 0 .../issue_1870_cursor_not_jump_to_end.js | 0 .../issues_prs2/issue_3821_delete_point.js | 0 ...load_annotations_different_file_formats.js | 0 .../masks/masks_basics.js | 0 ...move_users_tasks_projects_organizations.js | 4 ++ .../skeletons/skeletons_pipeline.js | 1 + .../cypress/{integration => e2e}/webhooks.js | 0 tests/cypress/support/commands.js | 13 ++++- .../support/commands_filters_feature.js | 8 ++- .../support/commands_review_pipeline.js | 1 + tests/cypress/support/const_canvas3d.js | 2 +- tests/cypress/support/{index.js => e2e.js} | 0 tests/cypress_canvas3d.config.js | 28 +++++++++++ tests/cypress_canvas3d.json | 19 -------- tests/docker-compose.minio.yml | 2 +- tests/nightly_cypress.config.js | 36 ++++++++++++++ tests/nightly_cypress.json | 26 ---------- tests/package.json | 6 +-- tests/pr_cypress.config.js | 46 ++++++++++++++++++ tests/pr_cypress.json | 37 -------------- tests/pr_cypress_canvas3d.config.js | 31 ++++++++++++ tests/pr_cypress_canvas3d.json | 22 --------- tests/yarn.lock | 18 +++---- 210 files changed, 275 insertions(+), 208 deletions(-) create mode 100644 tests/cypress.config.js delete mode 100644 tests/cypress.json rename tests/cypress/{integration => e2e}/actions_objects/case_20_objects_ordering_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_22_tag_annotation_mode.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_24_delete_unlock_lock_object.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_34_drawing_with_predefined_number_points.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_36_always_show_object_details_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_37_object_make_copy.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_53_object_propagate.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_54_redraw_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_55_repeat_draw_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_59_edit_handler.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_60_autoborder_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_objects/case_99_save_filtered_object_in_AAM.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_108_rotated_bounding_boxes.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_10_polygon_shape_track_label_points.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_115_ellipse_shape_track_label.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_11_polylines_shape_track_label_points.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_12_points_shape_track_label.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_13_merge_split_features.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_14_appearance_features.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_15_group_features.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_16_z_order_features.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_17_lock_hide_features.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_77_cropping_polygon_in_some_corner_cases.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_8_rectangle_shape_track_label.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_9_cuboid_shape_track_label.js (100%) rename tests/cypress/{integration => e2e}/actions_objects2/case_delete_frame.js (98%) rename tests/cypress/{integration => e2e}/actions_organizations/case_113_new_organization_pipeline.js (99%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_103_project_export.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_104_project_export_3d.js (97%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_114_backup_restore_project.js (98%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_116_creating_project_by_inserting_labels_from_task.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_117_backup_restore_project_to_various_storages.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_57_project_label_deleting_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_94_move_task_between_projects.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_95_move_task_to_project.js (97%) rename tests/cypress/{integration => e2e}/actions_projects_models/case_98_models_page.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/issue_2625_delete_project_via_actions.js (100%) rename tests/cypress/{integration => e2e}/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js (97%) rename tests/cypress/{integration => e2e}/actions_projects_models/registration_involved/base_actions_project_task_user.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/assets/case_65_manifest/demo_manifest.jsonl (100%) rename tests/cypress/{integration => e2e}/actions_tasks/assets/case_65_manifest/image_case_65_1.png (100%) rename tests/cypress/{integration => e2e}/actions_tasks/assets/case_65_manifest/image_case_65_2.png (100%) rename tests/cypress/{integration => e2e}/actions_tasks/assets/case_65_manifest/manifest.jsonl (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_100_settings_default_number_of_points_in_polygon_approximation.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_102_create_link_shape_frame.js (95%) rename tests/cypress/{integration => e2e}/actions_tasks/case_110_settings_smooth_image_option.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_117_paste_labels_from_another_task.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_51_settings_auto_save.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_52_dump_upload_annotation.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_58_task_label_deleting_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_61_create_task_set_issue_tracker.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_65_create_task_with_manifest.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_66_rename_label_raw_editor.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_67_intelligent_polygon_cropping.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_68_saving_settings_local_storage.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_70_mutable_attribute.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_71_shortcuts_window.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_72_hotkeys_change_labels.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_75_overlap_size.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/case_96_create_save_undo_save_redo_save.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/continue_frame_n.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js (98%) rename tests/cypress/{integration => e2e}/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/task_changes_status_after_initial_save.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks/task_rectangles_only.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_101_opencv_basic_actions.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_111_settings_text_size_position_label_content.js (98%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_21_canvas_color_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_23_canvas_grid_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_25_canvas_bitmap_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_27_undo_redo_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_29_settings_player_step.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_30_collapse_sidebar_appearance.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_31_label_constructor_color_name_label.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_33_button_continue_label_editor.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_40_create_task_without_necessary_arguments.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_41_add_delete_label_attribute.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_42_change_label_name_via_label_constructor.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_43_create_label_with_existing_label_name.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_76_try_create_task_incorrect_dataset_repo.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks2/case_97_export_import_task.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/assets/case_109/preview_AWS_S3_BUCKET.png (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/assets/case_109/preview_AZURE_CONTAINER.png (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/assets/case_109/preview_GOOGLE_CLOUD_STORAGE.png (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/assets/case_90/case_90_context_image.zip (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_105_cloud_storage.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_107_connected_file_share.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_109_dummy_cloud_storage.js (98%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_112_tus_upload.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_118_multi_tasks.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_18_filters_functionality.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_19_all_image_rotate_features.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_1_create_delete_task_label_color.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_3_task_start_stop_step_frame.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_44_changing_default_value_for_attribute.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_45_open_the_task_button.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_47_export_dataset.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_48_issue_2663_annotations_statistics.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_50_settings_player_speed.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_5_image_rotate.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_6_image_scale_fit.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_74_drag_canvas.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_7_image_scale_roi.js (100%) rename tests/cypress/{integration => e2e}/actions_tasks3/case_90_context_image.js (100%) rename tests/cypress/{integration => e2e}/actions_users/case_106_email_confirmation_page.js (100%) rename tests/cypress/{integration => e2e}/actions_users/case_38_feedback_button.js (100%) rename tests/cypress/{integration => e2e}/actions_users/case_73_reset_password_notification.js (100%) rename tests/cypress/{integration => e2e}/actions_users/issue_1810_login_logout.js (95%) rename tests/cypress/{integration => e2e}/actions_users/issue_2440_value_must_be_a_user_instance.js (100%) rename tests/cypress/{integration => e2e}/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js (97%) rename tests/cypress/{integration => e2e}/actions_users/registration_involved/case_28_review_pipeline_feature.js (100%) rename tests/cypress/{integration => e2e}/actions_users/registration_involved/case_2_register_user_change_pass.js (100%) rename tests/cypress/{integration => e2e}/actions_users/registration_involved/case_4_assign_task_job_users.js (99%) rename tests/cypress/{integration => e2e}/actions_users/registration_involved/issue_1599_ch_user_registration.js (100%) rename tests/cypress/{integration => e2e}/actions_users/registration_involved/issue_1599_pl_user_registration.js (100%) rename tests/cypress/{integration => e2e}/auth_page.js (70%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/assets/test_canvas3d.zip (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_83_canvas3d_functionality_cuboid_grouping.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_84_canvas3d_functionality_cuboid_redraw.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_86_canvas3d_functionality_move_image_button.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_87_canvas3d_functionality_cuboid_delete.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_88_canvas3d_functionality_save_job_remove_annotation.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_89_canvas3d_functionality_filters.js (96%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js (83%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js (99%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_78_canvas3d_functionality_cuboid_label.js (100%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js (94%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js (99%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js (97%) rename tests/cypress/{integration => e2e}/canvas3d_functionality_2/case_82_canvas3d_functionality_cuboid_opacity_outlined_borders.js (100%) rename tests/cypress/{integration => e2e}/email_system/check_email_verification_system.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_1882_polygon_interpolation.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_1886_point_coordinates_not_duplicated.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_1919_check_text_attr.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_1944_loading_screen_switch_job.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2230_maintenance_popover_visibility.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2411_deleting_attributes.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2418_object_tag_same_labels.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2485_navigation_empty_frames.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2486_not_edit_object_aam.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2487_extra_instances_canvas_grouping.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2753_call_HOC_component_each_render.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2807_polyline_editing.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/issue_2992_crop_polygon_properly.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js (100%) rename tests/cypress/{integration => e2e}/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1368_points_track_invisible_next_frame.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1391_delete_point.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1429_check_new_label.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1433_hide_functionality.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1439_blocked_object_info.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1444_filter_property_shape.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1540_add_remove_tag.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1568_cuboid_dump_annotation.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1750_err_aam_switch_frames.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1785_propagation_latest_frame.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1819_first_part_split_track_visible.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1825_tooltip_hidden_mouseout.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_1870_cursor_not_jump_to_end.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_3821_delete_point.js (100%) rename tests/cypress/{integration => e2e}/issues_prs2/issue_5274_upload_annotations_different_file_formats.js (100%) rename tests/cypress/{integration => e2e}/masks/masks_basics.js (100%) rename tests/cypress/{integration => e2e}/remove_users_tasks_projects_organizations.js (98%) rename tests/cypress/{integration => e2e}/skeletons/skeletons_pipeline.js (99%) rename tests/cypress/{integration => e2e}/webhooks.js (100%) rename tests/cypress/support/{index.js => e2e.js} (100%) create mode 100644 tests/cypress_canvas3d.config.js delete mode 100644 tests/cypress_canvas3d.json create mode 100644 tests/nightly_cypress.config.js delete mode 100644 tests/nightly_cypress.json create mode 100644 tests/pr_cypress.config.js delete mode 100644 tests/pr_cypress.json create mode 100644 tests/pr_cypress_canvas3d.config.js delete mode 100644 tests/pr_cypress_canvas3d.json diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index 890020a0..6143c4db 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -347,13 +347,13 @@ jobs: --headed \ --browser chrome \ --env coverage=false \ - --config-file cypress_canvas3d.json \ - --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' + --config-file cypress_canvas3d.config.js \ + --spec 'cypress/e2e/${{ matrix.specs }}/**/*.js,cypress/e2e/remove_users_tasks_projects_organizations.js' else npx cypress run \ --browser chrome \ --env coverage=false \ - --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' + --spec 'cypress/e2e/${{ matrix.specs }}/**/*.js,cypress/e2e/remove_users_tasks_projects_organizations.js' fi - name: Creating a log file from "cvat" container logs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83f1fd8b..5282b979 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -302,13 +302,13 @@ jobs: --headed \ --browser chrome \ --env coverage=false \ - --config-file cypress_canvas3d.json \ - --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' + --config-file cypress_canvas3d.config.js \ + --spec 'cypress/e2e/${{ matrix.specs }}/**/*.js,cypress/e2e/remove_users_tasks_projects_organizations.js' else npx cypress run \ --browser chrome \ --env coverage=false \ - --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' + --spec 'cypress/e2e/${{ matrix.specs }}/**/*.js,cypress/e2e/remove_users_tasks_projects_organizations.js' fi - name: Creating a log file from "cvat" container logs diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index 9ecf7333..da28cc7e 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -347,13 +347,13 @@ jobs: npx cypress run \ --headed \ --browser chrome \ - --config-file cypress_canvas3d.json \ - --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' + --config-file cypress_canvas3d.config.js \ + --spec 'cypress/e2e/${{ matrix.specs }}/**/*.js,cypress/e2e/remove_users_tasks_projects_organizations.js' mv ./.nyc_output/out.json ./.nyc_output/out_${{ matrix.specs }}.json else npx cypress run \ --browser chrome \ - --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' + --spec 'cypress/e2e/${{ matrix.specs }}/**/*.js,cypress/e2e/remove_users_tasks_projects_organizations.js' mv ./.nyc_output/out.json ./.nyc_output/out_${{ matrix.specs }}.json fi diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js index dc3af958..5805283e 100644 --- a/tests/.eslintrc.js +++ b/tests/.eslintrc.js @@ -23,5 +23,6 @@ module.exports = { ...Object.fromEntries(Object.entries(globalConfig.rules).filter(([key]) => { return !key.startsWith('@typescript-eslint') })), + "cypress/no-unnecessary-waiting": "off", }, }; diff --git a/tests/cypress.config.js b/tests/cypress.config.js new file mode 100644 index 00000000..d92d28fb --- /dev/null +++ b/tests/cypress.config.js @@ -0,0 +1,39 @@ +const { defineConfig } = require('cypress'); +const plugins = require('./cypress/plugins/index'); + +module.exports = defineConfig({ + video: false, + viewportWidth: 1300, + viewportHeight: 960, + defaultCommandTimeout: 25000, + downloadsFolder: 'cypress/fixtures', + env: { + user: 'admin', + email: 'admin@localhost.company', + password: '12qwaszx', + }, + e2e: { + setupNodeEvents(on, config) { + return plugins(on, config); + }, + testIsolation: false, + baseUrl: 'http://localhost:8080', + specPattern: [ + 'cypress/e2e/auth_page.js', + 'cypress/e2e/skeletons/*.js', + 'cypress/e2e/webhooks.js', + 'cypress/e2e/masks/*.js', + 'cypress/e2e/actions_tasks/**/*.js', + 'cypress/e2e/actions_tasks2/**/*.js', + 'cypress/e2e/actions_tasks3/**/*.js', + 'cypress/e2e/actions_objects/**/*.js', + 'cypress/e2e/actions_objects2/**/*.js', + 'cypress/e2e/issues_prs/**/*.js', + 'cypress/e2e/issues_prs2/**/*.js', + 'cypress/e2e/actions_users/**/*.js', + 'cypress/e2e/actions_projects_models/**/*.js', + 'cypress/e2e/actions_organizations/**/*.js', + 'cypress/e2e/remove_users_tasks_projects_organizations.js', + ], + }, +}); diff --git a/tests/cypress.json b/tests/cypress.json deleted file mode 100644 index e7f43a6f..00000000 --- a/tests/cypress.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "video": false, - "baseUrl": "http://localhost:8080", - "viewportWidth": 1300, - "viewportHeight": 960, - "defaultCommandTimeout": 25000, - "downloadsFolder": "cypress/fixtures", - "env": { - "user": "admin", - "email": "admin@localhost.company", - "password": "12qwaszx" - }, - "testFiles": [ - "auth_page.js", - "skeletons/*.js", - "webhooks.js", - "masks/*.js", - "actions_tasks/**/*.js", - "actions_tasks2/**/*.js", - "actions_tasks3/**/*.js", - "actions_objects/**/*.js", - "actions_objects2/**/*.js", - "issues_prs/**/*.js", - "issues_prs2/**/*.js", - "actions_users/**/*.js", - "actions_projects_models/**/*.js", - "actions_organizations/**/*.js", - "remove_users_tasks_projects_organizations.js" - ] -} diff --git a/tests/cypress/integration/actions_objects/case_20_objects_ordering_feature.js b/tests/cypress/e2e/actions_objects/case_20_objects_ordering_feature.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_20_objects_ordering_feature.js rename to tests/cypress/e2e/actions_objects/case_20_objects_ordering_feature.js diff --git a/tests/cypress/integration/actions_objects/case_22_tag_annotation_mode.js b/tests/cypress/e2e/actions_objects/case_22_tag_annotation_mode.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_22_tag_annotation_mode.js rename to tests/cypress/e2e/actions_objects/case_22_tag_annotation_mode.js diff --git a/tests/cypress/integration/actions_objects/case_24_delete_unlock_lock_object.js b/tests/cypress/e2e/actions_objects/case_24_delete_unlock_lock_object.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_24_delete_unlock_lock_object.js rename to tests/cypress/e2e/actions_objects/case_24_delete_unlock_lock_object.js diff --git a/tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js b/tests/cypress/e2e/actions_objects/case_34_drawing_with_predefined_number_points.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js rename to tests/cypress/e2e/actions_objects/case_34_drawing_with_predefined_number_points.js diff --git a/tests/cypress/integration/actions_objects/case_36_always_show_object_details_feature.js b/tests/cypress/e2e/actions_objects/case_36_always_show_object_details_feature.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_36_always_show_object_details_feature.js rename to tests/cypress/e2e/actions_objects/case_36_always_show_object_details_feature.js diff --git a/tests/cypress/integration/actions_objects/case_37_object_make_copy.js b/tests/cypress/e2e/actions_objects/case_37_object_make_copy.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_37_object_make_copy.js rename to tests/cypress/e2e/actions_objects/case_37_object_make_copy.js diff --git a/tests/cypress/integration/actions_objects/case_53_object_propagate.js b/tests/cypress/e2e/actions_objects/case_53_object_propagate.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_53_object_propagate.js rename to tests/cypress/e2e/actions_objects/case_53_object_propagate.js diff --git a/tests/cypress/integration/actions_objects/case_54_redraw_feature.js b/tests/cypress/e2e/actions_objects/case_54_redraw_feature.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_54_redraw_feature.js rename to tests/cypress/e2e/actions_objects/case_54_redraw_feature.js diff --git a/tests/cypress/integration/actions_objects/case_55_repeat_draw_feature.js b/tests/cypress/e2e/actions_objects/case_55_repeat_draw_feature.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_55_repeat_draw_feature.js rename to tests/cypress/e2e/actions_objects/case_55_repeat_draw_feature.js diff --git a/tests/cypress/integration/actions_objects/case_59_edit_handler.js b/tests/cypress/e2e/actions_objects/case_59_edit_handler.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_59_edit_handler.js rename to tests/cypress/e2e/actions_objects/case_59_edit_handler.js diff --git a/tests/cypress/integration/actions_objects/case_60_autoborder_feature.js b/tests/cypress/e2e/actions_objects/case_60_autoborder_feature.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_60_autoborder_feature.js rename to tests/cypress/e2e/actions_objects/case_60_autoborder_feature.js diff --git a/tests/cypress/integration/actions_objects/case_99_save_filtered_object_in_AAM.js b/tests/cypress/e2e/actions_objects/case_99_save_filtered_object_in_AAM.js similarity index 100% rename from tests/cypress/integration/actions_objects/case_99_save_filtered_object_in_AAM.js rename to tests/cypress/e2e/actions_objects/case_99_save_filtered_object_in_AAM.js diff --git a/tests/cypress/integration/actions_objects2/case_108_rotated_bounding_boxes.js b/tests/cypress/e2e/actions_objects2/case_108_rotated_bounding_boxes.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_108_rotated_bounding_boxes.js rename to tests/cypress/e2e/actions_objects2/case_108_rotated_bounding_boxes.js diff --git a/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js b/tests/cypress/e2e/actions_objects2/case_10_polygon_shape_track_label_points.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js rename to tests/cypress/e2e/actions_objects2/case_10_polygon_shape_track_label_points.js diff --git a/tests/cypress/integration/actions_objects2/case_115_ellipse_shape_track_label.js b/tests/cypress/e2e/actions_objects2/case_115_ellipse_shape_track_label.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_115_ellipse_shape_track_label.js rename to tests/cypress/e2e/actions_objects2/case_115_ellipse_shape_track_label.js diff --git a/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js b/tests/cypress/e2e/actions_objects2/case_11_polylines_shape_track_label_points.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js rename to tests/cypress/e2e/actions_objects2/case_11_polylines_shape_track_label_points.js diff --git a/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js b/tests/cypress/e2e/actions_objects2/case_12_points_shape_track_label.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js rename to tests/cypress/e2e/actions_objects2/case_12_points_shape_track_label.js diff --git a/tests/cypress/integration/actions_objects2/case_13_merge_split_features.js b/tests/cypress/e2e/actions_objects2/case_13_merge_split_features.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_13_merge_split_features.js rename to tests/cypress/e2e/actions_objects2/case_13_merge_split_features.js diff --git a/tests/cypress/integration/actions_objects2/case_14_appearance_features.js b/tests/cypress/e2e/actions_objects2/case_14_appearance_features.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_14_appearance_features.js rename to tests/cypress/e2e/actions_objects2/case_14_appearance_features.js diff --git a/tests/cypress/integration/actions_objects2/case_15_group_features.js b/tests/cypress/e2e/actions_objects2/case_15_group_features.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_15_group_features.js rename to tests/cypress/e2e/actions_objects2/case_15_group_features.js diff --git a/tests/cypress/integration/actions_objects2/case_16_z_order_features.js b/tests/cypress/e2e/actions_objects2/case_16_z_order_features.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_16_z_order_features.js rename to tests/cypress/e2e/actions_objects2/case_16_z_order_features.js diff --git a/tests/cypress/integration/actions_objects2/case_17_lock_hide_features.js b/tests/cypress/e2e/actions_objects2/case_17_lock_hide_features.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_17_lock_hide_features.js rename to tests/cypress/e2e/actions_objects2/case_17_lock_hide_features.js diff --git a/tests/cypress/integration/actions_objects2/case_77_cropping_polygon_in_some_corner_cases.js b/tests/cypress/e2e/actions_objects2/case_77_cropping_polygon_in_some_corner_cases.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_77_cropping_polygon_in_some_corner_cases.js rename to tests/cypress/e2e/actions_objects2/case_77_cropping_polygon_in_some_corner_cases.js diff --git a/tests/cypress/integration/actions_objects2/case_8_rectangle_shape_track_label.js b/tests/cypress/e2e/actions_objects2/case_8_rectangle_shape_track_label.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_8_rectangle_shape_track_label.js rename to tests/cypress/e2e/actions_objects2/case_8_rectangle_shape_track_label.js diff --git a/tests/cypress/integration/actions_objects2/case_9_cuboid_shape_track_label.js b/tests/cypress/e2e/actions_objects2/case_9_cuboid_shape_track_label.js similarity index 100% rename from tests/cypress/integration/actions_objects2/case_9_cuboid_shape_track_label.js rename to tests/cypress/e2e/actions_objects2/case_9_cuboid_shape_track_label.js diff --git a/tests/cypress/integration/actions_objects2/case_delete_frame.js b/tests/cypress/e2e/actions_objects2/case_delete_frame.js similarity index 98% rename from tests/cypress/integration/actions_objects2/case_delete_frame.js rename to tests/cypress/e2e/actions_objects2/case_delete_frame.js index 937ac8ab..393fbc17 100644 --- a/tests/cypress/integration/actions_objects2/case_delete_frame.js +++ b/tests/cypress/e2e/actions_objects2/case_delete_frame.js @@ -36,7 +36,6 @@ context('Delete frame from job.', () => { it('Check open from non-deleted frame', () => { cy.visit('/tasks'); - cy.login(); cy.openTaskJob(taskName); cy.checkFrameNum(frame + 1); }); diff --git a/tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js b/tests/cypress/e2e/actions_organizations/case_113_new_organization_pipeline.js similarity index 99% rename from tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js rename to tests/cypress/e2e/actions_organizations/case_113_new_organization_pipeline.js index 93a9df86..44f56d84 100644 --- a/tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js +++ b/tests/cypress/e2e/actions_organizations/case_113_new_organization_pipeline.js @@ -114,10 +114,6 @@ context('New organization pipeline.', () => { } }); - beforeEach(() => { - Cypress.Cookies.preserveOnce('sessionid', 'csrftoken'); - }); - after(() => { cy.logout(thirdUserName); cy.getAuthKey().then((authKey) => { diff --git a/tests/cypress/integration/actions_projects_models/case_103_project_export.js b/tests/cypress/e2e/actions_projects_models/case_103_project_export.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/case_103_project_export.js rename to tests/cypress/e2e/actions_projects_models/case_103_project_export.js diff --git a/tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js b/tests/cypress/e2e/actions_projects_models/case_104_project_export_3d.js similarity index 97% rename from tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js rename to tests/cypress/e2e/actions_projects_models/case_104_project_export_3d.js index c2094d2b..fed46444 100644 --- a/tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js +++ b/tests/cypress/e2e/actions_projects_models/case_104_project_export_3d.js @@ -14,7 +14,7 @@ context('Export project dataset with 3D task.', { browser: '!firefox' }, () => { label3d: labelName, attrName3d: 'Kind', attrValue3d: 'Oak', - archiveName: '../../cypress/integration/canvas3d_functionality/assets/test_canvas3d.zip', + archiveName: '../../cypress/e2e/canvas3d_functionality/assets/test_canvas3d.zip', advancedConfigurationParams: false, forProject: true, attachToProject: false, diff --git a/tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js b/tests/cypress/e2e/actions_projects_models/case_114_backup_restore_project.js similarity index 98% rename from tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js rename to tests/cypress/e2e/actions_projects_models/case_114_backup_restore_project.js index 9229fc7f..bccb10dc 100644 --- a/tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js +++ b/tests/cypress/e2e/actions_projects_models/case_114_backup_restore_project.js @@ -113,7 +113,7 @@ context('Backup, restore a project.', { browser: '!firefox' }, () => { }); context('Backup, restore a project with a 3D task.', { browser: '!firefox' }, () => { - const archiveName3d = '../../cypress/integration/canvas3d_functionality/assets/test_canvas3d.zip'; + const archiveName3d = '../../cypress/e2e/canvas3d_functionality/assets/test_canvas3d.zip'; const cuboidCreationParams = { labelName: project.label, diff --git a/tests/cypress/integration/actions_projects_models/case_116_creating_project_by_inserting_labels_from_task.js b/tests/cypress/e2e/actions_projects_models/case_116_creating_project_by_inserting_labels_from_task.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/case_116_creating_project_by_inserting_labels_from_task.js rename to tests/cypress/e2e/actions_projects_models/case_116_creating_project_by_inserting_labels_from_task.js diff --git a/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js b/tests/cypress/e2e/actions_projects_models/case_117_backup_restore_project_to_various_storages.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js rename to tests/cypress/e2e/actions_projects_models/case_117_backup_restore_project_to_various_storages.js diff --git a/tests/cypress/integration/actions_projects_models/case_57_project_label_deleting_feature.js b/tests/cypress/e2e/actions_projects_models/case_57_project_label_deleting_feature.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/case_57_project_label_deleting_feature.js rename to tests/cypress/e2e/actions_projects_models/case_57_project_label_deleting_feature.js diff --git a/tests/cypress/integration/actions_projects_models/case_94_move_task_between_projects.js b/tests/cypress/e2e/actions_projects_models/case_94_move_task_between_projects.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/case_94_move_task_between_projects.js rename to tests/cypress/e2e/actions_projects_models/case_94_move_task_between_projects.js diff --git a/tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js b/tests/cypress/e2e/actions_projects_models/case_95_move_task_to_project.js similarity index 97% rename from tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js rename to tests/cypress/e2e/actions_projects_models/case_95_move_task_to_project.js index 0320e2a5..c12ba47c 100644 --- a/tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js +++ b/tests/cypress/e2e/actions_projects_models/case_95_move_task_to_project.js @@ -39,7 +39,7 @@ context('Move a task to a project.', { browser: '!firefox' }, () => { const posY = 10; const color = 'gray'; const archiveName = `${imageFileName}.zip`; - const archiveName3d = '../../cypress/integration/canvas3d_functionality/assets/test_canvas3d.zip'; + const archiveName3d = '../../cypress/e2e/canvas3d_functionality/assets/test_canvas3d.zip'; const archivePath = `cypress/fixtures/${archiveName}`; const imagesFolder = `cypress/fixtures/${imageFileName}`; const directoryToArchive = imagesFolder; diff --git a/tests/cypress/integration/actions_projects_models/case_98_models_page.js b/tests/cypress/e2e/actions_projects_models/case_98_models_page.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/case_98_models_page.js rename to tests/cypress/e2e/actions_projects_models/case_98_models_page.js diff --git a/tests/cypress/integration/actions_projects_models/issue_2625_delete_project_via_actions.js b/tests/cypress/e2e/actions_projects_models/issue_2625_delete_project_via_actions.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/issue_2625_delete_project_via_actions.js rename to tests/cypress/e2e/actions_projects_models/issue_2625_delete_project_via_actions.js diff --git a/tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js b/tests/cypress/e2e/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js similarity index 97% rename from tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js rename to tests/cypress/e2e/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js index 668a2723..63e1d7b3 100644 --- a/tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js +++ b/tests/cypress/e2e/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js @@ -26,7 +26,7 @@ context('Create more than one task per time when create from project.', () => { function createTask(nameTaskToCreate) { cy.get('[id="name"]').clear().type(nameTaskToCreate); - cy.get('.cvat-project-search-field').within(() => { + cy.get('.cvat-project-search-field').first().within(() => { cy.get('[type="search"]').should('have.value', projectName); }); cy.get('.cvat-constructor-viewer-new-item').should('not.exist'); diff --git a/tests/cypress/integration/actions_projects_models/registration_involved/base_actions_project_task_user.js b/tests/cypress/e2e/actions_projects_models/registration_involved/base_actions_project_task_user.js similarity index 100% rename from tests/cypress/integration/actions_projects_models/registration_involved/base_actions_project_task_user.js rename to tests/cypress/e2e/actions_projects_models/registration_involved/base_actions_project_task_user.js diff --git a/tests/cypress/integration/actions_tasks/assets/case_65_manifest/demo_manifest.jsonl b/tests/cypress/e2e/actions_tasks/assets/case_65_manifest/demo_manifest.jsonl similarity index 100% rename from tests/cypress/integration/actions_tasks/assets/case_65_manifest/demo_manifest.jsonl rename to tests/cypress/e2e/actions_tasks/assets/case_65_manifest/demo_manifest.jsonl diff --git a/tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_1.png b/tests/cypress/e2e/actions_tasks/assets/case_65_manifest/image_case_65_1.png similarity index 100% rename from tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_1.png rename to tests/cypress/e2e/actions_tasks/assets/case_65_manifest/image_case_65_1.png diff --git a/tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_2.png b/tests/cypress/e2e/actions_tasks/assets/case_65_manifest/image_case_65_2.png similarity index 100% rename from tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_2.png rename to tests/cypress/e2e/actions_tasks/assets/case_65_manifest/image_case_65_2.png diff --git a/tests/cypress/integration/actions_tasks/assets/case_65_manifest/manifest.jsonl b/tests/cypress/e2e/actions_tasks/assets/case_65_manifest/manifest.jsonl similarity index 100% rename from tests/cypress/integration/actions_tasks/assets/case_65_manifest/manifest.jsonl rename to tests/cypress/e2e/actions_tasks/assets/case_65_manifest/manifest.jsonl diff --git a/tests/cypress/integration/actions_tasks/case_100_settings_default_number_of_points_in_polygon_approximation.js b/tests/cypress/e2e/actions_tasks/case_100_settings_default_number_of_points_in_polygon_approximation.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_100_settings_default_number_of_points_in_polygon_approximation.js rename to tests/cypress/e2e/actions_tasks/case_100_settings_default_number_of_points_in_polygon_approximation.js diff --git a/tests/cypress/integration/actions_tasks/case_102_create_link_shape_frame.js b/tests/cypress/e2e/actions_tasks/case_102_create_link_shape_frame.js similarity index 95% rename from tests/cypress/integration/actions_tasks/case_102_create_link_shape_frame.js rename to tests/cypress/e2e/actions_tasks/case_102_create_link_shape_frame.js index da6baa02..08862798 100644 --- a/tests/cypress/integration/actions_tasks/case_102_create_link_shape_frame.js +++ b/tests/cypress/e2e/actions_tasks/case_102_create_link_shape_frame.js @@ -25,7 +25,7 @@ context('Create a link for shape, frame.', () => { }); describe(`Testing case "${caseId}"`, () => { - it('Create a link for a shape, for a frame.', () => { + it('Create a link for a shape.', () => { cy.window().then((win) => { cy.stub(win, 'prompt').returns(win.prompt).as('copyToClipboardPromptShape'); }); @@ -42,7 +42,9 @@ context('Create a link for shape, frame.', () => { cy.get('.cvat-canvas-container').should('be.visible'); cy.get('#cvat_canvas_shape_1').should('be.visible'); }); + }); + it('Create a link for a frame.', () => { cy.window().then((win) => { cy.stub(win, 'prompt').returns(win.prompt).as('copyToClipboardPromptFrame'); }); diff --git a/tests/cypress/integration/actions_tasks/case_110_settings_smooth_image_option.js b/tests/cypress/e2e/actions_tasks/case_110_settings_smooth_image_option.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_110_settings_smooth_image_option.js rename to tests/cypress/e2e/actions_tasks/case_110_settings_smooth_image_option.js diff --git a/tests/cypress/integration/actions_tasks/case_117_paste_labels_from_another_task.js b/tests/cypress/e2e/actions_tasks/case_117_paste_labels_from_another_task.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_117_paste_labels_from_another_task.js rename to tests/cypress/e2e/actions_tasks/case_117_paste_labels_from_another_task.js diff --git a/tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js b/tests/cypress/e2e/actions_tasks/case_51_settings_auto_save.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js rename to tests/cypress/e2e/actions_tasks/case_51_settings_auto_save.js diff --git a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js b/tests/cypress/e2e/actions_tasks/case_52_dump_upload_annotation.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js rename to tests/cypress/e2e/actions_tasks/case_52_dump_upload_annotation.js diff --git a/tests/cypress/integration/actions_tasks/case_58_task_label_deleting_feature.js b/tests/cypress/e2e/actions_tasks/case_58_task_label_deleting_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_58_task_label_deleting_feature.js rename to tests/cypress/e2e/actions_tasks/case_58_task_label_deleting_feature.js diff --git a/tests/cypress/integration/actions_tasks/case_61_create_task_set_issue_tracker.js b/tests/cypress/e2e/actions_tasks/case_61_create_task_set_issue_tracker.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_61_create_task_set_issue_tracker.js rename to tests/cypress/e2e/actions_tasks/case_61_create_task_set_issue_tracker.js diff --git a/tests/cypress/integration/actions_tasks/case_65_create_task_with_manifest.js b/tests/cypress/e2e/actions_tasks/case_65_create_task_with_manifest.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_65_create_task_with_manifest.js rename to tests/cypress/e2e/actions_tasks/case_65_create_task_with_manifest.js diff --git a/tests/cypress/integration/actions_tasks/case_66_rename_label_raw_editor.js b/tests/cypress/e2e/actions_tasks/case_66_rename_label_raw_editor.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_66_rename_label_raw_editor.js rename to tests/cypress/e2e/actions_tasks/case_66_rename_label_raw_editor.js diff --git a/tests/cypress/integration/actions_tasks/case_67_intelligent_polygon_cropping.js b/tests/cypress/e2e/actions_tasks/case_67_intelligent_polygon_cropping.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_67_intelligent_polygon_cropping.js rename to tests/cypress/e2e/actions_tasks/case_67_intelligent_polygon_cropping.js diff --git a/tests/cypress/integration/actions_tasks/case_68_saving_settings_local_storage.js b/tests/cypress/e2e/actions_tasks/case_68_saving_settings_local_storage.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_68_saving_settings_local_storage.js rename to tests/cypress/e2e/actions_tasks/case_68_saving_settings_local_storage.js diff --git a/tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js b/tests/cypress/e2e/actions_tasks/case_70_mutable_attribute.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js rename to tests/cypress/e2e/actions_tasks/case_70_mutable_attribute.js diff --git a/tests/cypress/integration/actions_tasks/case_71_shortcuts_window.js b/tests/cypress/e2e/actions_tasks/case_71_shortcuts_window.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_71_shortcuts_window.js rename to tests/cypress/e2e/actions_tasks/case_71_shortcuts_window.js diff --git a/tests/cypress/integration/actions_tasks/case_72_hotkeys_change_labels.js b/tests/cypress/e2e/actions_tasks/case_72_hotkeys_change_labels.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_72_hotkeys_change_labels.js rename to tests/cypress/e2e/actions_tasks/case_72_hotkeys_change_labels.js diff --git a/tests/cypress/integration/actions_tasks/case_75_overlap_size.js b/tests/cypress/e2e/actions_tasks/case_75_overlap_size.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_75_overlap_size.js rename to tests/cypress/e2e/actions_tasks/case_75_overlap_size.js diff --git a/tests/cypress/integration/actions_tasks/case_96_create_save_undo_save_redo_save.js b/tests/cypress/e2e/actions_tasks/case_96_create_save_undo_save_redo_save.js similarity index 100% rename from tests/cypress/integration/actions_tasks/case_96_create_save_undo_save_redo_save.js rename to tests/cypress/e2e/actions_tasks/case_96_create_save_undo_save_redo_save.js diff --git a/tests/cypress/integration/actions_tasks/continue_frame_n.js b/tests/cypress/e2e/actions_tasks/continue_frame_n.js similarity index 100% rename from tests/cypress/integration/actions_tasks/continue_frame_n.js rename to tests/cypress/e2e/actions_tasks/continue_frame_n.js diff --git a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/e2e/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js similarity index 100% rename from tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js rename to tests/cypress/e2e/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js diff --git a/tests/cypress/integration/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js b/tests/cypress/e2e/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js similarity index 98% rename from tests/cypress/integration/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js rename to tests/cypress/e2e/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js index 6a52c1e2..8aca7ec2 100644 --- a/tests/cypress/integration/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js +++ b/tests/cypress/e2e/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js @@ -36,6 +36,7 @@ context('Rename a task.', () => { cy.get('[aria-label="edit"]').click(); }); cy.contains('.cvat-text-color', myTaskName).click().type(newValue); + cy.get('.cvat-spinner').should('not.exist'); } before(() => { diff --git a/tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js b/tests/cypress/e2e/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js similarity index 100% rename from tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js rename to tests/cypress/e2e/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js diff --git a/tests/cypress/integration/actions_tasks/task_changes_status_after_initial_save.js b/tests/cypress/e2e/actions_tasks/task_changes_status_after_initial_save.js similarity index 100% rename from tests/cypress/integration/actions_tasks/task_changes_status_after_initial_save.js rename to tests/cypress/e2e/actions_tasks/task_changes_status_after_initial_save.js diff --git a/tests/cypress/integration/actions_tasks/task_rectangles_only.js b/tests/cypress/e2e/actions_tasks/task_rectangles_only.js similarity index 100% rename from tests/cypress/integration/actions_tasks/task_rectangles_only.js rename to tests/cypress/e2e/actions_tasks/task_rectangles_only.js diff --git a/tests/cypress/integration/actions_tasks2/case_101_opencv_basic_actions.js b/tests/cypress/e2e/actions_tasks2/case_101_opencv_basic_actions.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_101_opencv_basic_actions.js rename to tests/cypress/e2e/actions_tasks2/case_101_opencv_basic_actions.js diff --git a/tests/cypress/integration/actions_tasks2/case_111_settings_text_size_position_label_content.js b/tests/cypress/e2e/actions_tasks2/case_111_settings_text_size_position_label_content.js similarity index 98% rename from tests/cypress/integration/actions_tasks2/case_111_settings_text_size_position_label_content.js rename to tests/cypress/e2e/actions_tasks2/case_111_settings_text_size_position_label_content.js index 8fe9895b..a8a14a25 100644 --- a/tests/cypress/integration/actions_tasks2/case_111_settings_text_size_position_label_content.js +++ b/tests/cypress/e2e/actions_tasks2/case_111_settings_text_size_position_label_content.js @@ -145,7 +145,9 @@ context('Settings. Text size/position. Text labels content.', () => { it('Text labels content.', () => { cy.openSettings(); cy.get('.cvat-workspace-settings-text-content').within(() => { - cy.get('[aria-label="close"]').click({ multiple: true }); + cy.get('[aria-label="close"]').each((el) => { + cy.wrap(el).click(); + }); }); cy.get('.cvat-workspace-settings-text-content').click(); diff --git a/tests/cypress/integration/actions_tasks2/case_21_canvas_color_feature.js b/tests/cypress/e2e/actions_tasks2/case_21_canvas_color_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_21_canvas_color_feature.js rename to tests/cypress/e2e/actions_tasks2/case_21_canvas_color_feature.js diff --git a/tests/cypress/integration/actions_tasks2/case_23_canvas_grid_feature.js b/tests/cypress/e2e/actions_tasks2/case_23_canvas_grid_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_23_canvas_grid_feature.js rename to tests/cypress/e2e/actions_tasks2/case_23_canvas_grid_feature.js diff --git a/tests/cypress/integration/actions_tasks2/case_25_canvas_bitmap_feature.js b/tests/cypress/e2e/actions_tasks2/case_25_canvas_bitmap_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_25_canvas_bitmap_feature.js rename to tests/cypress/e2e/actions_tasks2/case_25_canvas_bitmap_feature.js diff --git a/tests/cypress/integration/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js b/tests/cypress/e2e/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js rename to tests/cypress/e2e/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js diff --git a/tests/cypress/integration/actions_tasks2/case_27_undo_redo_feature.js b/tests/cypress/e2e/actions_tasks2/case_27_undo_redo_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_27_undo_redo_feature.js rename to tests/cypress/e2e/actions_tasks2/case_27_undo_redo_feature.js diff --git a/tests/cypress/integration/actions_tasks2/case_29_settings_player_step.js b/tests/cypress/e2e/actions_tasks2/case_29_settings_player_step.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_29_settings_player_step.js rename to tests/cypress/e2e/actions_tasks2/case_29_settings_player_step.js diff --git a/tests/cypress/integration/actions_tasks2/case_30_collapse_sidebar_appearance.js b/tests/cypress/e2e/actions_tasks2/case_30_collapse_sidebar_appearance.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_30_collapse_sidebar_appearance.js rename to tests/cypress/e2e/actions_tasks2/case_30_collapse_sidebar_appearance.js diff --git a/tests/cypress/integration/actions_tasks2/case_31_label_constructor_color_name_label.js b/tests/cypress/e2e/actions_tasks2/case_31_label_constructor_color_name_label.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_31_label_constructor_color_name_label.js rename to tests/cypress/e2e/actions_tasks2/case_31_label_constructor_color_name_label.js diff --git a/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js b/tests/cypress/e2e/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js rename to tests/cypress/e2e/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js diff --git a/tests/cypress/integration/actions_tasks2/case_33_button_continue_label_editor.js b/tests/cypress/e2e/actions_tasks2/case_33_button_continue_label_editor.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_33_button_continue_label_editor.js rename to tests/cypress/e2e/actions_tasks2/case_33_button_continue_label_editor.js diff --git a/tests/cypress/integration/actions_tasks2/case_40_create_task_without_necessary_arguments.js b/tests/cypress/e2e/actions_tasks2/case_40_create_task_without_necessary_arguments.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_40_create_task_without_necessary_arguments.js rename to tests/cypress/e2e/actions_tasks2/case_40_create_task_without_necessary_arguments.js diff --git a/tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js b/tests/cypress/e2e/actions_tasks2/case_41_add_delete_label_attribute.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js rename to tests/cypress/e2e/actions_tasks2/case_41_add_delete_label_attribute.js diff --git a/tests/cypress/integration/actions_tasks2/case_42_change_label_name_via_label_constructor.js b/tests/cypress/e2e/actions_tasks2/case_42_change_label_name_via_label_constructor.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_42_change_label_name_via_label_constructor.js rename to tests/cypress/e2e/actions_tasks2/case_42_change_label_name_via_label_constructor.js diff --git a/tests/cypress/integration/actions_tasks2/case_43_create_label_with_existing_label_name.js b/tests/cypress/e2e/actions_tasks2/case_43_create_label_with_existing_label_name.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_43_create_label_with_existing_label_name.js rename to tests/cypress/e2e/actions_tasks2/case_43_create_label_with_existing_label_name.js diff --git a/tests/cypress/integration/actions_tasks2/case_76_try_create_task_incorrect_dataset_repo.js b/tests/cypress/e2e/actions_tasks2/case_76_try_create_task_incorrect_dataset_repo.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_76_try_create_task_incorrect_dataset_repo.js rename to tests/cypress/e2e/actions_tasks2/case_76_try_create_task_incorrect_dataset_repo.js diff --git a/tests/cypress/integration/actions_tasks2/case_97_export_import_task.js b/tests/cypress/e2e/actions_tasks2/case_97_export_import_task.js similarity index 100% rename from tests/cypress/integration/actions_tasks2/case_97_export_import_task.js rename to tests/cypress/e2e/actions_tasks2/case_97_export_import_task.js diff --git a/tests/cypress/integration/actions_tasks3/assets/case_109/preview_AWS_S3_BUCKET.png b/tests/cypress/e2e/actions_tasks3/assets/case_109/preview_AWS_S3_BUCKET.png similarity index 100% rename from tests/cypress/integration/actions_tasks3/assets/case_109/preview_AWS_S3_BUCKET.png rename to tests/cypress/e2e/actions_tasks3/assets/case_109/preview_AWS_S3_BUCKET.png diff --git a/tests/cypress/integration/actions_tasks3/assets/case_109/preview_AZURE_CONTAINER.png b/tests/cypress/e2e/actions_tasks3/assets/case_109/preview_AZURE_CONTAINER.png similarity index 100% rename from tests/cypress/integration/actions_tasks3/assets/case_109/preview_AZURE_CONTAINER.png rename to tests/cypress/e2e/actions_tasks3/assets/case_109/preview_AZURE_CONTAINER.png diff --git a/tests/cypress/integration/actions_tasks3/assets/case_109/preview_GOOGLE_CLOUD_STORAGE.png b/tests/cypress/e2e/actions_tasks3/assets/case_109/preview_GOOGLE_CLOUD_STORAGE.png similarity index 100% rename from tests/cypress/integration/actions_tasks3/assets/case_109/preview_GOOGLE_CLOUD_STORAGE.png rename to tests/cypress/e2e/actions_tasks3/assets/case_109/preview_GOOGLE_CLOUD_STORAGE.png diff --git a/tests/cypress/integration/actions_tasks3/assets/case_90/case_90_context_image.zip b/tests/cypress/e2e/actions_tasks3/assets/case_90/case_90_context_image.zip similarity index 100% rename from tests/cypress/integration/actions_tasks3/assets/case_90/case_90_context_image.zip rename to tests/cypress/e2e/actions_tasks3/assets/case_90/case_90_context_image.zip diff --git a/tests/cypress/integration/actions_tasks3/case_105_cloud_storage.js b/tests/cypress/e2e/actions_tasks3/case_105_cloud_storage.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_105_cloud_storage.js rename to tests/cypress/e2e/actions_tasks3/case_105_cloud_storage.js diff --git a/tests/cypress/integration/actions_tasks3/case_107_connected_file_share.js b/tests/cypress/e2e/actions_tasks3/case_107_connected_file_share.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_107_connected_file_share.js rename to tests/cypress/e2e/actions_tasks3/case_107_connected_file_share.js diff --git a/tests/cypress/integration/actions_tasks3/case_109_dummy_cloud_storage.js b/tests/cypress/e2e/actions_tasks3/case_109_dummy_cloud_storage.js similarity index 98% rename from tests/cypress/integration/actions_tasks3/case_109_dummy_cloud_storage.js rename to tests/cypress/e2e/actions_tasks3/case_109_dummy_cloud_storage.js index edc47e97..83593328 100644 --- a/tests/cypress/integration/actions_tasks3/case_109_dummy_cloud_storage.js +++ b/tests/cypress/e2e/actions_tasks3/case_109_dummy_cloud_storage.js @@ -12,7 +12,7 @@ const { context('Dummy cloud storages.', { browser: '!firefox' }, () => { const caseId = '109'; - const imageFolder = '../integration/actions_tasks3/assets/case_109'; + const imageFolder = '../e2e/actions_tasks3/assets/case_109'; function testListDummyCloudStorages(dummyCS) { cy.intercept('GET', 'api/cloudstorages?**', dummyCS).as('listCS'); @@ -84,8 +84,11 @@ context('Dummy cloud storages.', { browser: '!firefox' }, () => { cy.get('.cvat-cloud-storage-form').should('be.visible'); } - beforeEach(() => { + before(() => { cy.visit('auth/login'); + }); + + beforeEach(() => { cy.login(); }); diff --git a/tests/cypress/integration/actions_tasks3/case_112_tus_upload.js b/tests/cypress/e2e/actions_tasks3/case_112_tus_upload.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_112_tus_upload.js rename to tests/cypress/e2e/actions_tasks3/case_112_tus_upload.js diff --git a/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js b/tests/cypress/e2e/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js rename to tests/cypress/e2e/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js diff --git a/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js b/tests/cypress/e2e/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js rename to tests/cypress/e2e/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js diff --git a/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js b/tests/cypress/e2e/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js rename to tests/cypress/e2e/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js diff --git a/tests/cypress/integration/actions_tasks3/case_118_multi_tasks.js b/tests/cypress/e2e/actions_tasks3/case_118_multi_tasks.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_118_multi_tasks.js rename to tests/cypress/e2e/actions_tasks3/case_118_multi_tasks.js diff --git a/tests/cypress/integration/actions_tasks3/case_18_filters_functionality.js b/tests/cypress/e2e/actions_tasks3/case_18_filters_functionality.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_18_filters_functionality.js rename to tests/cypress/e2e/actions_tasks3/case_18_filters_functionality.js diff --git a/tests/cypress/integration/actions_tasks3/case_19_all_image_rotate_features.js b/tests/cypress/e2e/actions_tasks3/case_19_all_image_rotate_features.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_19_all_image_rotate_features.js rename to tests/cypress/e2e/actions_tasks3/case_19_all_image_rotate_features.js diff --git a/tests/cypress/integration/actions_tasks3/case_1_create_delete_task_label_color.js b/tests/cypress/e2e/actions_tasks3/case_1_create_delete_task_label_color.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_1_create_delete_task_label_color.js rename to tests/cypress/e2e/actions_tasks3/case_1_create_delete_task_label_color.js diff --git a/tests/cypress/integration/actions_tasks3/case_3_task_start_stop_step_frame.js b/tests/cypress/e2e/actions_tasks3/case_3_task_start_stop_step_frame.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_3_task_start_stop_step_frame.js rename to tests/cypress/e2e/actions_tasks3/case_3_task_start_stop_step_frame.js diff --git a/tests/cypress/integration/actions_tasks3/case_44_changing_default_value_for_attribute.js b/tests/cypress/e2e/actions_tasks3/case_44_changing_default_value_for_attribute.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_44_changing_default_value_for_attribute.js rename to tests/cypress/e2e/actions_tasks3/case_44_changing_default_value_for_attribute.js diff --git a/tests/cypress/integration/actions_tasks3/case_45_open_the_task_button.js b/tests/cypress/e2e/actions_tasks3/case_45_open_the_task_button.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_45_open_the_task_button.js rename to tests/cypress/e2e/actions_tasks3/case_45_open_the_task_button.js diff --git a/tests/cypress/integration/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js b/tests/cypress/e2e/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js rename to tests/cypress/e2e/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js diff --git a/tests/cypress/integration/actions_tasks3/case_47_export_dataset.js b/tests/cypress/e2e/actions_tasks3/case_47_export_dataset.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_47_export_dataset.js rename to tests/cypress/e2e/actions_tasks3/case_47_export_dataset.js diff --git a/tests/cypress/integration/actions_tasks3/case_48_issue_2663_annotations_statistics.js b/tests/cypress/e2e/actions_tasks3/case_48_issue_2663_annotations_statistics.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_48_issue_2663_annotations_statistics.js rename to tests/cypress/e2e/actions_tasks3/case_48_issue_2663_annotations_statistics.js diff --git a/tests/cypress/integration/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js b/tests/cypress/e2e/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js rename to tests/cypress/e2e/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js diff --git a/tests/cypress/integration/actions_tasks3/case_50_settings_player_speed.js b/tests/cypress/e2e/actions_tasks3/case_50_settings_player_speed.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_50_settings_player_speed.js rename to tests/cypress/e2e/actions_tasks3/case_50_settings_player_speed.js diff --git a/tests/cypress/integration/actions_tasks3/case_5_image_rotate.js b/tests/cypress/e2e/actions_tasks3/case_5_image_rotate.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_5_image_rotate.js rename to tests/cypress/e2e/actions_tasks3/case_5_image_rotate.js diff --git a/tests/cypress/integration/actions_tasks3/case_6_image_scale_fit.js b/tests/cypress/e2e/actions_tasks3/case_6_image_scale_fit.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_6_image_scale_fit.js rename to tests/cypress/e2e/actions_tasks3/case_6_image_scale_fit.js diff --git a/tests/cypress/integration/actions_tasks3/case_74_drag_canvas.js b/tests/cypress/e2e/actions_tasks3/case_74_drag_canvas.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_74_drag_canvas.js rename to tests/cypress/e2e/actions_tasks3/case_74_drag_canvas.js diff --git a/tests/cypress/integration/actions_tasks3/case_7_image_scale_roi.js b/tests/cypress/e2e/actions_tasks3/case_7_image_scale_roi.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_7_image_scale_roi.js rename to tests/cypress/e2e/actions_tasks3/case_7_image_scale_roi.js diff --git a/tests/cypress/integration/actions_tasks3/case_90_context_image.js b/tests/cypress/e2e/actions_tasks3/case_90_context_image.js similarity index 100% rename from tests/cypress/integration/actions_tasks3/case_90_context_image.js rename to tests/cypress/e2e/actions_tasks3/case_90_context_image.js diff --git a/tests/cypress/integration/actions_users/case_106_email_confirmation_page.js b/tests/cypress/e2e/actions_users/case_106_email_confirmation_page.js similarity index 100% rename from tests/cypress/integration/actions_users/case_106_email_confirmation_page.js rename to tests/cypress/e2e/actions_users/case_106_email_confirmation_page.js diff --git a/tests/cypress/integration/actions_users/case_38_feedback_button.js b/tests/cypress/e2e/actions_users/case_38_feedback_button.js similarity index 100% rename from tests/cypress/integration/actions_users/case_38_feedback_button.js rename to tests/cypress/e2e/actions_users/case_38_feedback_button.js diff --git a/tests/cypress/integration/actions_users/case_73_reset_password_notification.js b/tests/cypress/e2e/actions_users/case_73_reset_password_notification.js similarity index 100% rename from tests/cypress/integration/actions_users/case_73_reset_password_notification.js rename to tests/cypress/e2e/actions_users/case_73_reset_password_notification.js diff --git a/tests/cypress/integration/actions_users/issue_1810_login_logout.js b/tests/cypress/e2e/actions_users/issue_1810_login_logout.js similarity index 95% rename from tests/cypress/integration/actions_users/issue_1810_login_logout.js rename to tests/cypress/e2e/actions_users/issue_1810_login_logout.js index d470452c..dc4e58c1 100644 --- a/tests/cypress/integration/actions_users/issue_1810_login_logout.js +++ b/tests/cypress/e2e/actions_users/issue_1810_login_logout.js @@ -18,6 +18,9 @@ context('When clicking on the Logout button, get the user session closed.', () = } before(() => { + // TMP fix for login tests, need to change login logic with sessions + cy.clearAllCookies(); + cy.clearAllLocalStorage(); cy.visit('auth/login'); }); @@ -107,7 +110,7 @@ context('When clicking on the Logout button, get the user session closed.', () = expect(socialAuthMethods).length.gt(0); cy.visit('auth/login'); - cy.get('.cvat-social-authentication-icon').should('have.length', socialAuthMethods.length).within((items) => { + cy.get('.cvat-social-authentication-icon').should('have.length', socialAuthMethods.length).children((items) => { for (const item of items) { expect(item.children.length).to.be.equal(1); // check that icon was received from the server } diff --git a/tests/cypress/integration/actions_users/issue_2440_value_must_be_a_user_instance.js b/tests/cypress/e2e/actions_users/issue_2440_value_must_be_a_user_instance.js similarity index 100% rename from tests/cypress/integration/actions_users/issue_2440_value_must_be_a_user_instance.js rename to tests/cypress/e2e/actions_users/issue_2440_value_must_be_a_user_instance.js diff --git a/tests/cypress/integration/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js b/tests/cypress/e2e/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js similarity index 97% rename from tests/cypress/integration/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js rename to tests/cypress/e2e/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js index 29f22c5b..3fbdd4a9 100644 --- a/tests/cypress/integration/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js +++ b/tests/cypress/e2e/actions_users/issue_2524_2633_issue_not_reset_after_change_task_issue_point_firefox.js @@ -50,10 +50,6 @@ context('Some parts of the Redux state (issues) is not reset after changing a ta cy.createAnnotationTask(taskName.secondTaskName, labelName, attrName, textDefaultValue, archiveName); }); - beforeEach(() => { - Cypress.Cookies.preserveOnce('sessionid', 'csrftoken'); - }); - after(() => { cy.goToTaskList(); cy.deleteTask(taskName.firstTaskName); diff --git a/tests/cypress/integration/actions_users/registration_involved/case_28_review_pipeline_feature.js b/tests/cypress/e2e/actions_users/registration_involved/case_28_review_pipeline_feature.js similarity index 100% rename from tests/cypress/integration/actions_users/registration_involved/case_28_review_pipeline_feature.js rename to tests/cypress/e2e/actions_users/registration_involved/case_28_review_pipeline_feature.js diff --git a/tests/cypress/integration/actions_users/registration_involved/case_2_register_user_change_pass.js b/tests/cypress/e2e/actions_users/registration_involved/case_2_register_user_change_pass.js similarity index 100% rename from tests/cypress/integration/actions_users/registration_involved/case_2_register_user_change_pass.js rename to tests/cypress/e2e/actions_users/registration_involved/case_2_register_user_change_pass.js diff --git a/tests/cypress/integration/actions_users/registration_involved/case_4_assign_task_job_users.js b/tests/cypress/e2e/actions_users/registration_involved/case_4_assign_task_job_users.js similarity index 99% rename from tests/cypress/integration/actions_users/registration_involved/case_4_assign_task_job_users.js rename to tests/cypress/e2e/actions_users/registration_involved/case_4_assign_task_job_users.js index 0463d4d0..7301f615 100644 --- a/tests/cypress/integration/actions_users/registration_involved/case_4_assign_task_job_users.js +++ b/tests/cypress/e2e/actions_users/registration_involved/case_4_assign_task_job_users.js @@ -160,7 +160,6 @@ context('Multiple users. Assign task, job. Deactivating users.', () => { }); it('First user login. Getting authKey.', () => { - cy.visit('/'); cy.intercept('POST', '/api/auth/login**').as('login'); cy.login(); cy.wait('@login').then((response) => { diff --git a/tests/cypress/integration/actions_users/registration_involved/issue_1599_ch_user_registration.js b/tests/cypress/e2e/actions_users/registration_involved/issue_1599_ch_user_registration.js similarity index 100% rename from tests/cypress/integration/actions_users/registration_involved/issue_1599_ch_user_registration.js rename to tests/cypress/e2e/actions_users/registration_involved/issue_1599_ch_user_registration.js diff --git a/tests/cypress/integration/actions_users/registration_involved/issue_1599_pl_user_registration.js b/tests/cypress/e2e/actions_users/registration_involved/issue_1599_pl_user_registration.js similarity index 100% rename from tests/cypress/integration/actions_users/registration_involved/issue_1599_pl_user_registration.js rename to tests/cypress/e2e/actions_users/registration_involved/issue_1599_pl_user_registration.js diff --git a/tests/cypress/integration/auth_page.js b/tests/cypress/e2e/auth_page.js similarity index 70% rename from tests/cypress/integration/auth_page.js rename to tests/cypress/e2e/auth_page.js index 6691b5bf..3d21a2fd 100644 --- a/tests/cypress/integration/auth_page.js +++ b/tests/cypress/e2e/auth_page.js @@ -13,20 +13,15 @@ describe('Check server availability', () => { cy.url().should('include', '/auth/login'); }); - it('"Sign in" button is exists', () => { - cy.get('[type="submit"]'); - }); - it('Check placeholder "Username"', () => { - cy.get('input').invoke('attr', 'placeholder').should('contain', 'Username'); + cy.get('#credential').type(Cypress.env('user')); }); it('Check placeholder "Password"', () => { - cy.get('[type="password"]'); + cy.get('#password').type(Cypress.env('password')); }); it('Click to "Sign in" button', () => { cy.get('[type="submit"]').click(); - cy.wait(1000); }); }); diff --git a/tests/cypress/integration/canvas3d_functionality/assets/test_canvas3d.zip b/tests/cypress/e2e/canvas3d_functionality/assets/test_canvas3d.zip similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/assets/test_canvas3d.zip rename to tests/cypress/e2e/canvas3d_functionality/assets/test_canvas3d.zip diff --git a/tests/cypress/integration/canvas3d_functionality/case_83_canvas3d_functionality_cuboid_grouping.js b/tests/cypress/e2e/canvas3d_functionality/case_83_canvas3d_functionality_cuboid_grouping.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_83_canvas3d_functionality_cuboid_grouping.js rename to tests/cypress/e2e/canvas3d_functionality/case_83_canvas3d_functionality_cuboid_grouping.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_84_canvas3d_functionality_cuboid_redraw.js b/tests/cypress/e2e/canvas3d_functionality/case_84_canvas3d_functionality_cuboid_redraw.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_84_canvas3d_functionality_cuboid_redraw.js rename to tests/cypress/e2e/canvas3d_functionality/case_84_canvas3d_functionality_cuboid_redraw.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js b/tests/cypress/e2e/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js rename to tests/cypress/e2e/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_86_canvas3d_functionality_move_image_button.js b/tests/cypress/e2e/canvas3d_functionality/case_86_canvas3d_functionality_move_image_button.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_86_canvas3d_functionality_move_image_button.js rename to tests/cypress/e2e/canvas3d_functionality/case_86_canvas3d_functionality_move_image_button.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_87_canvas3d_functionality_cuboid_delete.js b/tests/cypress/e2e/canvas3d_functionality/case_87_canvas3d_functionality_cuboid_delete.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_87_canvas3d_functionality_cuboid_delete.js rename to tests/cypress/e2e/canvas3d_functionality/case_87_canvas3d_functionality_cuboid_delete.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_88_canvas3d_functionality_save_job_remove_annotation.js b/tests/cypress/e2e/canvas3d_functionality/case_88_canvas3d_functionality_save_job_remove_annotation.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_88_canvas3d_functionality_save_job_remove_annotation.js rename to tests/cypress/e2e/canvas3d_functionality/case_88_canvas3d_functionality_save_job_remove_annotation.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_89_canvas3d_functionality_filters.js b/tests/cypress/e2e/canvas3d_functionality/case_89_canvas3d_functionality_filters.js similarity index 96% rename from tests/cypress/integration/canvas3d_functionality/case_89_canvas3d_functionality_filters.js rename to tests/cypress/e2e/canvas3d_functionality/case_89_canvas3d_functionality_filters.js index 1f805369..f0505157 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_89_canvas3d_functionality_filters.js +++ b/tests/cypress/e2e/canvas3d_functionality/case_89_canvas3d_functionality_filters.js @@ -8,10 +8,10 @@ import { taskName, labelName } from '../../support/const_canvas3d'; context('Canvas 3D functionality. Filters.', () => { const caseId = '89'; - const secondLabel = 'car' + const secondLabel = 'car'; const screenshotsPath = 'cypress/screenshots/canvas3d_functionality/case_89_canvas3d_functionality_filters.js'; const firstCuboidCreationParams = { - labelName: labelName, + labelName, x: 350, y: 250, }; @@ -22,7 +22,7 @@ context('Canvas 3D functionality. Filters.', () => { }; before(() => { - cy.openTask(taskName) + cy.openTask(taskName); cy.addNewLabel(secondLabel); cy.openJob(); cy.wait(1000); // Waiting for the point cloud to display diff --git a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js b/tests/cypress/e2e/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js rename to tests/cypress/e2e/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js b/tests/cypress/e2e/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js rename to tests/cypress/e2e/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js diff --git a/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js b/tests/cypress/e2e/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js rename to tests/cypress/e2e/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js b/tests/cypress/e2e/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js b/tests/cypress/e2e/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js similarity index 83% rename from tests/cypress/integration/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js index 7d8b9f14..2dded6e4 100644 --- a/tests/cypress/integration/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js +++ b/tests/cypress/e2e/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js @@ -20,20 +20,25 @@ context('Canvas 3D functionality. Control button. Mouse interaction.', () => { ) { cy.customScreenshot('.cvat-canvas3d-perspective', screenshotNameBefore); cy.wait(300); - arrow - ? cy.get(button).trigger('mouseover').click() - : cy - .contains('button', new RegExp(`^${button}$`)) - .trigger('mouseover') - .click(); + if (arrow) { + cy.get(button).trigger('mouseover').click(); + } else { + cy.contains('button', new RegExp(`^${button}$`)) + .trigger('mouseover') + .click(); + } cy.contains(expectedTooltipText).should('exist').and('be.visible'); // Check tooltip - arrow - ? cy.get(button).should('exist').click() - : cy.contains('button', new RegExp(`^${button}$`)).click({ force: true }); - arrow - ? cy.get(button).trigger('mouseout') - : cy.contains('button', new RegExp(`^${button}$`)).trigger('mouseout'); - cy.contains(expectedTooltipText).should('not.exist'); + if (arrow) { + cy.get(button).should('exist').click(); + } else { + cy.contains('button', new RegExp(`^${button}$`)).click({ force: true }); + } + if (arrow) { + cy.get(button).trigger('mouseout'); + } else { + cy.contains('button', new RegExp(`^${button}$`)).trigger('mouseout'); + } + cy.customScreenshot('.cvat-canvas3d-perspective', screenshotNameAfter); cy.compareImagesAndCheckResult( `${screenshotsPath}/${screenshotNameBefore}.png`, diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js b/tests/cypress/e2e/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js similarity index 99% rename from tests/cypress/integration/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js index 6c8419c4..4e286797 100644 --- a/tests/cypress/integration/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js +++ b/tests/cypress/e2e/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js @@ -11,7 +11,7 @@ context('Canvas 3D functionality. Add cuboid.', () => { const screenshotsPath = 'cypress/screenshots/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js'; const cuboidCreationParams = { - labelName: labelName, + labelName, }; before(() => { diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_78_canvas3d_functionality_cuboid_label.js b/tests/cypress/e2e/canvas3d_functionality_2/case_78_canvas3d_functionality_cuboid_label.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality_2/case_78_canvas3d_functionality_cuboid_label.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_78_canvas3d_functionality_cuboid_label.js diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js b/tests/cypress/e2e/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js similarity index 94% rename from tests/cypress/integration/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js index 000eba9a..51ede603 100644 --- a/tests/cypress/integration/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js +++ b/tests/cypress/e2e/canvas3d_functionality_2/case_79_canvas3d_functionality_cuboid_context_menu.js @@ -9,11 +9,11 @@ import { taskName, labelName } from '../../support/const_canvas3d'; context('Canvas 3D functionality. Cuboid context menu.', () => { const caseId = '79'; const cuboidCreationParams = { - labelName: labelName, + labelName, }; before(() => { - cy.openTask(taskName) + cy.openTask(taskName); cy.openJob(); cy.wait(1000); // Waiting for the point cloud to display cy.create3DCuboid(cuboidCreationParams); diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js b/tests/cypress/e2e/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js similarity index 99% rename from tests/cypress/integration/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js index 324c8a37..ac2048e5 100644 --- a/tests/cypress/integration/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js +++ b/tests/cypress/e2e/canvas3d_functionality_2/case_80_canvas3d_functionality_cuboid_make_copy.js @@ -10,7 +10,7 @@ context('Canvas 3D functionality. Make a copy.', () => { const caseId = '80'; const secondLabel = 'car'; const cuboidCreationParams = { - labelName: labelName, + labelName, x: 480, y: 160, }; diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js b/tests/cypress/e2e/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js similarity index 97% rename from tests/cypress/integration/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js index d9c6003f..76b34de3 100644 --- a/tests/cypress/integration/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js +++ b/tests/cypress/e2e/canvas3d_functionality_2/case_81_canvas3d_functionality_cuboid_propagate.js @@ -9,7 +9,7 @@ import { taskName, labelName } from '../../support/const_canvas3d'; context('Canvas 3D functionality. Cuboid propagate.', () => { const caseId = '81'; const cuboidCreationParams = { - labelName: labelName, + labelName, }; before(() => { diff --git a/tests/cypress/integration/canvas3d_functionality_2/case_82_canvas3d_functionality_cuboid_opacity_outlined_borders.js b/tests/cypress/e2e/canvas3d_functionality_2/case_82_canvas3d_functionality_cuboid_opacity_outlined_borders.js similarity index 100% rename from tests/cypress/integration/canvas3d_functionality_2/case_82_canvas3d_functionality_cuboid_opacity_outlined_borders.js rename to tests/cypress/e2e/canvas3d_functionality_2/case_82_canvas3d_functionality_cuboid_opacity_outlined_borders.js diff --git a/tests/cypress/integration/email_system/check_email_verification_system.js b/tests/cypress/e2e/email_system/check_email_verification_system.js similarity index 100% rename from tests/cypress/integration/email_system/check_email_verification_system.js rename to tests/cypress/e2e/email_system/check_email_verification_system.js diff --git a/tests/cypress/integration/issues_prs/issue_1882_polygon_interpolation.js b/tests/cypress/e2e/issues_prs/issue_1882_polygon_interpolation.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_1882_polygon_interpolation.js rename to tests/cypress/e2e/issues_prs/issue_1882_polygon_interpolation.js diff --git a/tests/cypress/integration/issues_prs/issue_1886_point_coordinates_not_duplicated.js b/tests/cypress/e2e/issues_prs/issue_1886_point_coordinates_not_duplicated.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_1886_point_coordinates_not_duplicated.js rename to tests/cypress/e2e/issues_prs/issue_1886_point_coordinates_not_duplicated.js diff --git a/tests/cypress/integration/issues_prs/issue_1919_check_text_attr.js b/tests/cypress/e2e/issues_prs/issue_1919_check_text_attr.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_1919_check_text_attr.js rename to tests/cypress/e2e/issues_prs/issue_1919_check_text_attr.js diff --git a/tests/cypress/integration/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js b/tests/cypress/e2e/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js rename to tests/cypress/e2e/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js diff --git a/tests/cypress/integration/issues_prs/issue_1944_loading_screen_switch_job.js b/tests/cypress/e2e/issues_prs/issue_1944_loading_screen_switch_job.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_1944_loading_screen_switch_job.js rename to tests/cypress/e2e/issues_prs/issue_1944_loading_screen_switch_job.js diff --git a/tests/cypress/integration/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js b/tests/cypress/e2e/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js rename to tests/cypress/e2e/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js diff --git a/tests/cypress/integration/issues_prs/issue_2230_maintenance_popover_visibility.js b/tests/cypress/e2e/issues_prs/issue_2230_maintenance_popover_visibility.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2230_maintenance_popover_visibility.js rename to tests/cypress/e2e/issues_prs/issue_2230_maintenance_popover_visibility.js diff --git a/tests/cypress/integration/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js b/tests/cypress/e2e/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js rename to tests/cypress/e2e/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js diff --git a/tests/cypress/integration/issues_prs/issue_2411_deleting_attributes.js b/tests/cypress/e2e/issues_prs/issue_2411_deleting_attributes.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2411_deleting_attributes.js rename to tests/cypress/e2e/issues_prs/issue_2411_deleting_attributes.js diff --git a/tests/cypress/integration/issues_prs/issue_2418_object_tag_same_labels.js b/tests/cypress/e2e/issues_prs/issue_2418_object_tag_same_labels.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2418_object_tag_same_labels.js rename to tests/cypress/e2e/issues_prs/issue_2418_object_tag_same_labels.js diff --git a/tests/cypress/integration/issues_prs/issue_2485_navigation_empty_frames.js b/tests/cypress/e2e/issues_prs/issue_2485_navigation_empty_frames.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2485_navigation_empty_frames.js rename to tests/cypress/e2e/issues_prs/issue_2485_navigation_empty_frames.js diff --git a/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js b/tests/cypress/e2e/issues_prs/issue_2486_not_edit_object_aam.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js rename to tests/cypress/e2e/issues_prs/issue_2486_not_edit_object_aam.js diff --git a/tests/cypress/integration/issues_prs/issue_2487_extra_instances_canvas_grouping.js b/tests/cypress/e2e/issues_prs/issue_2487_extra_instances_canvas_grouping.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2487_extra_instances_canvas_grouping.js rename to tests/cypress/e2e/issues_prs/issue_2487_extra_instances_canvas_grouping.js diff --git a/tests/cypress/integration/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js b/tests/cypress/e2e/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js rename to tests/cypress/e2e/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js diff --git a/tests/cypress/integration/issues_prs/issue_2753_call_HOC_component_each_render.js b/tests/cypress/e2e/issues_prs/issue_2753_call_HOC_component_each_render.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2753_call_HOC_component_each_render.js rename to tests/cypress/e2e/issues_prs/issue_2753_call_HOC_component_each_render.js diff --git a/tests/cypress/integration/issues_prs/issue_2807_polyline_editing.js b/tests/cypress/e2e/issues_prs/issue_2807_polyline_editing.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2807_polyline_editing.js rename to tests/cypress/e2e/issues_prs/issue_2807_polyline_editing.js diff --git a/tests/cypress/integration/issues_prs/issue_2992_crop_polygon_properly.js b/tests/cypress/e2e/issues_prs/issue_2992_crop_polygon_properly.js similarity index 100% rename from tests/cypress/integration/issues_prs/issue_2992_crop_polygon_properly.js rename to tests/cypress/e2e/issues_prs/issue_2992_crop_polygon_properly.js diff --git a/tests/cypress/integration/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js b/tests/cypress/e2e/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js similarity index 100% rename from tests/cypress/integration/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js rename to tests/cypress/e2e/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js diff --git a/tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js b/tests/cypress/e2e/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js similarity index 100% rename from tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js rename to tests/cypress/e2e/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js diff --git a/tests/cypress/integration/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js b/tests/cypress/e2e/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js rename to tests/cypress/e2e/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js diff --git a/tests/cypress/integration/issues_prs2/issue_1368_points_track_invisible_next_frame.js b/tests/cypress/e2e/issues_prs2/issue_1368_points_track_invisible_next_frame.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1368_points_track_invisible_next_frame.js rename to tests/cypress/e2e/issues_prs2/issue_1368_points_track_invisible_next_frame.js diff --git a/tests/cypress/integration/issues_prs2/issue_1391_delete_point.js b/tests/cypress/e2e/issues_prs2/issue_1391_delete_point.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1391_delete_point.js rename to tests/cypress/e2e/issues_prs2/issue_1391_delete_point.js diff --git a/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js b/tests/cypress/e2e/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js rename to tests/cypress/e2e/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js diff --git a/tests/cypress/integration/issues_prs2/issue_1429_check_new_label.js b/tests/cypress/e2e/issues_prs2/issue_1429_check_new_label.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1429_check_new_label.js rename to tests/cypress/e2e/issues_prs2/issue_1429_check_new_label.js diff --git a/tests/cypress/integration/issues_prs2/issue_1433_hide_functionality.js b/tests/cypress/e2e/issues_prs2/issue_1433_hide_functionality.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1433_hide_functionality.js rename to tests/cypress/e2e/issues_prs2/issue_1433_hide_functionality.js diff --git a/tests/cypress/integration/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js b/tests/cypress/e2e/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js rename to tests/cypress/e2e/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js diff --git a/tests/cypress/integration/issues_prs2/issue_1439_blocked_object_info.js b/tests/cypress/e2e/issues_prs2/issue_1439_blocked_object_info.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1439_blocked_object_info.js rename to tests/cypress/e2e/issues_prs2/issue_1439_blocked_object_info.js diff --git a/tests/cypress/integration/issues_prs2/issue_1444_filter_property_shape.js b/tests/cypress/e2e/issues_prs2/issue_1444_filter_property_shape.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1444_filter_property_shape.js rename to tests/cypress/e2e/issues_prs2/issue_1444_filter_property_shape.js diff --git a/tests/cypress/integration/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js b/tests/cypress/e2e/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js rename to tests/cypress/e2e/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js diff --git a/tests/cypress/integration/issues_prs2/issue_1540_add_remove_tag.js b/tests/cypress/e2e/issues_prs2/issue_1540_add_remove_tag.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1540_add_remove_tag.js rename to tests/cypress/e2e/issues_prs2/issue_1540_add_remove_tag.js diff --git a/tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js b/tests/cypress/e2e/issues_prs2/issue_1568_cuboid_dump_annotation.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js rename to tests/cypress/e2e/issues_prs2/issue_1568_cuboid_dump_annotation.js diff --git a/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js b/tests/cypress/e2e/issues_prs2/issue_1750_err_aam_switch_frames.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js rename to tests/cypress/e2e/issues_prs2/issue_1750_err_aam_switch_frames.js diff --git a/tests/cypress/integration/issues_prs2/issue_1785_propagation_latest_frame.js b/tests/cypress/e2e/issues_prs2/issue_1785_propagation_latest_frame.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1785_propagation_latest_frame.js rename to tests/cypress/e2e/issues_prs2/issue_1785_propagation_latest_frame.js diff --git a/tests/cypress/integration/issues_prs2/issue_1819_first_part_split_track_visible.js b/tests/cypress/e2e/issues_prs2/issue_1819_first_part_split_track_visible.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1819_first_part_split_track_visible.js rename to tests/cypress/e2e/issues_prs2/issue_1819_first_part_split_track_visible.js diff --git a/tests/cypress/integration/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js b/tests/cypress/e2e/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js rename to tests/cypress/e2e/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js diff --git a/tests/cypress/integration/issues_prs2/issue_1825_tooltip_hidden_mouseout.js b/tests/cypress/e2e/issues_prs2/issue_1825_tooltip_hidden_mouseout.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1825_tooltip_hidden_mouseout.js rename to tests/cypress/e2e/issues_prs2/issue_1825_tooltip_hidden_mouseout.js diff --git a/tests/cypress/integration/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js b/tests/cypress/e2e/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js rename to tests/cypress/e2e/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js diff --git a/tests/cypress/integration/issues_prs2/issue_1870_cursor_not_jump_to_end.js b/tests/cypress/e2e/issues_prs2/issue_1870_cursor_not_jump_to_end.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_1870_cursor_not_jump_to_end.js rename to tests/cypress/e2e/issues_prs2/issue_1870_cursor_not_jump_to_end.js diff --git a/tests/cypress/integration/issues_prs2/issue_3821_delete_point.js b/tests/cypress/e2e/issues_prs2/issue_3821_delete_point.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_3821_delete_point.js rename to tests/cypress/e2e/issues_prs2/issue_3821_delete_point.js diff --git a/tests/cypress/integration/issues_prs2/issue_5274_upload_annotations_different_file_formats.js b/tests/cypress/e2e/issues_prs2/issue_5274_upload_annotations_different_file_formats.js similarity index 100% rename from tests/cypress/integration/issues_prs2/issue_5274_upload_annotations_different_file_formats.js rename to tests/cypress/e2e/issues_prs2/issue_5274_upload_annotations_different_file_formats.js diff --git a/tests/cypress/integration/masks/masks_basics.js b/tests/cypress/e2e/masks/masks_basics.js similarity index 100% rename from tests/cypress/integration/masks/masks_basics.js rename to tests/cypress/e2e/masks/masks_basics.js diff --git a/tests/cypress/integration/remove_users_tasks_projects_organizations.js b/tests/cypress/e2e/remove_users_tasks_projects_organizations.js similarity index 98% rename from tests/cypress/integration/remove_users_tasks_projects_organizations.js rename to tests/cypress/e2e/remove_users_tasks_projects_organizations.js index 56187891..624cc283 100644 --- a/tests/cypress/integration/remove_users_tasks_projects_organizations.js +++ b/tests/cypress/e2e/remove_users_tasks_projects_organizations.js @@ -6,6 +6,10 @@ let authKey = ''; +before(() => { + cy.clearAllCookies(); +}); + describe('Delete users, tasks, projects, organizations created during the tests run.', () => { it('Get token', () => { cy.request({ diff --git a/tests/cypress/integration/skeletons/skeletons_pipeline.js b/tests/cypress/e2e/skeletons/skeletons_pipeline.js similarity index 99% rename from tests/cypress/integration/skeletons/skeletons_pipeline.js rename to tests/cypress/e2e/skeletons/skeletons_pipeline.js index de1aaa73..fc053d25 100644 --- a/tests/cypress/integration/skeletons/skeletons_pipeline.js +++ b/tests/cypress/e2e/skeletons/skeletons_pipeline.js @@ -45,6 +45,7 @@ context('Manipulations with skeletons', { scrollBehavior: false }, () => { }); after(() => { + cy.clearAllCookies(); cy.getAuthKey().then((response) => { const authKey = response.body.key; cy.request({ diff --git a/tests/cypress/integration/webhooks.js b/tests/cypress/e2e/webhooks.js similarity index 100% rename from tests/cypress/integration/webhooks.js rename to tests/cypress/e2e/webhooks.js diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index b56c6164..5cd1c7b4 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -41,6 +41,9 @@ Cypress.Commands.add('logout', (username = Cypress.env('user')) => { cy.visit('/auth/login'); cy.url().should('not.include', '?next='); cy.contains('Sign in').should('exist'); + // TMP fix for multi-user tests, need to change login logic with sessions + cy.clearAllCookies(); + cy.clearAllLocalStorage(); }); Cypress.Commands.add('userRegistration', (firstName, lastName, userName, emailAddr, password) => { @@ -206,7 +209,7 @@ Cypress.Commands.add( cy.get(`.ant-select-item-option[title="${projectName}"]`).click(); }); } - cy.get('.cvat-project-search-field').within(() => { + cy.get('.cvat-project-search-field').first().within(() => { cy.get('[type="search"]').should('have.value', projectName); }); cy.get('.cvat-project-subset-field').type(projectSubsetFieldValue); @@ -532,6 +535,7 @@ Cypress.Commands.add('changeLabelAAM', (labelName) => { }); cy.get('.ant-select-dropdown') .not('.ant-select-dropdown-hidden') + .first() .within(() => { cy.get(`.ant-select-item-option[title="${labelName}"]`).click(); }); @@ -576,6 +580,7 @@ Cypress.Commands.add('updateAttributes', (multiAttrParams) => { }); cy.get('.ant-select-dropdown') .not('.ant-select-dropdown-hidden') + .first() .within(() => { cy.get(`.ant-select-item-option[title="${multiAttrParams.typeAttribute}"]`).click(); }); @@ -598,6 +603,7 @@ Cypress.Commands.add('updateAttributes', (multiAttrParams) => { }); cy.get('.ant-select-dropdown') .not('.ant-select-dropdown-hidden') + .first() .within(() => { cy.get(`.ant-select-item-option[title="${multiAttrParams.additionalValue}"]`).click(); }); @@ -793,6 +799,7 @@ Cypress.Commands.add('changeColorViaBadge', (labelColor) => { cy.get('.cvat-label-color-picker') .not('.ant-popover-hidden') .should('be.visible') + .first() .within(() => { cy.contains('hex').prev().clear().type(labelColor); cy.contains('button', 'Ok').click(); @@ -821,6 +828,7 @@ Cypress.Commands.add('deleteLabel', (labelName) => { cy.intercept('PATCH', /\/api\/(tasks|projects)\/.*/).as('deleteLabel'); cy.get('.cvat-modal-delete-label') .should('be.visible') + .first() .within(() => { cy.contains('[type="button"]', 'OK').click(); }); @@ -1046,7 +1054,8 @@ Cypress.Commands.add('renameTask', (oldName, newName) => { cy.get('.cvat-task-details-task-name').within(() => { cy.get('[aria-label="edit"]').click(); }); - cy.contains('.cvat-text-color', oldName).clear().type(`${newName}{Enter}`); + cy.contains('.cvat-text-color', oldName).type(`{selectall}{backspace}${newName}{Enter}`); + cy.get('.cvat-spinner').should('not.exist'); cy.contains('.cvat-task-details-task-name', newName).should('exist'); }); diff --git a/tests/cypress/support/commands_filters_feature.js b/tests/cypress/support/commands_filters_feature.js index f8f26996..acc9df35 100644 --- a/tests/cypress/support/commands_filters_feature.js +++ b/tests/cypress/support/commands_filters_feature.js @@ -57,7 +57,7 @@ Cypress.Commands.add('addFiltersRule', (groupIndex) => { Cypress.Commands.add('setGroupCondition', (groupIndex, condition) => { cy.checkFiltersModalOpened(); cy.collectGroupID().then((groupIdIndex) => { - cy.get(`[data-id="${groupIdIndex[groupIndex]}"]`).within(() => { + cy.get(`[data-id="${groupIdIndex[groupIndex]}"]`).first().within(() => { cy.get('.group--header').first().trigger('mouseover'); cy.contains('button', condition).click({ force: true }); }); @@ -74,6 +74,7 @@ Cypress.Commands.add( cy.collectRuleID().then((ruleIdIndex) => { cy.get(`[data-id="${groupIdIndex[groupIndex]}"]`) .find(`[data-id="${ruleIdIndex[ruleIndex]}"]`) + .first() .within(() => { cy.contains('button', 'Select field').click(); }); @@ -89,6 +90,7 @@ Cypress.Commands.add( } cy.get(`[data-id="${groupIdIndex[groupIndex]}"]`) .find(`[data-id="${ruleIdIndex[ruleIndex]}"]`) + .first() .within(() => { cy.get('[type="search"]').first().click({ force: true }); }); @@ -96,6 +98,7 @@ Cypress.Commands.add( if (valueSource) { cy.get(`[data-id="${groupIdIndex[groupIndex]}"]`) .find(`[data-id="${ruleIdIndex[ruleIndex]}"]`) + .first() .within(() => { cy.get('[aria-label="ellipsis"]').trigger('mouseover'); }); @@ -103,6 +106,7 @@ Cypress.Commands.add( } cy.get(`[data-id="${groupIdIndex[groupIndex]}"]`) .find(`[data-id="${ruleIdIndex[ruleIndex]}"]`) + .first() .within(() => { if (field === 'Attributes') { cy.get('[placeholder="Enter string"]').last().type(`${value}{Enter}`); @@ -120,7 +124,7 @@ Cypress.Commands.add( cy.get('.ant-dropdown').not('.ant-dropdown-hidden').contains('[role="menuitem"]', value).click(); } if (submit) { - cy.get('.cvat-filters-modal-visible').within(() => { + cy.get('.cvat-filters-modal-visible').first().within(() => { cy.contains('button', 'Submit').click(); }); cy.get('.cvat-filters-modal-visible').should('not.exist'); diff --git a/tests/cypress/support/commands_review_pipeline.js b/tests/cypress/support/commands_review_pipeline.js index 888d37b3..dd88d8f1 100644 --- a/tests/cypress/support/commands_review_pipeline.js +++ b/tests/cypress/support/commands_review_pipeline.js @@ -12,6 +12,7 @@ Cypress.Commands.add('assignTaskToUser', (user) => { } else { cy.get('.cvat-user-search-field').find('input').clear().type('{Enter}'); } + cy.get('.cvat-spinner').should('not.exist'); }); }); diff --git a/tests/cypress/support/const_canvas3d.js b/tests/cypress/support/const_canvas3d.js index a448ef21..2abbc247 100644 --- a/tests/cypress/support/const_canvas3d.js +++ b/tests/cypress/support/const_canvas3d.js @@ -6,7 +6,7 @@ export const labelName = 'points cloud'; export const taskName = 'Canvas 3D functionality'; -export const pcdPngZipArr = '../../cypress/integration/canvas3d_functionality/assets/test_canvas3d.zip'; +export const pcdPngZipArr = '../../cypress/e2e/canvas3d_functionality/assets/test_canvas3d.zip'; export const attrName = `Attr for ${labelName}`; export const textDefaultValue = 'Some default value for type Text'; export const advancedConfigurationParams = false; diff --git a/tests/cypress/support/index.js b/tests/cypress/support/e2e.js similarity index 100% rename from tests/cypress/support/index.js rename to tests/cypress/support/e2e.js diff --git a/tests/cypress_canvas3d.config.js b/tests/cypress_canvas3d.config.js new file mode 100644 index 00000000..95239f1e --- /dev/null +++ b/tests/cypress_canvas3d.config.js @@ -0,0 +1,28 @@ +const { defineConfig } = require('cypress'); +const plugins = require('./cypress/plugins/index'); + +module.exports = defineConfig({ + video: false, + viewportWidth: 1300, + viewportHeight: 960, + defaultCommandTimeout: 25000, + downloadsFolder: 'cypress/fixtures', + env: { + user: 'admin', + email: 'admin@localhost.company', + password: '12qwaszx', + }, + e2e: { + setupNodeEvents(on, config) { + return plugins(on, config); + }, + testIsolation: false, + baseUrl: 'http://localhost:8080', + specPattern: [ + 'cypress/e2e/auth_page.js', + 'cypress/e2e/canvas3d_functionality/*.js', + 'cypress/e2e/canvas3d_functionality_2/*.js', + 'cypress/e2e/remove_users_tasks_projects_organizations.js', + ], + }, +}); diff --git a/tests/cypress_canvas3d.json b/tests/cypress_canvas3d.json deleted file mode 100644 index b6a0bfc1..00000000 --- a/tests/cypress_canvas3d.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "video": false, - "baseUrl": "http://localhost:8080", - "viewportWidth": 1300, - "viewportHeight": 960, - "defaultCommandTimeout": 25000, - "downloadsFolder": "cypress/fixtures", - "env": { - "user": "admin", - "email": "admin@localhost.company", - "password": "12qwaszx" - }, - "testFiles": [ - "auth_page.js", - "canvas3d_functionality/*.js", - "canvas3d_functionality_2/*.js", - "remove_users_tasks_projects_organizations.js" - ] -} diff --git a/tests/docker-compose.minio.yml b/tests/docker-compose.minio.yml index e65d9161..ffa675f7 100644 --- a/tests/docker-compose.minio.yml +++ b/tests/docker-compose.minio.yml @@ -37,7 +37,7 @@ services: TEST_BUCKET: "test" IMPORT_EXPORT_BUCKET: "importexportbucket" volumes: - - ./tests/cypress/integration/actions_tasks/assets/case_65_manifest/:/storage + - ./tests/cypress/e2e/actions_tasks/assets/case_65_manifest/:/storage networks: - cvat entrypoint: > diff --git a/tests/nightly_cypress.config.js b/tests/nightly_cypress.config.js new file mode 100644 index 00000000..9999a429 --- /dev/null +++ b/tests/nightly_cypress.config.js @@ -0,0 +1,36 @@ +const { defineConfig } = require('cypress'); +const plugins = require('./cypress/plugins/index'); + +module.exports = defineConfig({ + video: false, + viewportWidth: 1300, + viewportHeight: 960, + defaultCommandTimeout: 25000, + downloadsFolder: 'cypress/fixtures', + env: { + user: 'admin', + email: 'admin@localhost.company', + password: '12qwaszx', + }, + e2e: { + setupNodeEvents(on, config) { + return plugins(on, config); + }, + testIsolation: false, + baseUrl: 'http://localhost:8080', + specPattern: [ + 'cypress/e2e/auth_page.js', + 'cypress/e2e/actions_tasks/*.js', + 'cypress/e2e/actions_tasks2/*.js', + 'cypress/e2e/actions_tasks3/*.js', + 'cypress/e2e/actions_objects/*.js', + 'cypress/e2e/actions_objects2/*.js', + 'cypress/e2e/issues_prs/*.js', + 'cypress/e2e/issues_prs2/*.js', + 'cypress/e2e/actions_projects_models/*.js', + 'cypress/e2e/actions_users/*.js', + 'cypress/e2e/email_system/*.js', + 'cypress/e2e/remove_users_tasks_projects_organizations.js', + ], + }, +}); diff --git a/tests/nightly_cypress.json b/tests/nightly_cypress.json deleted file mode 100644 index 6565c36e..00000000 --- a/tests/nightly_cypress.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "video": false, - "baseUrl": "http://localhost:8080", - "viewportWidth": 1300, - "viewportHeight": 960, - "defaultCommandTimeout": 25000, - "env": { - "user": "admin", - "email": "admin@localhost.company", - "password": "12qwaszx" - }, - "testFiles": [ - "auth_page.js", - "actions_tasks/*.js", - "actions_tasks2/*.js", - "actions_tasks3/*.js", - "actions_objects/*.js", - "actions_objects2/*.js", - "issues_prs/*.js", - "issues_prs2/*.js", - "actions_projects_models/*.js", - "actions_users/*.js", - "email_system/*.js", - "remove_users_tasks_projects_organizations.js" - ] -} diff --git a/tests/package.json b/tests/package.json index a157180d..fb74911a 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,14 +1,14 @@ { "scripts": { "cypress:run:chrome": "cypress run --browser chrome", - "cypress:run:firefox": "cypress run --browser firefox --config-file nightly_cypress.json", - "cypress:run:chrome:canvas3d": "cypress run --headed --browser chrome --config-file cypress_canvas3d.json" + "cypress:run:firefox": "cypress run --browser firefox --config-file nightly_cypress.config.js", + "cypress:run:chrome:canvas3d": "cypress run --headed --browser chrome --config-file cypress_canvas3d.config.js" }, "dependencies": { "@cypress/code-coverage": "^3.9.10", "archiver": "^5.3.0", "cy-verify-downloads": "^0.0.5", - "cypress": "^9.7.0", + "cypress": "^12.5.1", "cypress-file-upload": "^5.0.8", "cypress-localstorage-commands": "^1.7.0", "cypress-real-events": "^1.6.0", diff --git a/tests/pr_cypress.config.js b/tests/pr_cypress.config.js new file mode 100644 index 00000000..aed25cec --- /dev/null +++ b/tests/pr_cypress.config.js @@ -0,0 +1,46 @@ +const { defineConfig } = require('cypress'); +const plugins = require('./cypress/plugins/index'); + +module.exports = defineConfig({ + video: false, + viewportWidth: 1300, + viewportHeight: 960, + defaultCommandTimeout: 25000, + downloadsFolder: 'cypress/fixtures', + env: { + user: 'admin', + email: 'admin@localhost.company', + password: '12qwaszx', + coverage: false, + }, + e2e: { + setupNodeEvents(on, config) { + return plugins(on, config); + }, + testIsolation: false, + baseUrl: 'http://localhost:8080', + specPattern: [ + 'cypress/e2e/actions_objects2/case_108_rotated_bounding_boxes.js', + 'cypress/e2e/actions_objects2/case_10_polygon_shape_track_label_points.js', + 'cypress/e2e/actions_objects2/case_115_ellipse_shape_track_label.js', + 'cypress/e2e/actions_objects2/case_11_polylines_shape_track_label_points.js', + 'cypress/e2e/actions_objects2/case_12_points_shape_track_label.js', + 'cypress/e2e/actions_objects2/case_13_merge_split_features.js', + 'cypress/e2e/actions_objects2/case_14_appearance_features.js', + 'cypress/e2e/actions_objects2/case_15_group_features.js', + 'cypress/e2e/actions_objects2/case_16_z_order_features.js', + 'cypress/e2e/actions_objects2/case_17_lock_hide_features.js', + 'cypress/e2e/issues_prs/issue_2418_object_tag_same_labels.js', + 'cypress/e2e/issues_prs/issue_2485_navigation_empty_frames.js', + 'cypress/e2e/issues_prs/issue_2486_not_edit_object_aam.js', + 'cypress/e2e/issues_prs/issue_2487_extra_instances_canvas_grouping.js', + 'cypress/e2e/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js', + 'cypress/e2e/issues_prs/issue_2753_call_HOC_component_each_render.js', + 'cypress/e2e/issues_prs/issue_2807_polyline_editing.js', + 'cypress/e2e/issues_prs/issue_2992_crop_polygon_properly.js', + 'cypress/e2e/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js', + 'cypress/e2e/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js', + 'cypress/e2e/remove_users_tasks_projects_organizations.js', + ], + }, +}); diff --git a/tests/pr_cypress.json b/tests/pr_cypress.json deleted file mode 100644 index 97773d04..00000000 --- a/tests/pr_cypress.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "video": false, - "baseUrl": "http://localhost:8080", - "viewportWidth": 1300, - "viewportHeight": 960, - "defaultCommandTimeout": 25000, - "downloadsFolder": "cypress/fixtures", - "env": { - "user": "admin", - "email": "admin@localhost.company", - "password": "12qwaszx", - "coverage": false - }, - "testFiles": [ - "actions_objects2/case_108_rotated_bounding_boxes.js", - "actions_objects2/case_10_polygon_shape_track_label_points.js", - "actions_objects2/case_115_ellipse_shape_track_label.js", - "actions_objects2/case_11_polylines_shape_track_label_points.js", - "actions_objects2/case_12_points_shape_track_label.js", - "actions_objects2/case_13_merge_split_features.js", - "actions_objects2/case_14_appearance_features.js", - "actions_objects2/case_15_group_features.js", - "actions_objects2/case_16_z_order_features.js", - "actions_objects2/case_17_lock_hide_features.js", - "issues_prs/issue_2418_object_tag_same_labels.js", - "issues_prs/issue_2485_navigation_empty_frames.js", - "issues_prs/issue_2486_not_edit_object_aam.js", - "issues_prs/issue_2487_extra_instances_canvas_grouping.js", - "issues_prs/issue_2661_displaying_attached_files_when_creating_task.js", - "issues_prs/issue_2753_call_HOC_component_each_render.js", - "issues_prs/issue_2807_polyline_editing.js", - "issues_prs/issue_2992_crop_polygon_properly.js", - "issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js", - "issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js", - "remove_users_tasks_projects_organizations.js" - ] -} diff --git a/tests/pr_cypress_canvas3d.config.js b/tests/pr_cypress_canvas3d.config.js new file mode 100644 index 00000000..f0a1618a --- /dev/null +++ b/tests/pr_cypress_canvas3d.config.js @@ -0,0 +1,31 @@ +const { defineConfig } = require('cypress'); +const plugins = require('./cypress/plugins/index'); + +module.exports = defineConfig({ + video: false, + viewportWidth: 1300, + viewportHeight: 960, + defaultCommandTimeout: 25000, + downloadsFolder: 'cypress/fixtures', + env: { + user: 'admin', + email: 'admin@localhost.company', + password: '12qwaszx', + coverage: false, + }, + e2e: { + setupNodeEvents(on, config) { + return plugins(on, config); + }, + testIsolation: false, + baseUrl: 'http://localhost:8080', + specPattern: [ + 'cypress/e2e/actions_projects_models/case_104_project_export_3d.js', + 'cypress/e2e/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js', + 'cypress/e2e/canvas3d_functionality_2/case_62_canvas3d_functionality_views_resize.js', + 'cypress/e2e/canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js', + 'cypress/e2e/canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js', + 'cypress/e2e/remove_users_tasks_projects_organizations.js', + ], + }, +}); diff --git a/tests/pr_cypress_canvas3d.json b/tests/pr_cypress_canvas3d.json deleted file mode 100644 index 99a3363c..00000000 --- a/tests/pr_cypress_canvas3d.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "video": false, - "baseUrl": "http://localhost:8080", - "viewportWidth": 1300, - "viewportHeight": 960, - "defaultCommandTimeout": 25000, - "downloadsFolder": "cypress/fixtures", - "env": { - "user": "admin", - "email": "admin@localhost.company", - "password": "12qwaszx", - "coverage": false - }, - "testFiles": [ - "actions_projects_models/case_104_project_export_3d.js", - "canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js", - "canvas3d_functionality_2/case_62_canvas3d_functionality_views_resize.js", - "canvas3d_functionality_2/case_63_canvas3d_functionality_control_button_mouse_interaction.js", - "canvas3d_functionality_2/case_64_canvas3d_functionality_cuboid.js", - "remove_users_tasks_projects_organizations.js" - ] -} diff --git a/tests/yarn.lock b/tests/yarn.lock index 1a14c73c..97def6fa 100644 --- a/tests/yarn.lock +++ b/tests/yarn.lock @@ -1111,10 +1111,10 @@ cypress-real-events@^1.6.0: resolved "https://registry.npmjs.org/cypress-real-events/-/cypress-real-events-1.7.1.tgz" integrity sha512-/Bg15RgJ0SYsuXc6lPqH08x19z6j2vmhWN4wXfJqm3z8BTAFiK2MvipZPzxT8Z0jJP0q7kuniWrLIvz/i/8lCQ== -cypress@^9.7.0: - version "9.7.0" - resolved "https://registry.npmjs.org/cypress/-/cypress-9.7.0.tgz" - integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q== +cypress@^12.5.1: + version "12.5.1" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.5.1.tgz#effdcccdd5a6187d61d497300903d4f3b5b21b6e" + integrity sha512-ZmCmJ3lsyeOpBfh410m5+AO2CO1AxAzFBt7k6/uVbNcrNZje1vdiwYTpj2ksPKg9mjr9lR6V8tmlDNMvr4H/YQ== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" @@ -1135,7 +1135,7 @@ cypress@^9.7.0: dayjs "^1.10.4" debug "^4.3.2" enquirer "^2.3.6" - eventemitter2 "^6.4.3" + eventemitter2 "6.4.7" execa "4.1.0" executable "^4.1.1" extract-zip "2.0.1" @@ -1278,10 +1278,10 @@ esprima@^4.0.0: resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -eventemitter2@^6.4.3: - version "6.4.6" - resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.6.tgz" - integrity sha512-OHqo4wbHX5VbvlbB6o6eDwhYmiTjrpWACjF8Pmof/GTD6rdBNdZFNck3xlhqOiQFGCOoq3uzHvA0cQpFHIGVAQ== +eventemitter2@6.4.7: + version "6.4.7" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d" + integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg== execa@4.1.0: version "4.1.0"