shipit-engine 0.28.1 → 0.33.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +41 -2
- data/Rakefile +4 -2
- data/app/assets/images/archive-solid.svg +1 -0
- data/app/assets/images/magic-solid.svg +1 -0
- data/app/assets/javascripts/shipit/repositories_search.js.coffee +60 -0
- data/app/assets/javascripts/shipit/{search.js.coffee → stack_search.js.coffee} +0 -0
- data/app/assets/stylesheets/_pages/_repositories.scss +148 -0
- data/app/assets/stylesheets/_pages/_stacks.scss +95 -3
- data/app/assets/stylesheets/merge_status.scss +0 -3
- data/app/assets/stylesheets/shipit.scss +1 -0
- data/app/controllers/concerns/shipit/active_model_serializers_patch.rb +13 -0
- data/app/controllers/concerns/shipit/api/cacheable.rb +1 -0
- data/app/controllers/concerns/shipit/api/paginable.rb +3 -2
- data/app/controllers/concerns/shipit/api/rendering.rb +5 -4
- data/app/controllers/concerns/shipit/authentication.rb +3 -2
- data/app/controllers/concerns/shipit/pagination.rb +2 -1
- data/app/controllers/shipit/api/base_controller.rb +11 -6
- data/app/controllers/shipit/api/ccmenu_controller.rb +2 -1
- data/app/controllers/shipit/api/commits_controller.rb +2 -1
- data/app/controllers/shipit/api/deploys_controller.rb +4 -3
- data/app/controllers/shipit/api/hooks_controller.rb +6 -5
- data/app/controllers/shipit/api/locks_controller.rb +5 -4
- data/app/controllers/shipit/api/merge_requests_controller.rb +37 -0
- data/app/controllers/shipit/api/outputs_controller.rb +2 -1
- data/app/controllers/shipit/api/release_statuses_controller.rb +3 -2
- data/app/controllers/shipit/api/rollbacks_controller.rb +33 -0
- data/app/controllers/shipit/api/stacks_controller.rb +50 -5
- data/app/controllers/shipit/api/tasks_controller.rb +6 -5
- data/app/controllers/shipit/api_clients_controller.rb +50 -0
- data/app/controllers/shipit/ccmenu_url_controller.rb +4 -3
- data/app/controllers/shipit/commit_checks_controller.rb +2 -1
- data/app/controllers/shipit/commits_controller.rb +2 -1
- data/app/controllers/shipit/deploys_controller.rb +5 -4
- data/app/controllers/shipit/github_authentication_controller.rb +4 -3
- data/app/controllers/shipit/merge_requests_controller.rb +31 -0
- data/app/controllers/shipit/merge_status_controller.rb +33 -28
- data/app/controllers/shipit/release_statuses_controller.rb +3 -2
- data/app/controllers/shipit/repositories_controller.rb +74 -0
- data/app/controllers/shipit/rollbacks_controller.rb +3 -2
- data/app/controllers/shipit/shipit_controller.rb +2 -1
- data/app/controllers/shipit/stacks_controller.rb +78 -14
- data/app/controllers/shipit/status_controller.rb +2 -1
- data/app/controllers/shipit/tasks_controller.rb +9 -8
- data/app/controllers/shipit/webhooks_controller.rb +5 -132
- data/app/helpers/shipit/chunks_helper.rb +3 -2
- data/app/helpers/shipit/deploys_helper.rb +4 -3
- data/app/helpers/shipit/github_url_helper.rb +9 -0
- data/app/helpers/shipit/merge_status_helper.rb +1 -0
- data/app/helpers/shipit/shipit_helper.rb +1 -0
- data/app/helpers/shipit/stacks_helper.rb +9 -0
- data/app/helpers/shipit/tasks_helper.rb +1 -0
- data/app/jobs/shipit/background_job.rb +4 -0
- data/app/jobs/shipit/background_job/unique.rb +4 -1
- data/app/jobs/shipit/cache_deploy_spec_job.rb +1 -0
- data/app/jobs/shipit/chunk_rollup_job.rb +4 -0
- data/app/jobs/shipit/clear_git_cache_job.rb +1 -0
- data/app/jobs/shipit/continuous_delivery_job.rb +3 -1
- data/app/jobs/shipit/create_on_github_job.rb +7 -1
- data/app/jobs/shipit/create_release_statuses_job.rb +1 -0
- data/app/jobs/shipit/deferred_touch_job.rb +4 -0
- data/app/jobs/shipit/deliver_hook_job.rb +1 -0
- data/app/jobs/shipit/destroy_job.rb +1 -0
- data/app/jobs/shipit/destroy_repository_job.rb +24 -0
- data/app/jobs/shipit/destroy_stack_job.rb +5 -4
- data/app/jobs/shipit/emit_event_job.rb +2 -1
- data/app/jobs/shipit/fetch_commit_stats_job.rb +1 -0
- data/app/jobs/shipit/fetch_deployed_revision_job.rb +1 -0
- data/app/jobs/shipit/github_sync_job.rb +2 -1
- data/app/jobs/shipit/{mark_deploy_healty_job.rb → mark_deploy_healthy_job.rb} +1 -0
- data/app/jobs/shipit/perform_commit_checks_job.rb +1 -0
- data/app/jobs/shipit/perform_task_job.rb +5 -90
- data/app/jobs/shipit/process_merge_requests_job.rb +32 -0
- data/app/jobs/shipit/purge_old_deliveries_job.rb +1 -0
- data/app/jobs/shipit/reap_dead_tasks_job.rb +21 -0
- data/app/jobs/shipit/refresh_check_runs_job.rb +1 -0
- data/app/jobs/shipit/refresh_github_user_job.rb +1 -0
- data/app/jobs/shipit/refresh_merge_request_job.rb +11 -0
- data/app/jobs/shipit/refresh_statuses_job.rb +1 -0
- data/app/jobs/shipit/setup_github_hook_job.rb +1 -0
- data/app/jobs/shipit/update_estimated_deploy_duration_job.rb +1 -0
- data/app/jobs/shipit/update_github_last_deployed_ref_job.rb +4 -3
- data/app/models/concerns/shipit/deferred_touch.rb +4 -3
- data/app/models/shipit/anonymous_user.rb +9 -0
- data/app/models/shipit/api_client.rb +3 -2
- data/app/models/shipit/application_record.rb +2 -1
- data/app/models/shipit/check_run.rb +5 -4
- data/app/models/shipit/command_line_user.rb +5 -0
- data/app/models/shipit/commit.rb +41 -22
- data/app/models/shipit/commit_checks.rb +2 -0
- data/app/models/shipit/commit_deployment.rb +17 -12
- data/app/models/shipit/commit_deployment_status.rb +8 -3
- data/app/models/shipit/commit_message.rb +1 -0
- data/app/models/shipit/delivery.rb +4 -3
- data/app/models/shipit/deploy.rb +41 -10
- data/app/models/shipit/deploy_spec.rb +38 -7
- data/app/models/shipit/deploy_spec/bundler_discovery.rb +2 -1
- data/app/models/shipit/deploy_spec/capistrano_discovery.rb +1 -0
- data/app/models/shipit/deploy_spec/file_system.rb +20 -7
- data/app/models/shipit/deploy_spec/kubernetes_discovery.rb +1 -0
- data/app/models/shipit/deploy_spec/lerna_discovery.rb +1 -0
- data/app/models/shipit/deploy_spec/npm_discovery.rb +5 -4
- data/app/models/shipit/deploy_spec/pypi_discovery.rb +1 -0
- data/app/models/shipit/deploy_spec/rubygems_discovery.rb +1 -0
- data/app/models/shipit/deploy_stats.rb +58 -0
- data/app/models/shipit/duration.rb +3 -2
- data/app/models/shipit/ephemeral_commit_checks.rb +1 -0
- data/app/models/shipit/github_hook.rb +2 -1
- data/app/models/shipit/github_status.rb +2 -1
- data/app/models/shipit/hook.rb +8 -5
- data/app/models/shipit/membership.rb +3 -2
- data/app/models/shipit/merge_request.rb +302 -0
- data/app/models/shipit/output_chunk.rb +7 -2
- data/app/models/shipit/provisioning_handler.rb +32 -0
- data/app/models/shipit/provisioning_handler/base.rb +30 -0
- data/app/models/shipit/provisioning_handler/unregistered_provisioning_handler.rb +35 -0
- data/app/models/shipit/pull_request.rb +27 -260
- data/app/models/shipit/pull_request_assignment.rb +10 -0
- data/app/models/shipit/record.rb +18 -0
- data/app/models/shipit/release_status.rb +3 -2
- data/app/models/shipit/repository.rb +97 -0
- data/app/models/shipit/review_stack.rb +116 -0
- data/app/models/shipit/review_stack_provisioning_queue.rb +39 -0
- data/app/models/shipit/rollback.rb +1 -0
- data/app/models/shipit/stack.rb +130 -57
- data/app/models/shipit/status.rb +3 -2
- data/app/models/shipit/status/common.rb +7 -6
- data/app/models/shipit/status/group.rb +1 -0
- data/app/models/shipit/status/missing.rb +2 -1
- data/app/models/shipit/status/unknown.rb +2 -1
- data/app/models/shipit/task.rb +118 -14
- data/app/models/shipit/task_definition.rb +1 -0
- data/app/models/shipit/task_execution_strategy/base.rb +20 -0
- data/app/models/shipit/task_execution_strategy/default.rb +110 -0
- data/app/models/shipit/team.rb +2 -1
- data/app/models/shipit/undeployed_commit.rb +1 -0
- data/app/models/shipit/unlimited_api_client.rb +1 -0
- data/app/models/shipit/user.rb +15 -8
- data/app/models/shipit/variable_definition.rb +1 -0
- data/app/models/shipit/webhooks.rb +43 -0
- data/app/models/shipit/webhooks/handlers/check_suite_handler.rb +20 -0
- data/app/models/shipit/webhooks/handlers/handler.rb +41 -0
- data/app/models/shipit/webhooks/handlers/membership_handler.rb +46 -0
- data/app/models/shipit/webhooks/handlers/pull_request/assigned_handler.rb +74 -0
- data/app/models/shipit/webhooks/handlers/pull_request/closed_handler.rb +68 -0
- data/app/models/shipit/webhooks/handlers/pull_request/edited_handler.rb +74 -0
- data/app/models/shipit/webhooks/handlers/pull_request/label_capturing_handler.rb +127 -0
- data/app/models/shipit/webhooks/handlers/pull_request/labeled_handler.rb +106 -0
- data/app/models/shipit/webhooks/handlers/pull_request/opened_handler.rb +83 -0
- data/app/models/shipit/webhooks/handlers/pull_request/reopened_handler.rb +88 -0
- data/app/models/shipit/webhooks/handlers/pull_request/review_stack_adapter.rb +103 -0
- data/app/models/shipit/webhooks/handlers/pull_request/unlabeled_handler.rb +107 -0
- data/app/models/shipit/webhooks/handlers/push_handler.rb +21 -0
- data/app/models/shipit/webhooks/handlers/status_handler.rb +27 -0
- data/app/serializers/concerns/shipit/conditional_attributes.rb +1 -0
- data/app/serializers/shipit/anonymous_user_serializer.rb +1 -0
- data/app/serializers/shipit/command_line_user_serializer.rb +1 -0
- data/app/serializers/shipit/commit_serializer.rb +1 -0
- data/app/serializers/shipit/deploy_serializer.rb +8 -1
- data/app/serializers/shipit/hook_serializer.rb +1 -0
- data/app/serializers/shipit/merge_request_serializer.rb +21 -0
- data/app/serializers/shipit/pull_request_serializer.rb +6 -8
- data/app/serializers/shipit/review_stack_serializer.rb +7 -0
- data/app/serializers/shipit/rollback_serializer.rb +1 -0
- data/app/serializers/shipit/short_commit_serializer.rb +1 -0
- data/app/serializers/shipit/stack_serializer.rb +12 -5
- data/app/serializers/shipit/tail_task_serializer.rb +11 -2
- data/app/serializers/shipit/task_serializer.rb +2 -17
- data/app/serializers/shipit/user_serializer.rb +6 -1
- data/app/validators/ascii_only_validator.rb +4 -3
- data/app/validators/subset_validator.rb +1 -0
- data/app/views/layouts/_head.html.erb +0 -0
- data/app/views/layouts/shipit.html.erb +5 -3
- data/app/views/shipit/_variables.html.erb +1 -1
- data/app/views/shipit/api_clients/index.html.erb +36 -0
- data/app/views/shipit/api_clients/new.html.erb +33 -0
- data/app/views/shipit/api_clients/show.html.erb +35 -0
- data/app/views/shipit/ccmenu/project.xml.builder +2 -1
- data/app/views/shipit/deploys/show.html.erb +2 -2
- data/app/views/shipit/merge_requests/_merge_request.html.erb +29 -0
- data/app/views/shipit/{pull_requests → merge_requests}/index.html.erb +2 -2
- data/app/views/shipit/merge_requests/merge_requests/_pull_request.html.erb +29 -0
- data/app/views/shipit/merge_requests/merge_requests/index.html.erb +20 -0
- data/app/views/shipit/merge_status/_merge_queue_button.html.erb +3 -3
- data/app/views/shipit/merge_status/backlogged.html.erb +1 -1
- data/app/views/shipit/merge_status/failure.html.erb +1 -1
- data/app/views/shipit/merge_status/locked.html.erb +1 -1
- data/app/views/shipit/merge_status/logged_out.erb +1 -1
- data/app/views/shipit/merge_status/success.html.erb +2 -2
- data/app/views/shipit/repositories/_header.html.erb +19 -0
- data/app/views/shipit/repositories/index.html.erb +31 -0
- data/app/views/shipit/repositories/new.html.erb +23 -0
- data/app/views/shipit/repositories/settings.html.erb +53 -0
- data/app/views/shipit/repositories/show.html.erb +30 -0
- data/app/views/shipit/stacks/_banners.html.erb +13 -0
- data/app/views/shipit/stacks/_header.html.erb +30 -12
- data/app/views/shipit/stacks/_links.html.erb +1 -0
- data/app/views/shipit/stacks/_stack.html.erb +8 -0
- data/app/views/shipit/stacks/all_tasks.html.erb +28 -0
- data/app/views/shipit/stacks/index.html.erb +9 -3
- data/app/views/shipit/stacks/settings.html.erb +22 -3
- data/app/views/shipit/stacks/show.html.erb +1 -1
- data/app/views/shipit/stacks/statistics.html.erb +82 -0
- data/app/views/shipit/tasks/_task_output.html.erb +1 -1
- data/app/views/shipit/tasks/show.html.erb +1 -1
- data/config/initializers/inflections.rb +2 -1
- data/config/locales/en.yml +18 -5
- data/config/routes.rb +29 -7
- data/db/migrate/20191209231045_create_shipit_repositories.rb +12 -0
- data/db/migrate/20191209231307_add_repository_reference_to_stacks.rb +15 -0
- data/db/migrate/20191216162728_backfill_repository_data.rb +22 -0
- data/db/migrate/20191216163010_remove_repository_information_from_stacks.rb +20 -0
- data/db/migrate/20191219205202_add_archived_since_to_stacks.rb +6 -0
- data/db/migrate/20200102175621_optional_task_commits.rb +6 -0
- data/db/migrate/20200109132519_add_sha_to_commit_deployments.rb +5 -0
- data/db/migrate/20200226211925_add_index_to_tasks_status.rb +5 -0
- data/db/migrate/20200427135152_add_pull_request_head_sha_to_commit.rb +5 -0
- data/db/migrate/20200615181558_add_rollback_once_aborted_to.rb +5 -0
- data/db/migrate/20200706145406_add_review_stacks.rb +12 -0
- data/db/migrate/20200804144639_rename_pull_request_to_merge_request.rb +7 -0
- data/db/migrate/20200804161512_rename_commits_pull_request_id_to_merge_request_id.rb +5 -0
- data/db/migrate/20200813134712_recreate_shipit_pull_requests.rb +22 -0
- data/db/migrate/20200813194056_create_pull_request_assignments.rb +8 -0
- data/db/migrate/20201001125502_add_provision_pr_stacks_flag_to_repositories.rb +7 -0
- data/db/migrate/20201008145809_add_retry_attempt_to_tasks.rb +5 -0
- data/db/migrate/20201008152744_add_max_retries_to_tasks.rb +5 -0
- data/lib/shipit.rb +23 -3
- data/lib/shipit/cast_value.rb +1 -0
- data/lib/shipit/command.rb +14 -18
- data/lib/shipit/commands.rb +5 -4
- data/lib/shipit/csv_serializer.rb +1 -0
- data/lib/shipit/deploy_commands.rb +1 -0
- data/lib/shipit/engine.rb +11 -2
- data/lib/shipit/environment_variables.rb +11 -1
- data/lib/shipit/first_parent_commits_iterator.rb +1 -0
- data/lib/shipit/flock.rb +1 -0
- data/lib/shipit/github_app.rb +41 -10
- data/lib/shipit/github_http_cache_middleware.rb +1 -0
- data/lib/shipit/null_serializer.rb +1 -0
- data/lib/shipit/octokit_check_runs.rb +3 -2
- data/lib/shipit/octokit_iterator.rb +3 -2
- data/lib/shipit/paginator.rb +3 -2
- data/lib/shipit/review_stack_commands.rb +8 -0
- data/lib/shipit/rollback_commands.rb +1 -0
- data/lib/shipit/same_site_cookie_middleware.rb +29 -0
- data/lib/shipit/simple_message_verifier.rb +1 -0
- data/lib/shipit/stack_commands.rb +12 -4
- data/lib/shipit/stat.rb +1 -0
- data/lib/shipit/task_commands.rb +23 -14
- data/lib/shipit/version.rb +2 -1
- data/lib/snippets/release-gem +5 -1
- data/lib/tasks/cron.rake +13 -2
- data/lib/tasks/dev.rake +3 -2
- data/lib/tasks/shipit.rake +16 -17
- data/lib/tasks/teams.rake +1 -0
- data/test/controllers/api/base_controller_test.rb +3 -2
- data/test/controllers/api/ccmenu_controller_test.rb +9 -8
- data/test/controllers/api/commits_controller_test.rb +3 -2
- data/test/controllers/api/deploys_controller_test.rb +15 -14
- data/test/controllers/api/hooks_controller_test.rb +8 -7
- data/test/controllers/api/locks_controller_test.rb +7 -6
- data/test/controllers/api/{pull_requests_controller_test.rb → merge_requests_controller_test.rb} +17 -16
- data/test/controllers/api/outputs_controller_test.rb +4 -2
- data/test/controllers/api/release_statuses_controller_test.rb +2 -1
- data/test/controllers/api/rollback_controller_test.rb +113 -0
- data/test/controllers/api/stacks_controller_test.rb +65 -16
- data/test/controllers/api/tasks_controller_test.rb +13 -12
- data/test/controllers/api_clients_controller_test.rb +104 -0
- data/test/controllers/ccmenu_controller_test.rb +4 -3
- data/test/controllers/commit_checks_controller_test.rb +4 -3
- data/test/controllers/commits_controller_test.rb +3 -2
- data/test/controllers/deploys_controller_test.rb +33 -22
- data/test/controllers/github_authentication_controller_test.rb +1 -0
- data/test/controllers/merge_requests_controller_test.rb +32 -0
- data/test/controllers/merge_status_controller_test.rb +27 -9
- data/test/controllers/release_statuses_controller_test.rb +3 -2
- data/test/controllers/repositories_controller_test.rb +71 -0
- data/test/controllers/rollbacks_controller_test.rb +9 -8
- data/test/controllers/stacks_controller_test.rb +72 -15
- data/test/controllers/status_controller_test.rb +1 -0
- data/test/controllers/tasks_controller_test.rb +33 -20
- data/test/controllers/webhooks_controller_test.rb +36 -9
- data/test/dummy/config/application.rb +7 -2
- data/test/dummy/config/environments/development.rb +23 -6
- data/test/dummy/config/environments/test.rb +2 -5
- data/test/dummy/db/schema.rb +76 -24
- data/test/dummy/db/seeds.rb +30 -16
- data/test/fixtures/payloads/check_suite_master.json +2 -2
- data/test/fixtures/payloads/invalid_pull_request.json +117 -0
- data/test/fixtures/payloads/provision_disabled_pull_request.json +454 -0
- data/test/fixtures/payloads/pull_request_assigned.json +480 -0
- data/test/fixtures/payloads/pull_request_closed.json +454 -0
- data/test/fixtures/payloads/pull_request_labeled.json +461 -0
- data/test/fixtures/payloads/pull_request_opened.json +454 -0
- data/test/fixtures/payloads/pull_request_reopened.json +454 -0
- data/test/fixtures/payloads/pull_request_unlabeled.json +454 -0
- data/test/fixtures/payloads/pull_request_with_no_repo.json +454 -0
- data/test/fixtures/shipit/commit_deployment_statuses.yml +4 -4
- data/test/fixtures/shipit/commit_deployments.yml +8 -8
- data/test/fixtures/shipit/commits.yml +52 -1
- data/test/fixtures/shipit/merge_requests.yml +141 -0
- data/test/fixtures/shipit/pull_request_assignments.yml +3 -0
- data/test/fixtures/shipit/pull_requests.yml +10 -131
- data/test/fixtures/shipit/repositories.yml +28 -0
- data/test/fixtures/shipit/stacks.yml +335 -30
- data/test/fixtures/shipit/statuses.yml +9 -0
- data/test/fixtures/shipit/tasks.yml +69 -3
- data/test/fixtures/shipit/users.yml +7 -0
- data/test/fixtures/timeout +2 -1
- data/test/helpers/api_helper.rb +1 -0
- data/test/helpers/fixture_aliases_helper.rb +1 -0
- data/test/helpers/hooks_helper.rb +2 -1
- data/test/helpers/json_helper.rb +15 -11
- data/test/helpers/links_helper.rb +4 -3
- data/test/helpers/payloads_helper.rb +5 -0
- data/test/helpers/queries_helper.rb +3 -2
- data/test/jobs/cache_deploy_spec_job_test.rb +2 -1
- data/test/jobs/chunk_rollup_job_test.rb +16 -1
- data/test/jobs/deliver_hook_job_test.rb +1 -0
- data/test/jobs/destroy_repository_job_test.rb +27 -0
- data/test/jobs/destroy_stack_job_test.rb +10 -0
- data/test/jobs/emit_event_job_test.rb +2 -1
- data/test/jobs/fetch_commit_stats_job_test.rb +1 -0
- data/test/jobs/fetch_deployed_revision_job_test.rb +1 -0
- data/test/jobs/github_sync_job_test.rb +1 -0
- data/test/jobs/mark_deploy_healthy_job_test.rb +1 -0
- data/test/jobs/perform_task_job_test.rb +12 -11
- data/test/jobs/{merge_pull_requests_job_test.rb → process_merge_requests_job_test.rb} +19 -18
- data/test/jobs/purge_old_deliveries_job_test.rb +1 -0
- data/test/jobs/reap_dead_tasks_job_test.rb +68 -0
- data/test/jobs/refresh_github_user_job_test.rb +1 -0
- data/test/jobs/refresh_status_job_test.rb +1 -0
- data/test/jobs/unique_job_test.rb +1 -0
- data/test/jobs/update_github_last_deployed_ref_job_test.rb +1 -0
- data/test/lib/shipit/deploy_commands_test.rb +16 -0
- data/test/lib/shipit/task_commands_test.rb +17 -0
- data/test/middleware/same_site_cookie_middleware_test.rb +52 -0
- data/test/models/api_client_test.rb +1 -0
- data/test/models/commit_checks_test.rb +1 -0
- data/test/models/commit_deployment_status_test.rb +34 -4
- data/test/models/commit_deployment_test.rb +9 -11
- data/test/models/commits_test.rb +116 -21
- data/test/models/delivery_test.rb +2 -1
- data/test/models/deploy_spec_test.rb +103 -65
- data/test/models/deploy_stats_test.rb +113 -0
- data/test/models/deploys_test.rb +207 -26
- data/test/models/duration_test.rb +1 -0
- data/test/models/github_hook_test.rb +1 -0
- data/test/models/hook_test.rb +20 -16
- data/test/models/membership_test.rb +1 -0
- data/test/models/{pull_request_test.rb → merge_request_test.rb} +48 -41
- data/test/models/pull_request_assignment_test.rb +16 -0
- data/test/models/release_statuses_test.rb +1 -0
- data/test/models/rollbacks_test.rb +1 -0
- data/test/models/shipit/check_run_test.rb +1 -0
- data/test/models/shipit/provisioning_handler/base_test.rb +33 -0
- data/test/models/shipit/provisioning_handler/unregistered_provisioning_handler_test.rb +49 -0
- data/test/models/shipit/provisioning_handler_test.rb +64 -0
- data/test/models/shipit/pull_request_test.rb +52 -0
- data/test/models/shipit/repository_test.rb +81 -0
- data/test/models/shipit/review_stack_provision_status_test.rb +77 -0
- data/test/models/shipit/review_stack_provisioning_queue_test.rb +63 -0
- data/test/models/shipit/review_stack_test.rb +59 -0
- data/test/models/{stacks_test.rb → shipit/stacks_test.rb} +120 -60
- data/test/models/shipit/webhooks/handlers/pull_request/assigned_handler_test.rb +45 -0
- data/test/models/shipit/webhooks/handlers/pull_request/closed_handler_test.rb +192 -0
- data/test/models/shipit/webhooks/handlers/pull_request/edited_handler_test.rb +47 -0
- data/test/models/shipit/webhooks/handlers/pull_request/label_capturing_handler_test.rb +209 -0
- data/test/models/shipit/webhooks/handlers/pull_request/labeled_handler_test.rb +332 -0
- data/test/models/shipit/webhooks/handlers/pull_request/opened_handler_test.rb +238 -0
- data/test/models/shipit/webhooks/handlers/pull_request/reopened_handler_test.rb +282 -0
- data/test/models/shipit/webhooks/handlers/pull_request/review_stack_adapter_test.rb +83 -0
- data/test/models/shipit/webhooks/handlers/pull_request/unlabeled_handler_test.rb +324 -0
- data/test/models/shipit/webhooks/handlers_test.rb +27 -0
- data/test/models/status/group_test.rb +1 -0
- data/test/models/status/missing_test.rb +1 -0
- data/test/models/status_test.rb +1 -0
- data/test/models/task_definitions_test.rb +9 -8
- data/test/models/tasks_test.rb +59 -1
- data/test/models/team_test.rb +4 -2
- data/test/models/undeployed_commits_test.rb +14 -0
- data/test/models/users_test.rb +13 -5
- data/test/serializers/shipit/pull_request_serializer_test.rb +29 -0
- data/test/test_command_integration.rb +3 -2
- data/test/test_helper.rb +37 -32
- data/test/unit/anonymous_user_serializer_test.rb +14 -0
- data/test/unit/command_test.rb +15 -10
- data/test/unit/commands_test.rb +1 -0
- data/test/unit/commit_serializer_test.rb +16 -0
- data/test/unit/csv_serializer_test.rb +3 -2
- data/test/unit/deploy_commands_test.rb +14 -4
- data/test/unit/deploy_serializer_test.rb +17 -0
- data/test/unit/environment_variables_test.rb +5 -4
- data/test/unit/github_app_test.rb +137 -0
- data/test/unit/github_url_helper_test.rb +6 -0
- data/test/unit/rollback_commands_test.rb +2 -1
- data/test/unit/shipit_helper_test.rb +17 -0
- data/test/unit/shipit_task_execution_strategy_test.rb +47 -0
- data/test/unit/shipit_test.rb +1 -0
- data/test/unit/user_serializer_test.rb +14 -0
- data/test/unit/variable_definition_test.rb +1 -0
- metadata +334 -169
- data/app/controllers/shipit/api/pull_requests_controller.rb +0 -36
- data/app/controllers/shipit/pull_requests_controller.rb +0 -30
- data/app/jobs/shipit/merge_pull_requests_job.rb +0 -31
- data/app/jobs/shipit/refresh_pull_request_job.rb +0 -10
- data/app/views/shipit/pull_requests/_pull_request.html.erb +0 -29
- data/test/controllers/pull_requests_controller_test.rb +0 -31
- data/test/fixtures/shipit/output_chunks.yml +0 -47
- data/test/models/output_chunk_test.rb +0 -20
@@ -1,24 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
require 'test_helper'
|
2
3
|
|
3
4
|
module Shipit
|
4
|
-
class
|
5
|
+
class MergeRequestTest < ActiveSupport::TestCase
|
5
6
|
setup do
|
6
7
|
@stack = shipit_stacks(:shipit)
|
7
|
-
@pr =
|
8
|
+
@pr = shipit_merge_requests(:shipit_pending)
|
8
9
|
@user = shipit_users(:walrus)
|
9
10
|
end
|
10
11
|
|
11
12
|
test ".request_merge! creates a record and schedule a refresh" do
|
12
|
-
|
13
|
-
assert_enqueued_with(job:
|
14
|
-
|
13
|
+
merge_request = nil
|
14
|
+
assert_enqueued_with(job: RefreshMergeRequestJob) do
|
15
|
+
merge_request = MergeRequest.request_merge!(@stack, 64, @user)
|
15
16
|
end
|
16
|
-
assert_predicate
|
17
|
+
assert_predicate merge_request, :persisted?
|
17
18
|
end
|
18
19
|
|
19
20
|
test ".request_merge! only track pull requests once" do
|
20
|
-
assert_difference -> {
|
21
|
-
5.times {
|
21
|
+
assert_difference -> { MergeRequest.count }, +1 do
|
22
|
+
5.times { MergeRequest.request_merge!(@stack, 999, @user) }
|
22
23
|
end
|
23
24
|
end
|
24
25
|
|
@@ -26,7 +27,7 @@ module Shipit
|
|
26
27
|
original_merge_requested_at = @pr.merge_requested_at
|
27
28
|
@pr.cancel!
|
28
29
|
assert_predicate @pr, :canceled?
|
29
|
-
|
30
|
+
MergeRequest.request_merge!(@stack, @pr.number, @user)
|
30
31
|
assert_predicate @pr.reload, :pending?
|
31
32
|
assert_not_equal original_merge_requested_at, @pr.merge_requested_at
|
32
33
|
assert_in_delta Time.now.utc, @pr.merge_requested_at, 2
|
@@ -36,7 +37,7 @@ module Shipit
|
|
36
37
|
original_merge_requested_at = @pr.merge_requested_at
|
37
38
|
@pr.reject!('merge_conflict')
|
38
39
|
assert_predicate @pr, :rejected?
|
39
|
-
|
40
|
+
MergeRequest.request_merge!(@stack, @pr.number, @user)
|
40
41
|
assert_predicate @pr.reload, :pending?
|
41
42
|
assert_not_equal original_merge_requested_at, @pr.merge_requested_at
|
42
43
|
assert_in_delta Time.now.utc, @pr.merge_requested_at, 2
|
@@ -47,29 +48,29 @@ module Shipit
|
|
47
48
|
original_merge_requested_at = @pr.merge_requested_at
|
48
49
|
@pr.revalidate!
|
49
50
|
assert_predicate @pr, :revalidating?
|
50
|
-
|
51
|
+
MergeRequest.request_merge!(@stack, @pr.number, @user)
|
51
52
|
assert_predicate @pr.reload, :pending?
|
52
53
|
assert_equal original_merge_requested_at, @pr.merge_requested_at
|
53
54
|
end
|
54
55
|
|
55
56
|
test ".extract_number can get a pull request number from different formats" do
|
56
|
-
assert_equal 42,
|
57
|
-
assert_equal 42,
|
58
|
-
assert_equal 42,
|
57
|
+
assert_equal 42, MergeRequest.extract_number(@stack, '42')
|
58
|
+
assert_equal 42, MergeRequest.extract_number(@stack, '#42')
|
59
|
+
assert_equal 42, MergeRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
|
59
60
|
|
60
|
-
assert_nil
|
61
|
+
assert_nil MergeRequest.extract_number(@stack, 'https://github.com/ACME/shipit-engine/pull/42')
|
61
62
|
|
62
63
|
Shipit.github.expects(:domain).returns('github.acme.com').at_least_once
|
63
|
-
assert_equal 42,
|
64
|
-
assert_nil
|
64
|
+
assert_equal 42, MergeRequest.extract_number(@stack, 'https://github.acme.com/Shopify/shipit-engine/pull/42')
|
65
|
+
assert_nil MergeRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
|
65
66
|
end
|
66
67
|
|
67
68
|
test "refresh! pulls state from GitHub" do
|
68
|
-
|
69
|
+
merge_request = shipit_merge_requests(:shipit_fetching)
|
69
70
|
|
70
71
|
head_sha = '64b3833d39def7ec65b57b42f496eb27ab4980b6'
|
71
72
|
base_sha = 'ba7ab50e02286f7d6c60c1ef75258133dd9ea763'
|
72
|
-
Shipit.github.api.expects(:pull_request).with(@stack.github_repo_name,
|
73
|
+
Shipit.github.api.expects(:pull_request).with(@stack.github_repo_name, merge_request.number).returns(
|
73
74
|
stub(
|
74
75
|
id: 4_857_578,
|
75
76
|
url: 'https://api.github.com/repos/Shopify/shipit-engine/pulls/64',
|
@@ -116,7 +117,7 @@ module Shipit
|
|
116
117
|
)
|
117
118
|
end
|
118
119
|
|
119
|
-
Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, head_sha).returns([stub(
|
120
|
+
Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, head_sha, per_page: 100).returns([stub(
|
120
121
|
state: 'success',
|
121
122
|
description: nil,
|
122
123
|
context: 'default',
|
@@ -124,15 +125,15 @@ module Shipit
|
|
124
125
|
created_at: 1.day.ago,
|
125
126
|
)])
|
126
127
|
|
127
|
-
|
128
|
+
merge_request.refresh!
|
128
129
|
|
129
|
-
assert_predicate
|
130
|
-
assert_predicate
|
131
|
-
assert_equal 'super-branch',
|
130
|
+
assert_predicate merge_request, :mergeable?
|
131
|
+
assert_predicate merge_request, :pending?
|
132
|
+
assert_equal 'super-branch', merge_request.branch
|
132
133
|
|
133
|
-
assert_not_nil
|
134
|
-
assert_predicate
|
135
|
-
assert_predicate
|
134
|
+
assert_not_nil merge_request.head
|
135
|
+
assert_predicate merge_request.head, :detached?
|
136
|
+
assert_predicate merge_request.head, :success?
|
136
137
|
end
|
137
138
|
|
138
139
|
test "#reject! records the reason" do
|
@@ -183,23 +184,29 @@ module Shipit
|
|
183
184
|
refute_predicate @pr, :rejected?
|
184
185
|
end
|
185
186
|
|
186
|
-
test "#reject_unless_mergeable! reject the PR if it has a missing CI status" do
|
187
|
+
test "#reject_unless_mergeable! reject the PR if it has a missing required CI status" do
|
188
|
+
@pr.stack.cached_deploy_spec.stubs(:required_statuses).returns(['ci/circle'])
|
187
189
|
@pr.head.statuses.where(context: 'ci/circle').delete_all
|
188
190
|
|
189
|
-
|
191
|
+
refute_predicate @pr, :all_status_checks_passed?
|
190
192
|
refute_predicate @pr, :any_status_checks_failed?
|
191
|
-
|
192
|
-
|
193
|
+
assert_predicate @pr, :any_status_checks_missing?
|
194
|
+
assert_equal true, @pr.reject_unless_mergeable!
|
195
|
+
assert_predicate @pr, :rejected?
|
196
|
+
assert_equal 'ci_missing', @pr.rejection_reason
|
193
197
|
end
|
194
198
|
|
195
199
|
test "#reject_unless_mergeable! reject the PR if it has a missing CI status (multi-status)" do
|
200
|
+
@pr.stack.cached_deploy_spec.stubs(:required_statuses).returns(['ci/circle'])
|
196
201
|
@pr.head.statuses.where(context: 'ci/circle').delete_all
|
197
202
|
@pr.head.statuses.create!(stack: @pr.stack, state: 'success', context: 'ci/travis')
|
198
203
|
|
199
|
-
|
204
|
+
refute_predicate @pr, :all_status_checks_passed?
|
200
205
|
refute_predicate @pr, :any_status_checks_failed?
|
201
|
-
|
202
|
-
|
206
|
+
assert_predicate @pr, :any_status_checks_missing?
|
207
|
+
assert_equal true, @pr.reject_unless_mergeable!
|
208
|
+
assert_predicate @pr, :rejected?
|
209
|
+
assert_equal 'ci_missing', @pr.rejection_reason
|
203
210
|
end
|
204
211
|
|
205
212
|
test "#reject_unless_mergeable! rejects the PR if it is stale" do
|
@@ -209,11 +216,11 @@ module Shipit
|
|
209
216
|
assert_equal 'requires_rebase', @pr.rejection_reason
|
210
217
|
end
|
211
218
|
|
212
|
-
test "#merge! raises a
|
219
|
+
test "#merge! raises a MergeRequest::NotReady if the PR isn't mergeable yet" do
|
213
220
|
@pr.update!(mergeable: nil)
|
214
221
|
|
215
222
|
assert_predicate @pr, :not_mergeable_yet?
|
216
|
-
assert_raises
|
223
|
+
assert_raises MergeRequest::NotReady do
|
217
224
|
@pr.merge!
|
218
225
|
end
|
219
226
|
@pr.reload
|
@@ -227,8 +234,8 @@ module Shipit
|
|
227
234
|
params = job.arguments.first
|
228
235
|
assert_equal 'merge', params[:event]
|
229
236
|
assert_json 'status', 'rejected', document: params[:payload]
|
230
|
-
assert_json '
|
231
|
-
assert_json '
|
237
|
+
assert_json 'merge_request.rejection_reason', 'merge_conflict', document: params[:payload]
|
238
|
+
assert_json 'merge_request.number', @pr.number, document: params[:payload]
|
232
239
|
end
|
233
240
|
|
234
241
|
test "#merge! doesnt delete the branch if there are open PRs against it" do
|
@@ -265,7 +272,7 @@ module Shipit
|
|
265
272
|
behind_by: 10,
|
266
273
|
),
|
267
274
|
)
|
268
|
-
spec = {'merge' => {'max_divergence' => {'commits' => 1}}}
|
275
|
+
spec = { 'merge' => { 'max_divergence' => { 'commits' => 1 } } }
|
269
276
|
@pr.stack.cached_deploy_spec = DeploySpec.new(spec)
|
270
277
|
assert_predicate @pr, :stale?
|
271
278
|
end
|
@@ -273,14 +280,14 @@ module Shipit
|
|
273
280
|
test "#stale? returns true when the branch falls behind the maximum age" do
|
274
281
|
@pr.base_commit = shipit_commits(:second)
|
275
282
|
@pr.head.committed_at = 2.hours.ago
|
276
|
-
spec = {'merge' => {'max_divergence' => {'age' => '1h'}}}
|
283
|
+
spec = { 'merge' => { 'max_divergence' => { 'age' => '1h' } } }
|
277
284
|
@pr.stack.cached_deploy_spec = DeploySpec.new(spec)
|
278
285
|
assert_predicate @pr, :stale?
|
279
286
|
end
|
280
287
|
|
281
288
|
test "#stale? is false when base_commit information is missing" do
|
282
289
|
@pr.base_commit = nil
|
283
|
-
spec = {'merge' => {'max_divergence' => {'age' => '1h', 'commits' => 10}}}
|
290
|
+
spec = { 'merge' => { 'max_divergence' => { 'age' => '1h', 'commits' => 10 } } }
|
284
291
|
@pr.stack.cached_deploy_spec = DeploySpec.new(spec)
|
285
292
|
refute_predicate @pr, :stale?
|
286
293
|
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'test_helper'
|
4
|
+
|
5
|
+
module Shipit
|
6
|
+
class PullRequestAssignmentTest < ActiveSupport::TestCase
|
7
|
+
setup do
|
8
|
+
@assignment = shipit_pull_request_assignments(:walrus_shopify_developers)
|
9
|
+
end
|
10
|
+
|
11
|
+
test "no duplicates are accepted" do
|
12
|
+
assignment = PullRequestAssignment.new(user: @assignment.user, pull_request: @assignment.pull_request)
|
13
|
+
refute assignment.valid?
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'test_helper'
|
4
|
+
|
5
|
+
module Shipit
|
6
|
+
module ProvisioningHandler
|
7
|
+
class BaseTest < ActiveSupport::TestCase
|
8
|
+
test "provides a default #up handler" do
|
9
|
+
assert(
|
10
|
+
handler.respond_to?(:up),
|
11
|
+
"expected #{handler.class.name} to provide a default #up handler"
|
12
|
+
)
|
13
|
+
end
|
14
|
+
|
15
|
+
test "provides a default #down handler" do
|
16
|
+
assert(
|
17
|
+
handler.respond_to?(:down),
|
18
|
+
"expected #{handler.class.name} to provide a default #down handler"
|
19
|
+
)
|
20
|
+
end
|
21
|
+
|
22
|
+
test "provides a default #provision? handler" do
|
23
|
+
assert_equal true, handler.provision?
|
24
|
+
end
|
25
|
+
|
26
|
+
private
|
27
|
+
|
28
|
+
def handler
|
29
|
+
ProvisioningHandler::Base.new(mock("Stack"))
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'test_helper'
|
4
|
+
|
5
|
+
module Shipit
|
6
|
+
module ProvisioningHandler
|
7
|
+
class UnregisteredProvisioningHandlerTest < ActiveSupport::TestCase
|
8
|
+
test "#up stops transitions" do
|
9
|
+
stack = shipit_stacks(:shipit)
|
10
|
+
stack.update(provision_status: :deprovisioned)
|
11
|
+
|
12
|
+
assert_throws :halt do
|
13
|
+
UnregisteredProvisioningHandler.new(stack).up
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
test "#up locks the stack" do
|
18
|
+
stack = shipit_stacks(:shipit)
|
19
|
+
stack.update(provision_status: :deprovisioned)
|
20
|
+
|
21
|
+
assert_changes -> { stack.locked? }, from: false, to: true do
|
22
|
+
catch :halt do
|
23
|
+
UnregisteredProvisioningHandler.new(stack).up
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
test "#down stops transitions" do
|
29
|
+
stack = shipit_stacks(:shipit)
|
30
|
+
stack.update(provision_status: :deprovisioned)
|
31
|
+
|
32
|
+
assert_throws :halt do
|
33
|
+
UnregisteredProvisioningHandler.new(stack).down
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
test "#down prevents transitions" do
|
38
|
+
stack = shipit_stacks(:shipit)
|
39
|
+
stack.update(provision_status: :deprovisioned)
|
40
|
+
|
41
|
+
assert_changes -> { stack.locked? }, from: false, to: true do
|
42
|
+
catch :halt do
|
43
|
+
UnregisteredProvisioningHandler.new(stack).down
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -0,0 +1,64 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'test_helper'
|
4
|
+
|
5
|
+
module Shipit
|
6
|
+
class StackProvisioningHandlerTest < ActiveSupport::TestCase
|
7
|
+
teardown do
|
8
|
+
Shipit::ProvisioningHandler.reset_registry!
|
9
|
+
end
|
10
|
+
|
11
|
+
test "uses the no-op handler as default when no default handler is registered" do
|
12
|
+
assert_equal Shipit::ProvisioningHandler::Base, Shipit::ProvisioningHandler.default
|
13
|
+
end
|
14
|
+
|
15
|
+
test "allows registration of a default handler" do
|
16
|
+
mock_handler = mock("Mock Provisioning Handler")
|
17
|
+
|
18
|
+
Shipit::ProvisioningHandler.default = mock_handler
|
19
|
+
|
20
|
+
assert_equal mock_handler, Shipit::ProvisioningHandler.default
|
21
|
+
end
|
22
|
+
|
23
|
+
test "UnregisteredProvisioningHandler is returned when an attempt to fetch an unregistered handler is made" do
|
24
|
+
unregistered_handler = mock("Mock Provisioning Handler")
|
25
|
+
|
26
|
+
assert_equal(
|
27
|
+
Shipit::ProvisioningHandler::UnregisteredProvisioningHandler,
|
28
|
+
Shipit::ProvisioningHandler.fetch(unregistered_handler)
|
29
|
+
)
|
30
|
+
end
|
31
|
+
|
32
|
+
test "registers handlers so they become fetchable" do
|
33
|
+
mock_handler = mock("Mock Provisioning Handler")
|
34
|
+
|
35
|
+
Shipit::ProvisioningHandler.register(mock_handler)
|
36
|
+
|
37
|
+
assert_equal mock_handler, Shipit::ProvisioningHandler.fetch(mock_handler.to_s)
|
38
|
+
end
|
39
|
+
|
40
|
+
test "handlers are called during provisioning" do
|
41
|
+
stack = shipit_stacks(:review_stack)
|
42
|
+
stack.update(
|
43
|
+
provision_status: :deprovisioned
|
44
|
+
)
|
45
|
+
handler = Shipit::ProvisioningHandler.default
|
46
|
+
|
47
|
+
handler.any_instance.expects(:up)
|
48
|
+
|
49
|
+
assert stack.provision!, "stack should have provisioned."
|
50
|
+
end
|
51
|
+
|
52
|
+
test "handlers are called during deprovisioning" do
|
53
|
+
stack = shipit_stacks(:review_stack)
|
54
|
+
stack.update(
|
55
|
+
provision_status: :provisioned
|
56
|
+
)
|
57
|
+
handler = Shipit::ProvisioningHandler.default
|
58
|
+
|
59
|
+
handler.any_instance.expects(:down)
|
60
|
+
|
61
|
+
assert stack.deprovision!, "stack should have deprovisioned."
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -0,0 +1,52 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "test_helper"
|
4
|
+
|
5
|
+
module Shipit
|
6
|
+
class PullRequestTest < ActiveSupport::TestCase
|
7
|
+
test "github_pull_request= parses into a a Shipit::PullRequest" do
|
8
|
+
github_pull_request = resource(
|
9
|
+
{
|
10
|
+
url: "https://api.github.com/repos/Codertocat/Hello-World/pulls/2",
|
11
|
+
id: 279147437,
|
12
|
+
number: 2,
|
13
|
+
state: "open",
|
14
|
+
additions: 100,
|
15
|
+
deletions: 101,
|
16
|
+
title: "Update the README with new information.",
|
17
|
+
head: {
|
18
|
+
sha: "ec26c3e57ca3a959ca5aad62de7213c562f8c821",
|
19
|
+
},
|
20
|
+
user: {
|
21
|
+
login: "Codertocat",
|
22
|
+
},
|
23
|
+
assignees: [
|
24
|
+
{
|
25
|
+
login: "bob",
|
26
|
+
},
|
27
|
+
],
|
28
|
+
labels: [
|
29
|
+
{
|
30
|
+
name: "deploy",
|
31
|
+
},
|
32
|
+
],
|
33
|
+
}
|
34
|
+
)
|
35
|
+
stack = shipit_stacks(:review_stack)
|
36
|
+
pull_request = stack.pull_request
|
37
|
+
|
38
|
+
stack.pull_request.github_pull_request = github_pull_request
|
39
|
+
|
40
|
+
assert_equal 279147437, pull_request.github_id
|
41
|
+
assert_equal 2, pull_request.number
|
42
|
+
assert_equal "https://api.github.com/repos/Codertocat/Hello-World/pulls/2", pull_request.api_url
|
43
|
+
assert_equal "Update the README with new information.", pull_request.title
|
44
|
+
assert_equal "open", pull_request.state
|
45
|
+
assert_equal 100, pull_request.additions
|
46
|
+
assert_equal 101, pull_request.deletions
|
47
|
+
assert_equal shipit_users(:codertocat), pull_request.user
|
48
|
+
assert_equal [shipit_users(:bob)], pull_request.assignees
|
49
|
+
assert_equal ["deploy"], pull_request.labels
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|