From b9f405804bc5b13ce4ae03ac9785d704185bec47 Mon Sep 17 00:00:00 2001 From: Dmitry Kruchinin <33020454+dvkruchinin@users.noreply.github.com> Date: Tue, 27 Apr 2021 22:59:58 +0300 Subject: [PATCH] CI. Using the Docker layer cache. Parallelizing test runs. (#3100) --- .github/workflows/cache.yml | 50 ++++ .github/workflows/main.yml | 224 ++++++++++++++++-- Dockerfile | 12 +- docker-compose.ci.yml | 2 - docker-compose.dev.yml | 4 - tests/cypress.json | 8 +- .../case_20_objects_ordering_feature.js | 2 +- .../case_22_tag_annotation_mode.js | 2 +- .../case_24_delete_unlock_lock_object.js | 2 +- ...4_drawing_with_predefined_number_points.js | 0 ...e_36_always_show_object_details_feature.js | 2 +- .../case_37_object_make_copy.js | 0 .../case_53_object_propagate.js | 0 .../case_54_redraw_feature.js | 0 .../case_55_repeat_draw_feature.js | 0 .../case_59_edit_handler.js | 0 .../case_60_autoborder_feature.js | 0 ...ase_10_polygon_shape_track_label_points.js | 2 +- ...e_11_polylines_shape_track_label_points.js | 2 +- .../case_12_points_shape_track_label.js | 2 +- .../case_13_merge_split_features.js | 0 .../case_14_appearance_features.js | 2 +- .../case_15_group_features.js | 0 .../case_16_z_order_features.js | 4 +- .../case_17_lock_hide_features.js | 0 .../case_8_rectangle_shape_track_label.js | 2 +- .../case_9_cuboid_shape_track_label.js | 2 +- .../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 .../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 .../case_71_shortcuts_window.js | 0 .../case_72_hotkeys_change_labels.js | 0 ..._import_annotations_frames_dots_in_name.js | 0 .../case_39_issue_2572_rename_task.js | 0 .../case_69_filters_sorting_jobs.js | 0 .../case_21_canvas_color_feature.js | 2 +- .../case_23_canvas_grid_feature.js | 0 .../case_25_canvas_bitmap_feature.js | 2 +- ..._brightness_contrast_saturation_feature.js | 0 .../case_27_undo_redo_feature.js | 2 +- .../case_29_settings_player_step.js | 2 +- .../case_30_collapse_sidebar_apperance.js | 2 +- ...e_31_label_constructor_color_name_label.js | 0 ...ute_annotation_mode_zoom_margin_feature.js | 2 +- .../case_33_button_continue_label_editor.js | 0 .../case_35_search_task_feature.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 .../case_18_filters_functionality.js | 0 .../case_19_all_image_rotate_features.js | 2 +- .../case_1_create_delete_task.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 .../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 .../case_5_image_rotate.js | 0 .../case_6_image_scale_fit.js | 2 +- .../case_7_image_scale_roi.js | 2 +- .../issue_1882_polygon_interpolation.js | 0 ...e_1886_point_coordinates_not_duplicated.js | 2 +- .../issue_1919_check_text_attr.js | 2 +- ..._error_canvas_is_busy_at_resize_element.js | 2 +- .../issue_1944_loading_screen_switch_job.js | 2 +- ..._2174_reset_zoom_in_tag_annotation_mode.js | 2 +- ...sue_2230_maintenance_popover_visibility.js | 0 ...06_ui_not_throw_error_specify_one_point.js | 2 +- .../issue_2411_deleting_attributes.js | 2 +- .../issue_2418_object_tag_same_labels.js | 2 +- .../issue_2485_navigation_empty_frames.js | 0 .../issue_2486_not_edit_object_aam.js | 2 +- ...ue_2487_extra_instances_canvas_grouping.js | 2 +- ...aying_attached_files_when_creating_task.js | 0 ...sue_2753_call_HOC_component_each_render.js | 0 .../issue_2807_polyline_editing.js | 0 .../issue_2992_crop_polygon_properly.js | 0 ..._with_object_dragging_and_go_next_frame.js | 2 +- ...rror_cannot_read_property_at_saving_job.js | 0 ..._fails_with_shape_dragging_over_sidebar.js | 2 +- ..._1368_points_track_invisible_next_frame.js | 2 +- .../issue_1391_delete_point.js | 2 +- ...d_attribute_correspond_chosen_attribute.js | 2 +- .../issue_1429_check_new_label.js | 2 +- .../issue_1433_hide_functionality.js | 0 ..._1438_cancel_multiple_paste_ui_not_lock.js | 2 +- .../issue_1439_blocked_object_info.js | 2 +- .../issue_1444_filter_property_shape.js | 0 .../issue_1498_message_ui_raw_labels_wrong.js | 2 +- .../issue_1540_add_remove_tag.js | 0 .../issue_1568_cuboid_dump_annotation.js | 0 .../issue_1750_err_aam_switch_frames.js | 2 +- .../issue_1785_propagation_latest_frame.js | 2 +- ..._1819_first_part_splitted_track_visible.js | 2 +- ...ntext_menu_when_switching_another_frame.js | 0 .../issue_1825_tooltip_hidden_mouseout.js | 2 +- ...sue_1841_hidden_points_cuboids_grouping.js | 2 +- .../issue_1870_cursor_not_jump_to_end.js | 2 +- tests/cypress_cron_type.json | 8 +- 112 files changed, 317 insertions(+), 83 deletions(-) create mode 100644 .github/workflows/cache.yml rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_20_objects_ordering_feature.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_22_tag_annotation_mode.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_24_delete_unlock_lock_object.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_34_drawing_with_predefined_number_points.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_36_always_show_object_details_feature.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_37_object_make_copy.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_53_object_propagate.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_54_redraw_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_55_repeat_draw_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_59_edit_handler.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects}/case_60_autoborder_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_10_polygon_shape_track_label_points.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_11_polylines_shape_track_label_points.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_12_points_shape_track_label.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_13_merge_split_features.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_14_appearance_features.js (99%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_15_group_features.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_16_z_order_features.js (95%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_17_lock_hide_features.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_8_rectangle_shape_track_label.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_objects2}/case_9_cuboid_shape_track_label.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/assets/case_65_manifest/image_case_65_1.png (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/assets/case_65_manifest/image_case_65_2.png (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/assets/case_65_manifest/manifest.jsonl (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_51_settings_auto_save.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_52_dump_upload_annotation.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_58_task_label_deleting_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_61_create_task_set_issue_tracker.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_65_create_task_with_manifest.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_66_rename_label_raw_editor.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_67_intelligent_polygon_cropping.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_68_saving_settings_local_storage.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_70_mutable_attribute.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_71_shortcuts_window.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/case_72_hotkeys_change_labels.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/issue_2473_import_annotations_frames_dots_in_name.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/registration_involved/case_39_issue_2572_rename_task.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks}/registration_involved/case_69_filters_sorting_jobs.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_21_canvas_color_feature.js (97%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_23_canvas_grid_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_25_canvas_bitmap_feature.js (93%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_26_canvas_brightness_contrast_saturation_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_27_undo_redo_feature.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_29_settings_player_step.js (97%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_30_collapse_sidebar_apperance.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_31_label_constructor_color_name_label.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_32_attribute_annotation_mode_zoom_margin_feature.js (98%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_33_button_continue_label_editor.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_35_search_task_feature.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_40_create_task_without_necessary_arguments.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_41_add_delete_label_attribute.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_42_change_label_name_via_label_constructor.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks2}/case_43_create_label_with_existing_label_name.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_18_filters_functionality.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_19_all_image_rotate_features.js (97%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_1_create_delete_task.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_3_task_start_stop_step_frame.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_44_changing_default_value_for_attribute.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_45_open_the_task_button.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_46_create_task_with_files_from_remote_sources.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_47_export_dataset.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_48_issue_2663_annotations_statistics.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_49_settings_show_all_interpolation_tracks.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_50_settings_player_speed.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_5_image_rotate.js (100%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_6_image_scale_fit.js (96%) rename tests/cypress/integration/{actions_tasks_objects => actions_tasks3}/case_7_image_scale_roi.js (96%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_1882_polygon_interpolation.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_1886_point_coordinates_not_duplicated.js (98%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_1919_check_text_attr.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_1922_error_canvas_is_busy_at_resize_element.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_1944_loading_screen_switch_job.js (96%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2174_reset_zoom_in_tag_annotation_mode.js (98%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2230_maintenance_popover_visibility.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2306_ui_not_throw_error_specify_one_point.js (95%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2411_deleting_attributes.js (99%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2418_object_tag_same_labels.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2485_navigation_empty_frames.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2486_not_edit_object_aam.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2487_extra_instances_canvas_grouping.js (94%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2661_displaying_attached_files_when_creating_task.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2753_call_HOC_component_each_render.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2807_polyline_editing.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/issue_2992_crop_polygon_properly.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js (96%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs}/pr_2203_error_cannot_read_property_at_saving_job.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1368_points_track_invisible_next_frame.js (96%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1391_delete_point.js (98%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1425_highlighted_attribute_correspond_chosen_attribute.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1429_check_new_label.js (96%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1433_hide_functionality.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1438_cancel_multiple_paste_ui_not_lock.js (95%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1439_blocked_object_info.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1444_filter_property_shape.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1498_message_ui_raw_labels_wrong.js (99%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1540_add_remove_tag.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1568_cuboid_dump_annotation.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1750_err_aam_switch_frames.js (98%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1785_propagation_latest_frame.js (96%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1819_first_part_splitted_track_visible.js (97%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1823_opening_context_menu_when_switching_another_frame.js (100%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1825_tooltip_hidden_mouseout.js (95%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1841_hidden_points_cuboids_grouping.js (98%) rename tests/cypress/integration/{actions_tasks_objects => issues_prs2}/issue_1870_cursor_not_jump_to_end.js (97%) diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml new file mode 100644 index 00000000..7401b3d5 --- /dev/null +++ b/.github/workflows/cache.yml @@ -0,0 +1,50 @@ +name: Cache +on: + push: + branches: + - 'develop' + +jobs: + Caching_CVAT: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: /tmp/cvat_cache_server + key: ${{ runner.os }}-build-server-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-build-server- + + - uses: actions/cache@v2 + with: + path: /tmp/cvat_cache_ui + key: ${{ runner.os }}-build-ui-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-build-ui- + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1.1.2 + + - name: Caching CVAT server + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + cache-from: type=local,src=/tmp/cvat_cache_server + cache-to: type=local,dest=/tmp/cvat_cache_server-new + + - name: Caching CVAT UI + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile.ui + cache-from: type=local,src=/tmp/cvat_cache_ui + cache-to: type=local,dest=/tmp/cvat_cache_ui-new + + - name: Moving cache + run: | + rm -rf /tmp/cvat_cache_server + mv /tmp/cvat_cache_server-new /tmp/cvat_cache_server + rm -rf /tmp/cvat_cache_ui + mv /tmp/cvat_cache_ui-new /tmp/cvat_cache_ui diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d36ed29..f0bd291c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,50 +8,228 @@ on: branches: - '*' jobs: - build: - runs-on: ubuntu-latest - steps: + Unit_testing: + runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - name: Getting SHA from the default branch + id: get-sha + run: | + URL_get_default_branch="https://api.github.com/repos/${{ github.repository }}" + DEFAULT_BRANCH=$(curl -s -X GET -G ${URL_get_default_branch} | jq -r '.default_branch') + URL_get_sha_default_branch="https://api.github.com/repos/${{ github.repository }}/git/ref/heads/${DEFAULT_BRANCH}" + SHA=$(curl -s -X GET -G ${URL_get_sha_default_branch} | jq .object.sha | tr -d '"') + echo ::set-output name=default_branch::${DEFAULT_BRANCH} + echo ::set-output name=sha::${SHA} + - name: Waiting a cache creation in the default branch + run: | + URL_runs="https://api.github.com/repos/${{ github.repository }}/actions/workflows/cache.yml/runs" + SLEEP=45 + NUMBER_ATTEMPTS=10 + while [[ ${NUMBER_ATTEMPTS} -gt 0 ]]; do + RUN_status=$(curl -s -X GET -G ${URL_runs} | jq -r '.workflow_runs[]? | select((.head_sha == "${{ steps.get-sha.outputs.sha }}") and (.event == "push") and (.name == "Cache") and (.head_branch == "${{ steps.get-sha.outputs.default_branch }}")) | .status') + if [[ ${RUN_status} == "completed" ]]; then + echo "The cache creation on the '${{ steps.get-sha.outputs.default_branch }}' branch has finished. Status: ${RUN_status}" + break + else + echo "The creation of the cache is not yet complete." + echo "There are still attempts to check the cache: ${NUMBER_ATTEMPTS}" + echo "Status of caching in the '${{ steps.get-sha.outputs.default_branch }}' branch: ${RUN_status}" + echo "sleep ${SLEEP}" + sleep ${SLEEP} + ((NUMBER_ATTEMPTS--)) + fi + done + if [[ ${NUMBER_ATTEMPTS} -eq 0 ]]; then + echo "Number of attempts expired!" + echo "Probably the creation of the cache is not yet complete. Will continue working without the cache." + fi + - name: Getting CVAT server cache from the default branch + uses: actions/cache@v2 with: - node-version: 12 - - name: Build CVAT + path: /tmp/cvat_cache_server + key: ${{ runner.os }}-build-server-${{ steps.get-sha.outputs.sha }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1.1.2 + - name: Building CVAT server image + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + cache-from: type=local,src=/tmp/cvat_cache_server + tags: openvino/cvat_server:latest + load: true + - name: Runing unit tests env: HOST_COVERAGE_DATA_DIR: ${{ github.workspace }} - CONTAINER_COVERAGE_DATA_DIR: '/coverage_data' - DJANGO_SU_NAME: 'admin' - DJANGO_SU_EMAIL: 'admin@localhost.company' - DJANGO_SU_PASSWORD: '12qwaszx' + CONTAINER_COVERAGE_DATA_DIR: "/coverage_data" run: | - docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml build docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'coverage run -a manage.py test cvat/apps utils/cli && mv .coverage ${CONTAINER_COVERAGE_DATA_DIR}' docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd cvat-data && npm ci && cd ../cvat-core && npm ci && npm run test && mv ./reports/coverage/lcov.info ${CONTAINER_COVERAGE_DATA_DIR} && chmod a+rwx ${CONTAINER_COVERAGE_DATA_DIR}/lcov.info' - docker-compose up -d - docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell" - - name: Code instrumentation + - name: Uploading code coverage results as an artifact + if: github.ref == 'refs/heads/develop' + uses: actions/upload-artifact@v2 + with: + name: coverage_results + path: | + ${{ github.workspace }}/.coverage + ${{ github.workspace }}/lcov.info + + E2E_testing: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3', 'actions_objects', 'actions_objects2', 'actions_users', 'actions_projects', 'canvas3d_functionality', 'issues_prs', 'issues_prs2'] + steps: + - uses: actions/checkout@v2 + - name: Getting SHA from the default branch + id: get-sha + run: | + URL_get_default_branch="https://api.github.com/repos/${{ github.repository }}" + DEFAULT_BRANCH=$(curl -s -X GET -G ${URL_get_default_branch} | jq -r '.default_branch') + URL_get_sha_default_branch="https://api.github.com/repos/${{ github.repository }}/git/ref/heads/${DEFAULT_BRANCH}" + SHA=$(curl -s -X GET -G ${URL_get_sha_default_branch} | jq .object.sha | tr -d '"') + echo ::set-output name=default_branch::${DEFAULT_BRANCH} + echo ::set-output name=sha::${SHA} + - name: Waiting a cache creation in the default branch + run: | + URL_runs="https://api.github.com/repos/${{ github.repository }}/actions/workflows/cache.yml/runs" + SLEEP=45 + NUMBER_ATTEMPTS=10 + while [[ ${NUMBER_ATTEMPTS} -gt 0 ]]; do + RUN_status=$(curl -s -X GET -G ${URL_runs} | jq -r '.workflow_runs[]? | select((.head_sha == "${{ steps.get-sha.outputs.sha }}") and (.event == "push") and (.name == "Cache") and (.head_branch == "${{ steps.get-sha.outputs.default_branch }}")) | .status') + if [[ ${RUN_status} == "completed" ]]; then + echo "The cache creation on the '${{ steps.get-sha.outputs.default_branch }}' branch has finished. Status: ${RUN_status}" + break + else + echo "The creation of the cache is not yet complete." + echo "There are still attempts to check the cache: ${NUMBER_ATTEMPTS}" + echo "Status of caching in the '${{ steps.get-sha.outputs.default_branch }}' branch: ${RUN_status}" + echo "sleep ${SLEEP}" + sleep ${SLEEP} + ((NUMBER_ATTEMPTS--)) + fi + done + if [[ ${NUMBER_ATTEMPTS} -eq 0 ]]; then + echo "Number of attempts expired!" + echo "Probably the creation of the cache is not yet complete. Will continue working without the cache." + fi + - name: Getting CVAT server cache from the default branch + uses: actions/cache@v2 + with: + path: /tmp/cvat_cache_server + key: ${{ runner.os }}-build-server-${{ steps.get-sha.outputs.sha }} + - name: Getting cache CVAT UI from the default branch + uses: actions/cache@v2 + with: + path: /tmp/cvat_cache_ui + key: ${{ runner.os }}-build-ui-${{ steps.get-sha.outputs.sha }} + - uses: actions/setup-node@v2 + with: + node-version: 12 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1.1.2 + - name: Building CVAT server image + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + cache-from: type=local,src=/tmp/cvat_cache_server + tags: openvino/cvat_server:latest + load: true + - name: Building CVAT UI image + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile.ui + cache-from: type=local,src=/tmp/cvat_cache_ui + tags: openvino/cvat_ui:latest + load: true + - name: Instrumentation of the code then rebuilding the CVAT UI + if: github.ref == 'refs/heads/develop' run: | npm ci npm run coverage - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build - - name: End-to-end testing + docker-compose -f docker-compose.yml -f docker-compose.dev.yml build cvat_ui + - name: Running e2e tests + env: + DJANGO_SU_NAME: 'admin' + DJANGO_SU_EMAIL: 'admin@localhost.company' + DJANGO_SU_PASSWORD: '12qwaszx' + API_ABOUT_PAGE: "localhost:8080/api/v1/server/about" run: | + docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d + /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' ${API_ABOUT_PAGE})" != "401" ]]; do sleep 5; done' + docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell" docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell" cd ./tests npm ci - npx cypress run --headless --browser chrome + if [[ ${{ github.ref }} == 'refs/heads/develop' ]]; then + npx cypress run --headless --browser chrome --spec 'cypress/integration/${{ matrix.specs }}/**/*.js' + mv ./.nyc_output/out.json ./.nyc_output/out_${{ matrix.specs }}.json + else + npx cypress run --headless --browser chrome --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js' + fi - name: Uploading cypress screenshots as an artifact if: failure() uses: actions/upload-artifact@v2 with: - name: cypress_screenshots + name: cypress_screenshots_${{ matrix.specs }} path: ${{ github.workspace }}/tests/cypress/screenshots - - name: Collect coverage data + - name: Uploading code coverage results as an artifact + if: github.ref == 'refs/heads/develop' + uses: actions/upload-artifact@v2 + with: + name: coverage_results + path: ${{ github.workspace }}/tests/.nyc_output + + Coveralls: + if: github.ref == 'refs/heads/develop' + runs-on: ubuntu-latest + needs: [Unit_testing, E2E_testing] + steps: + - uses: actions/checkout@v2 + - name: Geting SHA from the default branch + id: get-sha + run: | + URL_get_default_branch="https://api.github.com/repos/${{ github.repository }}" + DEFAULT_BRANCH=$(curl -s -X GET -G ${URL_get_default_branch} | jq -r '.default_branch') + URL_get_sha_default_branch="https://api.github.com/repos/${{ github.repository }}/git/ref/heads/${DEFAULT_BRANCH}" + SHA=$(curl -s -X GET -G ${URL_get_sha_default_branch} | jq .object.sha | tr -d '"') + echo ::set-output name=sha::${SHA} + - name: Getting CVAT server cache from the default branch + uses: actions/cache@v2 + with: + path: /tmp/cvat_cache_server + key: ${{ runner.os }}-build-server-${{ steps.get-sha.outputs.sha }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1.1.2 + - name: Building CVAT server image + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + cache-from: type=local,src=/tmp/cvat_cache_server + tags: openvino/cvat_server:latest + load: true + - name: Downloading coverage results + uses: actions/download-artifact@v2 + with: + name: coverage_results + - name: Combining coverage results + run: | + mkdir -p ./nyc_output_tmp + mv ./out_*.json ./nyc_output_tmp + mkdir -p ./.nyc_output + npm ci + npx nyc merge ./nyc_output_tmp ./.nyc_output/out.json + - name: Sending results to Coveralls env: HOST_COVERAGE_DATA_DIR: ${{ github.workspace }} CONTAINER_COVERAGE_DATA_DIR: "/coverage_data" COVERALLS_SERVICE_NAME: github GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - mv ./tests/.nyc_output ./ - npx nyc report --reporter=text-lcov >> ${HOST_COVERAGE_DATA_DIR}/lcov.info - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd ${CONTAINER_COVERAGE_DATA_DIR} && coveralls-lcov -v -n lcov.info > ${CONTAINER_COVERAGE_DATA_DIR}/coverage.json' - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'ln -s ${CONTAINER_COVERAGE_DATA_DIR}/.git . && ln -s ${CONTAINER_COVERAGE_DATA_DIR}/.coverage . && ln -s ${CONTAINER_COVERAGE_DATA_DIR}/coverage.json . && coveralls --merge=coverage.json' + npx nyc report --reporter=text-lcov >> ${HOST_COVERAGE_DATA_DIR}/lcov.info + docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd ${CONTAINER_COVERAGE_DATA_DIR} && coveralls-lcov -v -n lcov.info > ${CONTAINER_COVERAGE_DATA_DIR}/coverage.json' + docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'ln -s ${CONTAINER_COVERAGE_DATA_DIR}/.git . && ln -s ${CONTAINER_COVERAGE_DATA_DIR}/.coverage . && ln -s ${CONTAINER_COVERAGE_DATA_DIR}/coverage.json . && coveralls --merge=coverage.json' diff --git a/Dockerfile b/Dockerfile index 3952cc14..917f2422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM ubuntu:20.04 as build-image ARG http_proxy ARG https_proxy -ARG no_proxy +ARG no_proxy="nuclio,${no_proxy}" ARG socks_proxy -ARG DJANGO_CONFIGURATION +ARG DJANGO_CONFIGURATION="production" RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \ @@ -53,9 +53,9 @@ FROM ubuntu:20.04 ARG http_proxy ARG https_proxy -ARG no_proxy +ARG no_proxy="nuclio,${no_proxy}" ARG socks_proxy -ARG TZ +ARG TZ="Etc/UTC" ENV TERM=xterm \ http_proxy=${http_proxy} \ @@ -66,8 +66,8 @@ ENV TERM=xterm \ LC_ALL='C.UTF-8' \ TZ=${TZ} -ARG USER -ARG DJANGO_CONFIGURATION +ARG USER="django" +ARG DJANGO_CONFIGURATION="production" ENV DJANGO_CONFIGURATION=${DJANGO_CONFIGURATION} # Install necessary apt packages diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 2b60e72b..7c939741 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -14,8 +14,6 @@ services: dockerfile: Dockerfile.ci depends_on: - cvat - - cvat_ui - - cvat_proxy environment: COVERALLS_SERVICE_NAME: CONTAINER_COVERAGE_DATA_DIR: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 8a7510ca..893d2ae5 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -12,11 +12,7 @@ services: args: http_proxy: https_proxy: - no_proxy: nuclio,${no_proxy} socks_proxy: - USER: 'django' - DJANGO_CONFIGURATION: 'production' - TZ: 'Etc/UTC' CLAM_AV: INSTALL_SOURCES: diff --git a/tests/cypress.json b/tests/cypress.json index 2977d258..1d4be56d 100644 --- a/tests/cypress.json +++ b/tests/cypress.json @@ -12,7 +12,13 @@ }, "testFiles": [ "auth_page.js", - "actions_tasks_objects/**/*.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/**/*.js", "canvas3d_functionality/*.js", diff --git a/tests/cypress/integration/actions_tasks_objects/case_20_objects_ordering_feature.js b/tests/cypress/integration/actions_objects/case_20_objects_ordering_feature.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_20_objects_ordering_feature.js rename to tests/cypress/integration/actions_objects/case_20_objects_ordering_feature.js index 0d0b426b..d0ca7245 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_20_objects_ordering_feature.js +++ b/tests/cypress/integration/actions_objects/case_20_objects_ordering_feature.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_22_tag_annotation_mode.js b/tests/cypress/integration/actions_objects/case_22_tag_annotation_mode.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_22_tag_annotation_mode.js rename to tests/cypress/integration/actions_objects/case_22_tag_annotation_mode.js index a983f992..5331233c 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_22_tag_annotation_mode.js +++ b/tests/cypress/integration/actions_objects/case_22_tag_annotation_mode.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_24_delete_unlock_lock_object.js b/tests/cypress/integration/actions_objects/case_24_delete_unlock_lock_object.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_24_delete_unlock_lock_object.js rename to tests/cypress/integration/actions_objects/case_24_delete_unlock_lock_object.js index e9682238..feb1e157 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_24_delete_unlock_lock_object.js +++ b/tests/cypress/integration/actions_objects/case_24_delete_unlock_lock_object.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_34_drawing_with_predefined_number_points.js b/tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_34_drawing_with_predefined_number_points.js rename to tests/cypress/integration/actions_objects/case_34_drawing_with_predefined_number_points.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_36_always_show_object_details_feature.js b/tests/cypress/integration/actions_objects/case_36_always_show_object_details_feature.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_36_always_show_object_details_feature.js rename to tests/cypress/integration/actions_objects/case_36_always_show_object_details_feature.js index b915eafd..f8053323 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_36_always_show_object_details_feature.js +++ b/tests/cypress/integration/actions_objects/case_36_always_show_object_details_feature.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_37_object_make_copy.js b/tests/cypress/integration/actions_objects/case_37_object_make_copy.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_37_object_make_copy.js rename to tests/cypress/integration/actions_objects/case_37_object_make_copy.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_53_object_propagate.js b/tests/cypress/integration/actions_objects/case_53_object_propagate.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_53_object_propagate.js rename to tests/cypress/integration/actions_objects/case_53_object_propagate.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_54_redraw_feature.js b/tests/cypress/integration/actions_objects/case_54_redraw_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_54_redraw_feature.js rename to tests/cypress/integration/actions_objects/case_54_redraw_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_55_repeat_draw_feature.js b/tests/cypress/integration/actions_objects/case_55_repeat_draw_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_55_repeat_draw_feature.js rename to tests/cypress/integration/actions_objects/case_55_repeat_draw_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_59_edit_handler.js b/tests/cypress/integration/actions_objects/case_59_edit_handler.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_59_edit_handler.js rename to tests/cypress/integration/actions_objects/case_59_edit_handler.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_60_autoborder_feature.js b/tests/cypress/integration/actions_objects/case_60_autoborder_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_60_autoborder_feature.js rename to tests/cypress/integration/actions_objects/case_60_autoborder_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js b/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js rename to tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js index 902e03d4..6672cfb8 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js +++ b/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js b/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js rename to tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js index ca9e53b2..98101873 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js +++ b/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js b/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js rename to tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js index eeecfab7..48fb6d6d 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js +++ b/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_13_merge_split_features.js b/tests/cypress/integration/actions_objects2/case_13_merge_split_features.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_13_merge_split_features.js rename to tests/cypress/integration/actions_objects2/case_13_merge_split_features.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_14_appearance_features.js b/tests/cypress/integration/actions_objects2/case_14_appearance_features.js similarity index 99% rename from tests/cypress/integration/actions_tasks_objects/case_14_appearance_features.js rename to tests/cypress/integration/actions_objects2/case_14_appearance_features.js index 7d912bdb..d6b3c36c 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_14_appearance_features.js +++ b/tests/cypress/integration/actions_objects2/case_14_appearance_features.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_15_group_features.js b/tests/cypress/integration/actions_objects2/case_15_group_features.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_15_group_features.js rename to tests/cypress/integration/actions_objects2/case_15_group_features.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_16_z_order_features.js b/tests/cypress/integration/actions_objects2/case_16_z_order_features.js similarity index 95% rename from tests/cypress/integration/actions_tasks_objects/case_16_z_order_features.js rename to tests/cypress/integration/actions_objects2/case_16_z_order_features.js index 42fbb360..fda16bc4 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_16_z_order_features.js +++ b/tests/cypress/integration/actions_objects2/case_16_z_order_features.js @@ -63,7 +63,7 @@ context('Actions on polygon', () => { }); it('Second shape is over the first shape', () => { - // The larger the index of an element in the array the closer it is to us + // The larger the index of an element in the array the closer it is to us cy.get('.cvat_canvas_shape').then(($canvasShape) => { expect(Number($canvasShape[1].id.match(/\d+$/))).to.be.equal(2); }); @@ -74,7 +74,7 @@ context('Actions on polygon', () => { }); it('First shape is over the second shape', () => { - // The larger the index of an element in the array the closer it is to us + // The larger the index of an element in the array the closer it is to us cy.get('.cvat_canvas_shape').then(($canvasShape) => { expect(Number($canvasShape[1].id.match(/\d+$/))).to.be.equal(1); assert.isAbove( diff --git a/tests/cypress/integration/actions_tasks_objects/case_17_lock_hide_features.js b/tests/cypress/integration/actions_objects2/case_17_lock_hide_features.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_17_lock_hide_features.js rename to tests/cypress/integration/actions_objects2/case_17_lock_hide_features.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js b/tests/cypress/integration/actions_objects2/case_8_rectangle_shape_track_label.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js rename to tests/cypress/integration/actions_objects2/case_8_rectangle_shape_track_label.js index 870c858d..2601bc52 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js +++ b/tests/cypress/integration/actions_objects2/case_8_rectangle_shape_track_label.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js b/tests/cypress/integration/actions_objects2/case_9_cuboid_shape_track_label.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js rename to tests/cypress/integration/actions_objects2/case_9_cuboid_shape_track_label.js index 2197239b..b11c6f37 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js +++ b/tests/cypress/integration/actions_objects2/case_9_cuboid_shape_track_label.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/assets/case_65_manifest/image_case_65_1.png b/tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_1.png similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/assets/case_65_manifest/image_case_65_1.png rename to tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_1.png diff --git a/tests/cypress/integration/actions_tasks_objects/assets/case_65_manifest/image_case_65_2.png b/tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_2.png similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/assets/case_65_manifest/image_case_65_2.png rename to tests/cypress/integration/actions_tasks/assets/case_65_manifest/image_case_65_2.png diff --git a/tests/cypress/integration/actions_tasks_objects/assets/case_65_manifest/manifest.jsonl b/tests/cypress/integration/actions_tasks/assets/case_65_manifest/manifest.jsonl similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/assets/case_65_manifest/manifest.jsonl rename to tests/cypress/integration/actions_tasks/assets/case_65_manifest/manifest.jsonl diff --git a/tests/cypress/integration/actions_tasks_objects/case_51_settings_auto_save.js b/tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_51_settings_auto_save.js rename to tests/cypress/integration/actions_tasks/case_51_settings_auto_save.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_52_dump_upload_annotation.js b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_52_dump_upload_annotation.js rename to tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_58_task_label_deleting_feature.js b/tests/cypress/integration/actions_tasks/case_58_task_label_deleting_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_58_task_label_deleting_feature.js rename to tests/cypress/integration/actions_tasks/case_58_task_label_deleting_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_61_create_task_set_issue_tracker.js b/tests/cypress/integration/actions_tasks/case_61_create_task_set_issue_tracker.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_61_create_task_set_issue_tracker.js rename to tests/cypress/integration/actions_tasks/case_61_create_task_set_issue_tracker.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_65_create_task_with_manifest.js b/tests/cypress/integration/actions_tasks/case_65_create_task_with_manifest.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_65_create_task_with_manifest.js rename to tests/cypress/integration/actions_tasks/case_65_create_task_with_manifest.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_66_rename_label_raw_editor.js b/tests/cypress/integration/actions_tasks/case_66_rename_label_raw_editor.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_66_rename_label_raw_editor.js rename to tests/cypress/integration/actions_tasks/case_66_rename_label_raw_editor.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_67_intelligent_polygon_cropping.js b/tests/cypress/integration/actions_tasks/case_67_intelligent_polygon_cropping.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_67_intelligent_polygon_cropping.js rename to tests/cypress/integration/actions_tasks/case_67_intelligent_polygon_cropping.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_68_saving_settings_local_storage.js b/tests/cypress/integration/actions_tasks/case_68_saving_settings_local_storage.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_68_saving_settings_local_storage.js rename to tests/cypress/integration/actions_tasks/case_68_saving_settings_local_storage.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_70_mutable_attribute.js b/tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_70_mutable_attribute.js rename to tests/cypress/integration/actions_tasks/case_70_mutable_attribute.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_71_shortcuts_window.js b/tests/cypress/integration/actions_tasks/case_71_shortcuts_window.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_71_shortcuts_window.js rename to tests/cypress/integration/actions_tasks/case_71_shortcuts_window.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_72_hotkeys_change_labels.js b/tests/cypress/integration/actions_tasks/case_72_hotkeys_change_labels.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_72_hotkeys_change_labels.js rename to tests/cypress/integration/actions_tasks/case_72_hotkeys_change_labels.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2473_import_annotations_frames_dots_in_name.js rename to tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js diff --git a/tests/cypress/integration/actions_tasks_objects/registration_involved/case_39_issue_2572_rename_task.js b/tests/cypress/integration/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/registration_involved/case_39_issue_2572_rename_task.js rename to tests/cypress/integration/actions_tasks/registration_involved/case_39_issue_2572_rename_task.js diff --git a/tests/cypress/integration/actions_tasks_objects/registration_involved/case_69_filters_sorting_jobs.js b/tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/registration_involved/case_69_filters_sorting_jobs.js rename to tests/cypress/integration/actions_tasks/registration_involved/case_69_filters_sorting_jobs.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_21_canvas_color_feature.js b/tests/cypress/integration/actions_tasks2/case_21_canvas_color_feature.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/case_21_canvas_color_feature.js rename to tests/cypress/integration/actions_tasks2/case_21_canvas_color_feature.js index 3457c1d2..d505741e 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_21_canvas_color_feature.js +++ b/tests/cypress/integration/actions_tasks2/case_21_canvas_color_feature.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_23_canvas_grid_feature.js b/tests/cypress/integration/actions_tasks2/case_23_canvas_grid_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_23_canvas_grid_feature.js rename to tests/cypress/integration/actions_tasks2/case_23_canvas_grid_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_25_canvas_bitmap_feature.js b/tests/cypress/integration/actions_tasks2/case_25_canvas_bitmap_feature.js similarity index 93% rename from tests/cypress/integration/actions_tasks_objects/case_25_canvas_bitmap_feature.js rename to tests/cypress/integration/actions_tasks2/case_25_canvas_bitmap_feature.js index f463c769..2a7f3a57 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_25_canvas_bitmap_feature.js +++ b/tests/cypress/integration/actions_tasks2/case_25_canvas_bitmap_feature.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_26_canvas_brightness_contrast_saturation_feature.js b/tests/cypress/integration/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_26_canvas_brightness_contrast_saturation_feature.js rename to tests/cypress/integration/actions_tasks2/case_26_canvas_brightness_contrast_saturation_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_27_undo_redo_feature.js b/tests/cypress/integration/actions_tasks2/case_27_undo_redo_feature.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_27_undo_redo_feature.js rename to tests/cypress/integration/actions_tasks2/case_27_undo_redo_feature.js index 704fc66c..8ad27cc9 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_27_undo_redo_feature.js +++ b/tests/cypress/integration/actions_tasks2/case_27_undo_redo_feature.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_29_settings_player_step.js b/tests/cypress/integration/actions_tasks2/case_29_settings_player_step.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/case_29_settings_player_step.js rename to tests/cypress/integration/actions_tasks2/case_29_settings_player_step.js index d8b3a10b..b1df33af 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_29_settings_player_step.js +++ b/tests/cypress/integration/actions_tasks2/case_29_settings_player_step.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_30_collapse_sidebar_apperance.js b/tests/cypress/integration/actions_tasks2/case_30_collapse_sidebar_apperance.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_30_collapse_sidebar_apperance.js rename to tests/cypress/integration/actions_tasks2/case_30_collapse_sidebar_apperance.js index b5a93774..8367fd0e 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_30_collapse_sidebar_apperance.js +++ b/tests/cypress/integration/actions_tasks2/case_30_collapse_sidebar_apperance.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_31_label_constructor_color_name_label.js b/tests/cypress/integration/actions_tasks2/case_31_label_constructor_color_name_label.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_31_label_constructor_color_name_label.js rename to tests/cypress/integration/actions_tasks2/case_31_label_constructor_color_name_label.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_32_attribute_annotation_mode_zoom_margin_feature.js b/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/case_32_attribute_annotation_mode_zoom_margin_feature.js rename to tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js index 09a4fe11..2ad22d12 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_32_attribute_annotation_mode_zoom_margin_feature.js +++ b/tests/cypress/integration/actions_tasks2/case_32_attribute_annotation_mode_zoom_margin_feature.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_33_button_continue_label_editor.js b/tests/cypress/integration/actions_tasks2/case_33_button_continue_label_editor.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_33_button_continue_label_editor.js rename to tests/cypress/integration/actions_tasks2/case_33_button_continue_label_editor.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_35_search_task_feature.js b/tests/cypress/integration/actions_tasks2/case_35_search_task_feature.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_35_search_task_feature.js rename to tests/cypress/integration/actions_tasks2/case_35_search_task_feature.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_40_create_task_without_necessary_arguments.js b/tests/cypress/integration/actions_tasks2/case_40_create_task_without_necessary_arguments.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_40_create_task_without_necessary_arguments.js rename to tests/cypress/integration/actions_tasks2/case_40_create_task_without_necessary_arguments.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_41_add_delete_label_attribute.js b/tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_41_add_delete_label_attribute.js rename to tests/cypress/integration/actions_tasks2/case_41_add_delete_label_attribute.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_42_change_label_name_via_label_constructor.js b/tests/cypress/integration/actions_tasks2/case_42_change_label_name_via_label_constructor.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_42_change_label_name_via_label_constructor.js rename to tests/cypress/integration/actions_tasks2/case_42_change_label_name_via_label_constructor.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_43_create_label_with_existing_label_name.js b/tests/cypress/integration/actions_tasks2/case_43_create_label_with_existing_label_name.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_43_create_label_with_existing_label_name.js rename to tests/cypress/integration/actions_tasks2/case_43_create_label_with_existing_label_name.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_18_filters_functionality.js b/tests/cypress/integration/actions_tasks3/case_18_filters_functionality.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_18_filters_functionality.js rename to tests/cypress/integration/actions_tasks3/case_18_filters_functionality.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_19_all_image_rotate_features.js b/tests/cypress/integration/actions_tasks3/case_19_all_image_rotate_features.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/case_19_all_image_rotate_features.js rename to tests/cypress/integration/actions_tasks3/case_19_all_image_rotate_features.js index 69a06717..5836177a 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_19_all_image_rotate_features.js +++ b/tests/cypress/integration/actions_tasks3/case_19_all_image_rotate_features.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_1_create_delete_task.js b/tests/cypress/integration/actions_tasks3/case_1_create_delete_task.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_1_create_delete_task.js rename to tests/cypress/integration/actions_tasks3/case_1_create_delete_task.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_3_task_start_stop_step_frame.js b/tests/cypress/integration/actions_tasks3/case_3_task_start_stop_step_frame.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_3_task_start_stop_step_frame.js rename to tests/cypress/integration/actions_tasks3/case_3_task_start_stop_step_frame.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_44_changing_default_value_for_attribute.js b/tests/cypress/integration/actions_tasks3/case_44_changing_default_value_for_attribute.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_44_changing_default_value_for_attribute.js rename to tests/cypress/integration/actions_tasks3/case_44_changing_default_value_for_attribute.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_45_open_the_task_button.js b/tests/cypress/integration/actions_tasks3/case_45_open_the_task_button.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_45_open_the_task_button.js rename to tests/cypress/integration/actions_tasks3/case_45_open_the_task_button.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_46_create_task_with_files_from_remote_sources.js b/tests/cypress/integration/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_46_create_task_with_files_from_remote_sources.js rename to tests/cypress/integration/actions_tasks3/case_46_create_task_with_files_from_remote_sources.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_47_export_dataset.js b/tests/cypress/integration/actions_tasks3/case_47_export_dataset.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_47_export_dataset.js rename to tests/cypress/integration/actions_tasks3/case_47_export_dataset.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_48_issue_2663_annotations_statistics.js b/tests/cypress/integration/actions_tasks3/case_48_issue_2663_annotations_statistics.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_48_issue_2663_annotations_statistics.js rename to tests/cypress/integration/actions_tasks3/case_48_issue_2663_annotations_statistics.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_49_settings_show_all_interpolation_tracks.js b/tests/cypress/integration/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_49_settings_show_all_interpolation_tracks.js rename to tests/cypress/integration/actions_tasks3/case_49_settings_show_all_interpolation_tracks.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_50_settings_player_speed.js b/tests/cypress/integration/actions_tasks3/case_50_settings_player_speed.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_50_settings_player_speed.js rename to tests/cypress/integration/actions_tasks3/case_50_settings_player_speed.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_5_image_rotate.js b/tests/cypress/integration/actions_tasks3/case_5_image_rotate.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/case_5_image_rotate.js rename to tests/cypress/integration/actions_tasks3/case_5_image_rotate.js diff --git a/tests/cypress/integration/actions_tasks_objects/case_6_image_scale_fit.js b/tests/cypress/integration/actions_tasks3/case_6_image_scale_fit.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/case_6_image_scale_fit.js rename to tests/cypress/integration/actions_tasks3/case_6_image_scale_fit.js index 37e97d5f..58f9d013 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_6_image_scale_fit.js +++ b/tests/cypress/integration/actions_tasks3/case_6_image_scale_fit.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/case_7_image_scale_roi.js b/tests/cypress/integration/actions_tasks3/case_7_image_scale_roi.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/case_7_image_scale_roi.js rename to tests/cypress/integration/actions_tasks3/case_7_image_scale_roi.js index 39ef785d..a0e16d41 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_7_image_scale_roi.js +++ b/tests/cypress/integration/actions_tasks3/case_7_image_scale_roi.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1882_polygon_interpolation.js b/tests/cypress/integration/issues_prs/issue_1882_polygon_interpolation.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_1882_polygon_interpolation.js rename to tests/cypress/integration/issues_prs/issue_1882_polygon_interpolation.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1886_point_coordinates_not_duplicated.js b/tests/cypress/integration/issues_prs/issue_1886_point_coordinates_not_duplicated.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/issue_1886_point_coordinates_not_duplicated.js rename to tests/cypress/integration/issues_prs/issue_1886_point_coordinates_not_duplicated.js index e1f01e28..d7dcac4d 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1886_point_coordinates_not_duplicated.js +++ b/tests/cypress/integration/issues_prs/issue_1886_point_coordinates_not_duplicated.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1919_check_text_attr.js b/tests/cypress/integration/issues_prs/issue_1919_check_text_attr.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1919_check_text_attr.js rename to tests/cypress/integration/issues_prs/issue_1919_check_text_attr.js index e91e5f1b..a588f56a 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1919_check_text_attr.js +++ b/tests/cypress/integration/issues_prs/issue_1919_check_text_attr.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1922_error_canvas_is_busy_at_resize_element.js b/tests/cypress/integration/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1922_error_canvas_is_busy_at_resize_element.js rename to tests/cypress/integration/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js index 63f4ca30..62e05aaf 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1922_error_canvas_is_busy_at_resize_element.js +++ b/tests/cypress/integration/issues_prs/issue_1922_error_canvas_is_busy_at_resize_element.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1944_loading_screen_switch_job.js b/tests/cypress/integration/issues_prs/issue_1944_loading_screen_switch_job.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/issue_1944_loading_screen_switch_job.js rename to tests/cypress/integration/issues_prs/issue_1944_loading_screen_switch_job.js index 72f17c48..4ae96efe 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1944_loading_screen_switch_job.js +++ b/tests/cypress/integration/issues_prs/issue_1944_loading_screen_switch_job.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2174_reset_zoom_in_tag_annotation_mode.js b/tests/cypress/integration/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/issue_2174_reset_zoom_in_tag_annotation_mode.js rename to tests/cypress/integration/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js index e2813025..e521f741 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_2174_reset_zoom_in_tag_annotation_mode.js +++ b/tests/cypress/integration/issues_prs/issue_2174_reset_zoom_in_tag_annotation_mode.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2230_maintenance_popover_visibility.js b/tests/cypress/integration/issues_prs/issue_2230_maintenance_popover_visibility.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2230_maintenance_popover_visibility.js rename to tests/cypress/integration/issues_prs/issue_2230_maintenance_popover_visibility.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2306_ui_not_throw_error_specify_one_point.js b/tests/cypress/integration/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js similarity index 95% rename from tests/cypress/integration/actions_tasks_objects/issue_2306_ui_not_throw_error_specify_one_point.js rename to tests/cypress/integration/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js index 0cf8a928..91d26448 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_2306_ui_not_throw_error_specify_one_point.js +++ b/tests/cypress/integration/issues_prs/issue_2306_ui_not_throw_error_specify_one_point.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2411_deleting_attributes.js b/tests/cypress/integration/issues_prs/issue_2411_deleting_attributes.js similarity index 99% rename from tests/cypress/integration/actions_tasks_objects/issue_2411_deleting_attributes.js rename to tests/cypress/integration/issues_prs/issue_2411_deleting_attributes.js index 3d18aa0c..73f32bf0 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_2411_deleting_attributes.js +++ b/tests/cypress/integration/issues_prs/issue_2411_deleting_attributes.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2418_object_tag_same_labels.js b/tests/cypress/integration/issues_prs/issue_2418_object_tag_same_labels.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_2418_object_tag_same_labels.js rename to tests/cypress/integration/issues_prs/issue_2418_object_tag_same_labels.js index 95c0e68b..65e80ff7 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_2418_object_tag_same_labels.js +++ b/tests/cypress/integration/issues_prs/issue_2418_object_tag_same_labels.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2485_navigation_empty_frames.js b/tests/cypress/integration/issues_prs/issue_2485_navigation_empty_frames.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2485_navigation_empty_frames.js rename to tests/cypress/integration/issues_prs/issue_2485_navigation_empty_frames.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2486_not_edit_object_aam.js b/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_2486_not_edit_object_aam.js rename to tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js index e2faee99..f66fb07b 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_2486_not_edit_object_aam.js +++ b/tests/cypress/integration/issues_prs/issue_2486_not_edit_object_aam.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2487_extra_instances_canvas_grouping.js b/tests/cypress/integration/issues_prs/issue_2487_extra_instances_canvas_grouping.js similarity index 94% rename from tests/cypress/integration/actions_tasks_objects/issue_2487_extra_instances_canvas_grouping.js rename to tests/cypress/integration/issues_prs/issue_2487_extra_instances_canvas_grouping.js index 87e7e393..248b80d2 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_2487_extra_instances_canvas_grouping.js +++ b/tests/cypress/integration/issues_prs/issue_2487_extra_instances_canvas_grouping.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2661_displaying_attached_files_when_creating_task.js b/tests/cypress/integration/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2661_displaying_attached_files_when_creating_task.js rename to tests/cypress/integration/issues_prs/issue_2661_displaying_attached_files_when_creating_task.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2753_call_HOC_component_each_render.js b/tests/cypress/integration/issues_prs/issue_2753_call_HOC_component_each_render.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2753_call_HOC_component_each_render.js rename to tests/cypress/integration/issues_prs/issue_2753_call_HOC_component_each_render.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2807_polyline_editing.js b/tests/cypress/integration/issues_prs/issue_2807_polyline_editing.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2807_polyline_editing.js rename to tests/cypress/integration/issues_prs/issue_2807_polyline_editing.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_2992_crop_polygon_properly.js b/tests/cypress/integration/issues_prs/issue_2992_crop_polygon_properly.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_2992_crop_polygon_properly.js rename to tests/cypress/integration/issues_prs/issue_2992_crop_polygon_properly.js diff --git a/tests/cypress/integration/actions_tasks_objects/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js b/tests/cypress/integration/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js rename to tests/cypress/integration/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js index b9f462dd..e8e9aeed 100644 --- a/tests/cypress/integration/actions_tasks_objects/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js +++ b/tests/cypress/integration/issues_prs/pr_1370_check_UI_fail_with_object_dragging_and_go_next_frame.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/pr_2203_error_cannot_read_property_at_saving_job.js b/tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/pr_2203_error_cannot_read_property_at_saving_job.js rename to tests/cypress/integration/issues_prs/pr_2203_error_cannot_read_property_at_saving_job.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js b/tests/cypress/integration/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js rename to tests/cypress/integration/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js index 1bcb8471..4227b72e 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js +++ b/tests/cypress/integration/issues_prs2/issue_1216_Check_if_UI_not_fails_with_shape_dragging_over_sidebar.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1368_points_track_invisible_next_frame.js b/tests/cypress/integration/issues_prs2/issue_1368_points_track_invisible_next_frame.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/issue_1368_points_track_invisible_next_frame.js rename to tests/cypress/integration/issues_prs2/issue_1368_points_track_invisible_next_frame.js index 662a5310..69922860 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1368_points_track_invisible_next_frame.js +++ b/tests/cypress/integration/issues_prs2/issue_1368_points_track_invisible_next_frame.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1391_delete_point.js b/tests/cypress/integration/issues_prs2/issue_1391_delete_point.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/issue_1391_delete_point.js rename to tests/cypress/integration/issues_prs2/issue_1391_delete_point.js index c7792000..05160de8 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1391_delete_point.js +++ b/tests/cypress/integration/issues_prs2/issue_1391_delete_point.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1425_highlighted_attribute_correspond_chosen_attribute.js b/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1425_highlighted_attribute_correspond_chosen_attribute.js rename to tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js index 75641b9b..0aed69a0 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1425_highlighted_attribute_correspond_chosen_attribute.js +++ b/tests/cypress/integration/issues_prs2/issue_1425_highlighted_attribute_correspond_chosen_attribute.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js b/tests/cypress/integration/issues_prs2/issue_1429_check_new_label.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js rename to tests/cypress/integration/issues_prs2/issue_1429_check_new_label.js index ce8f7cb9..9e312db9 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js +++ b/tests/cypress/integration/issues_prs2/issue_1429_check_new_label.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1433_hide_functionality.js b/tests/cypress/integration/issues_prs2/issue_1433_hide_functionality.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_1433_hide_functionality.js rename to tests/cypress/integration/issues_prs2/issue_1433_hide_functionality.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1438_cancel_multiple_paste_ui_not_lock.js b/tests/cypress/integration/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js similarity index 95% rename from tests/cypress/integration/actions_tasks_objects/issue_1438_cancel_multiple_paste_ui_not_lock.js rename to tests/cypress/integration/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js index ec5303f0..25a45e35 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1438_cancel_multiple_paste_ui_not_lock.js +++ b/tests/cypress/integration/issues_prs2/issue_1438_cancel_multiple_paste_ui_not_lock.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1439_blocked_object_info.js b/tests/cypress/integration/issues_prs2/issue_1439_blocked_object_info.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1439_blocked_object_info.js rename to tests/cypress/integration/issues_prs2/issue_1439_blocked_object_info.js index 8f44ac13..0a10e1d6 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1439_blocked_object_info.js +++ b/tests/cypress/integration/issues_prs2/issue_1439_blocked_object_info.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1444_filter_property_shape.js b/tests/cypress/integration/issues_prs2/issue_1444_filter_property_shape.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_1444_filter_property_shape.js rename to tests/cypress/integration/issues_prs2/issue_1444_filter_property_shape.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1498_message_ui_raw_labels_wrong.js b/tests/cypress/integration/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js similarity index 99% rename from tests/cypress/integration/actions_tasks_objects/issue_1498_message_ui_raw_labels_wrong.js rename to tests/cypress/integration/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js index b1442646..74247f40 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1498_message_ui_raw_labels_wrong.js +++ b/tests/cypress/integration/issues_prs2/issue_1498_message_ui_raw_labels_wrong.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1540_add_remove_tag.js b/tests/cypress/integration/issues_prs2/issue_1540_add_remove_tag.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_1540_add_remove_tag.js rename to tests/cypress/integration/issues_prs2/issue_1540_add_remove_tag.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1568_cuboid_dump_annotation.js b/tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_1568_cuboid_dump_annotation.js rename to tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1750_err_aam_switch_frames.js b/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/issue_1750_err_aam_switch_frames.js rename to tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js index 5245e7e1..98a2ac8b 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1750_err_aam_switch_frames.js +++ b/tests/cypress/integration/issues_prs2/issue_1750_err_aam_switch_frames.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1785_propagation_latest_frame.js b/tests/cypress/integration/issues_prs2/issue_1785_propagation_latest_frame.js similarity index 96% rename from tests/cypress/integration/actions_tasks_objects/issue_1785_propagation_latest_frame.js rename to tests/cypress/integration/issues_prs2/issue_1785_propagation_latest_frame.js index 2f3f4ab4..495f47cb 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1785_propagation_latest_frame.js +++ b/tests/cypress/integration/issues_prs2/issue_1785_propagation_latest_frame.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1819_first_part_splitted_track_visible.js b/tests/cypress/integration/issues_prs2/issue_1819_first_part_splitted_track_visible.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1819_first_part_splitted_track_visible.js rename to tests/cypress/integration/issues_prs2/issue_1819_first_part_splitted_track_visible.js index c9ed049d..abc1717a 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1819_first_part_splitted_track_visible.js +++ b/tests/cypress/integration/issues_prs2/issue_1819_first_part_splitted_track_visible.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1823_opening_context_menu_when_switching_another_frame.js b/tests/cypress/integration/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js similarity index 100% rename from tests/cypress/integration/actions_tasks_objects/issue_1823_opening_context_menu_when_switching_another_frame.js rename to tests/cypress/integration/issues_prs2/issue_1823_opening_context_menu_when_switching_another_frame.js diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1825_tooltip_hidden_mouseout.js b/tests/cypress/integration/issues_prs2/issue_1825_tooltip_hidden_mouseout.js similarity index 95% rename from tests/cypress/integration/actions_tasks_objects/issue_1825_tooltip_hidden_mouseout.js rename to tests/cypress/integration/issues_prs2/issue_1825_tooltip_hidden_mouseout.js index 88ff1522..03ce16b7 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1825_tooltip_hidden_mouseout.js +++ b/tests/cypress/integration/issues_prs2/issue_1825_tooltip_hidden_mouseout.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1841_hidden_points_cuboids_grouping.js b/tests/cypress/integration/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js similarity index 98% rename from tests/cypress/integration/actions_tasks_objects/issue_1841_hidden_points_cuboids_grouping.js rename to tests/cypress/integration/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js index c760b7e0..18587e16 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1841_hidden_points_cuboids_grouping.js +++ b/tests/cypress/integration/issues_prs2/issue_1841_hidden_points_cuboids_grouping.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1870_cursor_not_jump_to_end.js b/tests/cypress/integration/issues_prs2/issue_1870_cursor_not_jump_to_end.js similarity index 97% rename from tests/cypress/integration/actions_tasks_objects/issue_1870_cursor_not_jump_to_end.js rename to tests/cypress/integration/issues_prs2/issue_1870_cursor_not_jump_to_end.js index a113ef1e..2aa5d11c 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1870_cursor_not_jump_to_end.js +++ b/tests/cypress/integration/issues_prs2/issue_1870_cursor_not_jump_to_end.js @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/tests/cypress_cron_type.json b/tests/cypress_cron_type.json index 2afcbf72..c22f2d70 100644 --- a/tests/cypress_cron_type.json +++ b/tests/cypress_cron_type.json @@ -11,7 +11,13 @@ }, "testFiles": [ "auth_page.js", - "actions_tasks_objects/*.js", + "actions_tasks/*.js", + "actions_tasks2/*.js", + "actions_tasks3/*.js", + "actions_objects/*.js", + "actions_objects2/*.js", + "issues_prs/*.js", + "issues_prs2/*.js", "actions_projects/*.js", "actions_users/*.js", "email_system/*.js",