From db90a0f7e36108df2c57f28bf84b733faceb6ee2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 23 Aug 2022 12:13:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../support/helpers/create_environments_helpers.rb | 4 +- spec/support/helpers/kubernetes_helpers.rb | 2 +- .../migrations_helpers/work_item_types_helper.rb | 8 +- spec/support/helpers/seed_helper.rb | 4 +- spec/support/helpers/stub_object_storage.rb | 4 +- spec/support/helpers/test_env.rb | 162 ++++++++++----------- spec/support/helpers/usage_data_helpers.rb | 34 ++--- .../vulnerabilities_findings_helper.rb | 8 +- .../bulk_imports_requests_shared_context.rb | 18 +-- .../design_management_shared_contexts.rb | 18 +-- .../merge_requests_finder_shared_contexts.rb | 22 +-- .../finders/issues_finder_shared_examples.rb | 2 +- .../graphql/members_shared_examples.rb | 4 +- .../filters/sanitization_filter_shared_examples.rb | 26 ++-- .../background_migration_job_shared_examples.rb | 4 +- .../requests/api/conan_packages_shared_examples.rb | 14 +- ...up_and_project_packages_list_shared_examples.rb | 7 +- .../routing/resource_routing_shared_examples.rb | 12 +- .../routing/wiki_routing_shared_examples.rb | 6 +- ...tainer_registry_auth_service_shared_examples.rb | 4 +- 20 files changed, 182 insertions(+), 181 deletions(-) (limited to 'spec/support') diff --git a/spec/support/helpers/create_environments_helpers.rb b/spec/support/helpers/create_environments_helpers.rb index be105f5862b..361d365dc5b 100644 --- a/spec/support/helpers/create_environments_helpers.rb +++ b/spec/support/helpers/create_environments_helpers.rb @@ -7,7 +7,7 @@ module CreateEnvironmentsHelpers start_review = create(:ci_build, :start_review_app, :success, **common, pipeline: pipeline) stop_review = create(:ci_build, :stop_review_app, :manual, **common, pipeline: pipeline) environment = create(:environment, :auto_stoppable, project: project, name: ref) - create(:deployment, :success, **common, on_stop: stop_review.name, - deployable: start_review, environment: environment) + create(:deployment, :success, **common, + on_stop: stop_review.name, deployable: start_review, environment: environment) end end diff --git a/spec/support/helpers/kubernetes_helpers.rb b/spec/support/helpers/kubernetes_helpers.rb index dd210f02ae7..912e7d24b25 100644 --- a/spec/support/helpers/kubernetes_helpers.rb +++ b/spec/support/helpers/kubernetes_helpers.rb @@ -880,7 +880,7 @@ module KubernetesHelpers containers.map do |container| terminal = { selectors: { pod: pod_name, container: container['name'] }, - url: container_exec_url(service.api_url, pod_namespace, pod_name, container['name']), + url: container_exec_url(service.api_url, pod_namespace, pod_name, container['name']), subprotocols: ['channel.k8s.io'], headers: { 'Authorization' => ["Bearer #{service.token}"] }, created_at: DateTime.parse(pod['metadata']['creationTimestamp']), diff --git a/spec/support/helpers/migrations_helpers/work_item_types_helper.rb b/spec/support/helpers/migrations_helpers/work_item_types_helper.rb index 59b1f1b1305..b05caf265ee 100644 --- a/spec/support/helpers/migrations_helpers/work_item_types_helper.rb +++ b/spec/support/helpers/migrations_helpers/work_item_types_helper.rb @@ -3,11 +3,11 @@ module MigrationHelpers module WorkItemTypesHelper DEFAULT_WORK_ITEM_TYPES = { - issue: { name: 'Issue', icon_name: 'issue-type-issue', enum_value: 0 }, - incident: { name: 'Incident', icon_name: 'issue-type-incident', enum_value: 1 }, - test_case: { name: 'Test Case', icon_name: 'issue-type-test-case', enum_value: 2 }, + issue: { name: 'Issue', icon_name: 'issue-type-issue', enum_value: 0 }, + incident: { name: 'Incident', icon_name: 'issue-type-incident', enum_value: 1 }, + test_case: { name: 'Test Case', icon_name: 'issue-type-test-case', enum_value: 2 }, requirement: { name: 'Requirement', icon_name: 'issue-type-requirements', enum_value: 3 }, - task: { name: 'Task', icon_name: 'issue-type-task', enum_value: 4 } + task: { name: 'Task', icon_name: 'issue-type-task', enum_value: 4 } }.freeze def reset_work_item_types diff --git a/spec/support/helpers/seed_helper.rb b/spec/support/helpers/seed_helper.rb index 59723583cbc..9628762d46a 100644 --- a/spec/support/helpers/seed_helper.rb +++ b/spec/support/helpers/seed_helper.rb @@ -29,8 +29,8 @@ module SeedHelper def create_bare_seeds system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{GITLAB_GIT_TEST_REPO_URL}), chdir: SEED_STORAGE_PATH, - out: '/dev/null', - err: '/dev/null') + out: '/dev/null', + err: '/dev/null') end def create_normal_seeds diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index 024f06cae1b..661c1c683b0 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -3,8 +3,8 @@ module StubObjectStorage def stub_dependency_proxy_object_storage(**params) stub_object_storage_uploader(config: ::Gitlab.config.dependency_proxy.object_store, - uploader: ::DependencyProxy::FileUploader, - **params) + uploader: ::DependencyProxy::FileUploader, + **params) end def stub_object_storage_uploader( diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 03e9ad1a08e..6f9027ea79a 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -10,85 +10,85 @@ module TestEnv # When developing the seed repository, comment out the branch you will modify. BRANCH_SHA = { - 'signed-commits' => 'c7794c1', - 'not-merged-branch' => 'b83d6e3', - 'branch-merged' => '498214d', - 'empty-branch' => '7efb185', - 'ends-with.json' => '98b0d8b', - 'flatten-dir' => 'e56497b', - 'feature' => '0b4bc9a', - 'feature_conflict' => 'bb5206f', - 'fix' => '48f0be4', - 'improve/awesome' => '5937ac0', - 'merged-target' => '21751bf', - 'markdown' => '0ed8c6c', - 'lfs' => '55bc176', - 'master' => 'b83d6e3', - 'merge-test' => '5937ac0', - "'test'" => 'e56497b', - 'orphaned-branch' => '45127a9', - 'binary-encoding' => '7b1cf43', - 'gitattributes' => '5a62481', - 'expand-collapse-diffs' => '4842455', - 'symlink-expand-diff' => '81e6355', - 'diff-files-symlink-to-image' => '8cfca84', - 'diff-files-image-to-symlink' => '3e94fda', - 'diff-files-symlink-to-text' => '689815e', - 'diff-files-text-to-symlink' => '5e2c270', - 'expand-collapse-files' => '025db92', - 'expand-collapse-lines' => '238e82d', - 'pages-deploy' => '7897d5b', - 'pages-deploy-target' => '7975be0', - 'audio' => 'c3c21fd', - 'video' => '8879059', - 'crlf-diff' => '5938907', - 'conflict-start' => '824be60', - 'conflict-resolvable' => '1450cd6', - 'conflict-binary-file' => '259a6fb', + 'signed-commits' => 'c7794c1', + 'not-merged-branch' => 'b83d6e3', + 'branch-merged' => '498214d', + 'empty-branch' => '7efb185', + 'ends-with.json' => '98b0d8b', + 'flatten-dir' => 'e56497b', + 'feature' => '0b4bc9a', + 'feature_conflict' => 'bb5206f', + 'fix' => '48f0be4', + 'improve/awesome' => '5937ac0', + 'merged-target' => '21751bf', + 'markdown' => '0ed8c6c', + 'lfs' => '55bc176', + 'master' => 'b83d6e3', + 'merge-test' => '5937ac0', + "'test'" => 'e56497b', + 'orphaned-branch' => '45127a9', + 'binary-encoding' => '7b1cf43', + 'gitattributes' => '5a62481', + 'expand-collapse-diffs' => '4842455', + 'symlink-expand-diff' => '81e6355', + 'diff-files-symlink-to-image' => '8cfca84', + 'diff-files-image-to-symlink' => '3e94fda', + 'diff-files-symlink-to-text' => '689815e', + 'diff-files-text-to-symlink' => '5e2c270', + 'expand-collapse-files' => '025db92', + 'expand-collapse-lines' => '238e82d', + 'pages-deploy' => '7897d5b', + 'pages-deploy-target' => '7975be0', + 'audio' => 'c3c21fd', + 'video' => '8879059', + 'crlf-diff' => '5938907', + 'conflict-start' => '824be60', + 'conflict-resolvable' => '1450cd6', + 'conflict-binary-file' => '259a6fb', 'conflict-contains-conflict-markers' => '78a3086', - 'conflict-missing-side' => 'eb227b3', - 'conflict-non-utf8' => 'd0a293c', - 'conflict-too-large' => '39fa04f', - 'deleted-image-test' => '6c17798', - 'wip' => 'b9238ee', - 'csv' => '3dd0896', - 'v1.1.0' => 'b83d6e3', - 'add-ipython-files' => '4963fef', - 'add-pdf-file' => 'e774ebd', - 'squash-large-files' => '54cec52', - 'add-pdf-text-binary' => '79faa7b', - 'add_images_and_changes' => '010d106', - 'update-gitlab-shell-v-6-0-1' => '2f61d70', - 'update-gitlab-shell-v-6-0-3' => 'de78448', - 'merge-commit-analyze-before' => '1adbdef', - 'merge-commit-analyze-side-branch' => '8a99451', - 'merge-commit-analyze-after' => '646ece5', - 'snippet/single-file' => '43e4080aaa14fc7d4b77ee1f5c9d067d5a7df10e', - 'snippet/multiple-files' => '40232f7eb98b3f221886432def6e8bab2432add9', - 'snippet/rename-and-edit-file' => '220a1e4b4dff37feea0625a7947a4c60fbe78365', - 'snippet/edit-file' => 'c2f074f4f26929c92795a75775af79a6ed6d8430', - 'snippet/no-files' => '671aaa842a4875e5f30082d1ab6feda345fdb94d', - '2-mb-file' => 'bf12d25', - 'before-create-delete-modify-move' => '845009f', - 'between-create-delete-modify-move' => '3f5f443', - 'after-create-delete-modify-move' => 'ba3faa7', - 'with-codeowners' => '219560e', - 'submodule_inside_folder' => 'b491b92', - 'png-lfs' => 'fe42f41', - 'sha-starting-with-large-number' => '8426165', - 'invalid-utf8-diff-paths' => '99e4853', - 'compare-with-merge-head-source' => 'f20a03d', - 'compare-with-merge-head-target' => '2f1e176', - 'trailers' => 'f0a5ed6', - 'add_commit_with_5mb_subject' => '8cf8e80', - 'blame-on-renamed' => '32c33da', - 'with-executables' => '6b8dc4a', - 'spooky-stuff' => 'ba3343b', - 'few-commits' => '0031876', - 'two-commits' => '304d257', - 'utf-16' => 'f05a987', - 'gitaly-rename-test' => '94bb47c', - 'smime-signed-commits' => 'ed775cc' + 'conflict-missing-side' => 'eb227b3', + 'conflict-non-utf8' => 'd0a293c', + 'conflict-too-large' => '39fa04f', + 'deleted-image-test' => '6c17798', + 'wip' => 'b9238ee', + 'csv' => '3dd0896', + 'v1.1.0' => 'b83d6e3', + 'add-ipython-files' => '4963fef', + 'add-pdf-file' => 'e774ebd', + 'squash-large-files' => '54cec52', + 'add-pdf-text-binary' => '79faa7b', + 'add_images_and_changes' => '010d106', + 'update-gitlab-shell-v-6-0-1' => '2f61d70', + 'update-gitlab-shell-v-6-0-3' => 'de78448', + 'merge-commit-analyze-before' => '1adbdef', + 'merge-commit-analyze-side-branch' => '8a99451', + 'merge-commit-analyze-after' => '646ece5', + 'snippet/single-file' => '43e4080aaa14fc7d4b77ee1f5c9d067d5a7df10e', + 'snippet/multiple-files' => '40232f7eb98b3f221886432def6e8bab2432add9', + 'snippet/rename-and-edit-file' => '220a1e4b4dff37feea0625a7947a4c60fbe78365', + 'snippet/edit-file' => 'c2f074f4f26929c92795a75775af79a6ed6d8430', + 'snippet/no-files' => '671aaa842a4875e5f30082d1ab6feda345fdb94d', + '2-mb-file' => 'bf12d25', + 'before-create-delete-modify-move' => '845009f', + 'between-create-delete-modify-move' => '3f5f443', + 'after-create-delete-modify-move' => 'ba3faa7', + 'with-codeowners' => '219560e', + 'submodule_inside_folder' => 'b491b92', + 'png-lfs' => 'fe42f41', + 'sha-starting-with-large-number' => '8426165', + 'invalid-utf8-diff-paths' => '99e4853', + 'compare-with-merge-head-source' => 'f20a03d', + 'compare-with-merge-head-target' => '2f1e176', + 'trailers' => 'f0a5ed6', + 'add_commit_with_5mb_subject' => '8cf8e80', + 'blame-on-renamed' => '32c33da', + 'with-executables' => '6b8dc4a', + 'spooky-stuff' => 'ba3343b', + 'few-commits' => '0031876', + 'two-commits' => '304d257', + 'utf-16' => 'f05a987', + 'gitaly-rename-test' => '94bb47c', + 'smime-signed-commits' => 'ed775cc' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily @@ -96,9 +96,9 @@ module TestEnv # We currently only need a subset of the branches FORKED_BRANCH_SHA = { 'add-submodule-version-bump' => '3f547c0', - 'master' => '5937ac0', - 'remove-submodule' => '2a33e0c', - 'conflict-resolvable-fork' => '404fa3f' + 'master' => '5937ac0', + 'remove-submodule' => '2a33e0c', + 'conflict-resolvable-fork' => '404fa3f' }.freeze TMP_TEST_PATH = Rails.root.join('tmp', 'tests').freeze diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb index 2a9144614d0..7b60561432c 100644 --- a/spec/support/helpers/usage_data_helpers.rb +++ b/spec/support/helpers/usage_data_helpers.rb @@ -193,11 +193,11 @@ module UsageDataHelpers allow(Settings).to receive(:[]).with('artifacts') .and_return( { 'enabled' => true, - 'object_store' => + 'object_store' => { 'enabled' => true, - 'remote_directory' => 'artifacts', - 'direct_upload' => true, - 'connection' => + 'remote_directory' => 'artifacts', + 'direct_upload' => true, + 'connection' => { 'provider' => 'AWS', 'aws_access_key_id' => 'minio', 'aws_secret_access_key' => 'gdk-minio', 'region' => 'gdk', 'endpoint' => 'http://127.0.0.1:9000', 'path_style' => true }, 'background_upload' => false, 'proxy_download' => false } } @@ -208,11 +208,11 @@ module UsageDataHelpers allow(Settings).to receive(:[]).with('lfs') .and_return( { 'enabled' => true, - 'object_store' => + 'object_store' => { 'enabled' => false, - 'remote_directory' => 'lfs-objects', - 'direct_upload' => true, - 'connection' => + 'remote_directory' => 'lfs-objects', + 'direct_upload' => true, + 'connection' => { 'provider' => 'AWS', 'aws_access_key_id' => 'minio', 'aws_secret_access_key' => 'gdk-minio', 'region' => 'gdk', 'endpoint' => 'http://127.0.0.1:9000', 'path_style' => true }, 'background_upload' => false, 'proxy_download' => false } } @@ -221,21 +221,21 @@ module UsageDataHelpers .and_return( { 'object_store' => { 'enabled' => false, - 'remote_directory' => 'uploads', - 'direct_upload' => true, - 'connection' => + 'remote_directory' => 'uploads', + 'direct_upload' => true, + 'connection' => { 'provider' => 'AWS', 'aws_access_key_id' => 'minio', 'aws_secret_access_key' => 'gdk-minio', 'region' => 'gdk', 'endpoint' => 'http://127.0.0.1:9000', 'path_style' => true }, - 'background_upload' => false, - 'proxy_download' => false } } + 'background_upload' => false, + 'proxy_download' => false } } ) allow(Settings).to receive(:[]).with('packages') .and_return( { 'enabled' => true, - 'object_store' => + 'object_store' => { 'enabled' => false, - 'remote_directory' => 'packages', - 'direct_upload' => false, - 'connection' => + 'remote_directory' => 'packages', + 'direct_upload' => false, + 'connection' => { 'provider' => 'AWS', 'aws_access_key_id' => 'minio', 'aws_secret_access_key' => 'gdk-minio', 'region' => 'gdk', 'endpoint' => 'http://127.0.0.1:9000', 'path_style' => true }, 'background_upload' => true, 'proxy_download' => false } } diff --git a/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb b/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb index 922f49ba84a..a3cccc3a75d 100644 --- a/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb +++ b/spec/support/migrations_helpers/vulnerabilities_findings_helper.rb @@ -31,14 +31,14 @@ module MigrationHelpers "links" => [ { "name" => "Cipher does not check for integrity first?", - "url" => "https://crypto.stackexchange.com/questions/31428/pbewithmd5anddes-cipher-does-not-check-for-integrity-first" + "url" => "https://crypto.stackexchange.com/questions/31428/pbewithmd5anddes-cipher-does-not-check-for-integrity-first" } ], "assets" => [ { "type" => "postman", "name" => "Test Postman Collection", - "url" => "http://localhost/test.collection" + "url" => "http://localhost/test.collection" } ], "evidence" => { @@ -50,7 +50,7 @@ module MigrationHelpers "headers" => [ { "name" => "Accept", - "value" => "*/*" + "value" => "*/*" } ] }, @@ -61,7 +61,7 @@ module MigrationHelpers "headers" => [ { "name" => "Content-Length", - "value" => "0" + "value" => "0" } ] }, diff --git a/spec/support/shared_contexts/bulk_imports_requests_shared_context.rb b/spec/support/shared_contexts/bulk_imports_requests_shared_context.rb index 5fcb14e075a..2f74d3131ab 100644 --- a/spec/support/shared_contexts/bulk_imports_requests_shared_context.rb +++ b/spec/support/shared_contexts/bulk_imports_requests_shared_context.rb @@ -25,15 +25,15 @@ RSpec.shared_context 'bulk imports requests context' do |url| stub_request(:get, "https://gitlab.example.com/api/v4/groups?min_access_level=50&page=1&per_page=20&private_token=demo-pat&search=test&top_level_only=true") .with(headers: request_headers) .to_return(status: 200, - body: [{ - id: 2595440, - web_url: 'https://gitlab.com/groups/test', - name: 'Test', - path: 'stub-test-group', - full_name: 'Test', - full_path: 'stub-test-group' - }].to_json, - headers: page_response_headers) + body: [{ + id: 2595440, + web_url: 'https://gitlab.com/groups/test', + name: 'Test', + path: 'stub-test-group', + full_name: 'Test', + full_path: 'stub-test-group' + }].to_json, + headers: page_response_headers) stub_request(:get, "%{url}/api/v4/groups?min_access_level=50&page=1&per_page=20&private_token=demo-pat&search=&top_level_only=true" % { url: url }) .to_return( diff --git a/spec/support/shared_contexts/design_management_shared_contexts.rb b/spec/support/shared_contexts/design_management_shared_contexts.rb index e6ae7e03664..d89bcada1df 100644 --- a/spec/support/shared_contexts/design_management_shared_contexts.rb +++ b/spec/support/shared_contexts/design_management_shared_contexts.rb @@ -14,23 +14,23 @@ RSpec.shared_context 'four designs in three versions' do let_it_be(:first_version) do create(:design_version, issue: issue, - created_designs: [design_a], - modified_designs: [], - deleted_designs: []) + created_designs: [design_a], + modified_designs: [], + deleted_designs: []) end let_it_be(:second_version) do create(:design_version, issue: issue, - created_designs: [design_b, design_c, design_d], - modified_designs: [design_a], - deleted_designs: []) + created_designs: [design_b, design_c, design_d], + modified_designs: [design_a], + deleted_designs: []) end let_it_be(:third_version) do create(:design_version, issue: issue, - created_designs: [], - modified_designs: [design_a], - deleted_designs: [design_d]) + created_designs: [], + modified_designs: [design_a], + deleted_designs: [design_d]) end before do diff --git a/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb b/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb index 4c003dff947..91b6baac610 100644 --- a/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb +++ b/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb @@ -55,33 +55,33 @@ RSpec.shared_context 'MergeRequestsFinder multiple projects with merge requests let!(:merge_request1) do create(:merge_request, assignees: [user], author: user, reviewers: [user2], - source_project: project2, target_project: project1, - target_branch: 'merged-target') + source_project: project2, target_project: project1, + target_branch: 'merged-target') end let!(:merge_request2) do create(:merge_request, :conflict, assignees: [user], author: user, reviewers: [user2], - source_project: project2, target_project: project1, - state: 'closed') + source_project: project2, target_project: project1, + state: 'closed') end let!(:merge_request3) do create(:merge_request, :simple, author: user, assignees: [user2], reviewers: [user], - source_project: project2, target_project: project2, - state: 'locked', - title: 'thing WIP thing') + source_project: project2, target_project: project2, + state: 'locked', + title: 'thing WIP thing') end let!(:merge_request4) do create(:merge_request, :simple, author: user, - source_project: project3, target_project: project3, - title: 'WIP thing') + source_project: project3, target_project: project3, + title: 'WIP thing') end let_it_be(:merge_request5) do create(:merge_request, :simple, author: user, - source_project: project4, target_project: project4, - title: '[WIP]') + source_project: project4, target_project: project4, + title: '[WIP]') end let!(:label_link) { create(:label_link, label: label, target: merge_request2) } diff --git a/spec/support/shared_examples/finders/issues_finder_shared_examples.rb b/spec/support/shared_examples/finders/issues_finder_shared_examples.rb index 049ead9fb89..f62c9c00006 100644 --- a/spec/support/shared_examples/finders/issues_finder_shared_examples.rb +++ b/spec/support/shared_examples/finders/issues_finder_shared_examples.rb @@ -365,7 +365,7 @@ RSpec.shared_examples 'issues or work items finder' do |factory, execute_context let!(:created_items) do milestones.map do |milestone| create(factory, project: milestone.project || project_in_group, - milestone: milestone, author: user, assignees: [user]) + milestone: milestone, author: user, assignees: [user]) end end diff --git a/spec/support/shared_examples/graphql/members_shared_examples.rb b/spec/support/shared_examples/graphql/members_shared_examples.rb index 110706c730b..f0c50e20a72 100644 --- a/spec/support/shared_examples/graphql/members_shared_examples.rb +++ b/spec/support/shared_examples/graphql/members_shared_examples.rb @@ -40,7 +40,7 @@ RSpec.shared_examples 'querying members with a group' do subject do resolve(described_class, obj: resource, args: base_args.merge(args), - ctx: { current_user: user_4 }, arg_style: :internal) + ctx: { current_user: user_4 }, arg_style: :internal) end describe '#resolve' do @@ -75,7 +75,7 @@ RSpec.shared_examples 'querying members with a group' do subject do resolve(described_class, obj: resource, args: base_args.merge(args), - ctx: { current_user: other_user }, arg_style: :internal) + ctx: { current_user: other_user }, arg_style: :internal) end it 'generates an error' do diff --git a/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb b/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb index b5c07f45d59..47655f86558 100644 --- a/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb +++ b/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb @@ -45,62 +45,62 @@ RSpec.shared_examples 'XSS prevention' do # Adapted from the Sanitize test suite: http://git.io/vczrM protocols = { 'protocol-based JS injection: simple, no spaces' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: simple, spaces before' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: simple, spaces after' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: simple, spaces before and after' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: preceding colon' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: UTF-8 encoding' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: long UTF-8 encoding' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: long UTF-8 encoding without semicolons' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: hex encoding' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: long hex encoding' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: hex encoding without semicolons' => { - input: 'foo', + input: 'foo', output: 'foo' }, 'protocol-based JS injection: null char' => { - input: "foo", + input: "foo", output: '' }, @@ -115,7 +115,7 @@ RSpec.shared_examples 'XSS prevention' do }, 'protocol-based JS injection: spaces and entities' => { - input: 'foo', + input: 'foo', output: 'foo' }, diff --git a/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb index 771ab89972c..a28fefcfc58 100644 --- a/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb @@ -3,7 +3,7 @@ RSpec.shared_examples 'marks background migration job records' do it 'marks each job record as succeeded after processing' do create(:background_migration_job, class_name: "::#{described_class.name.demodulize}", - arguments: arguments) + arguments: arguments) expect(::Gitlab::Database::BackgroundMigrationJob).to receive(:mark_all_as_succeeded).and_call_original @@ -14,7 +14,7 @@ RSpec.shared_examples 'marks background migration job records' do it 'returns the number of job records marked as succeeded' do create(:background_migration_job, class_name: "::#{described_class.name.demodulize}", - arguments: arguments) + arguments: arguments) jobs_updated = subject.perform(*arguments) diff --git a/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb index bb2f8965294..cd8f2d48d8f 100644 --- a/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb @@ -355,7 +355,7 @@ RSpec.shared_examples 'recipe download_urls' do it 'returns the download_urls for the recipe files' do expected_response = { - 'conanfile.py' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py", + 'conanfile.py' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py", 'conanmanifest.txt' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt" } @@ -372,7 +372,7 @@ RSpec.shared_examples 'package download_urls' do it 'returns the download_urls for the package files' do expected_response = { - 'conaninfo.txt' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conaninfo.txt", + 'conaninfo.txt' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conaninfo.txt", 'conanmanifest.txt' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conanmanifest.txt", 'conan_package.tgz' => "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conan_package.tgz" } @@ -412,7 +412,7 @@ RSpec.shared_examples 'recipe snapshot endpoint' do conan_manifest_file = package.package_files.find_by(file_name: 'conanmanifest.txt') expected_response = { - 'conanfile.py' => conan_file_file.file_md5, + 'conanfile.py' => conan_file_file.file_md5, 'conanmanifest.txt' => conan_manifest_file.file_md5 } @@ -435,7 +435,7 @@ RSpec.shared_examples 'package snapshot endpoint' do context 'with existing package' do it 'returns a hash of md5 values for the files' do expected_response = { - 'conaninfo.txt' => "12345abcde", + 'conaninfo.txt' => "12345abcde", 'conanmanifest.txt' => "12345abcde", 'conan_package.tgz' => "12345abcde" } @@ -486,7 +486,7 @@ RSpec.shared_examples 'recipe upload_urls endpoint' do subject expected_response = { - 'conanfile.py': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py", + 'conanfile.py': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py", 'conanmanifest.txt': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt" } @@ -505,7 +505,7 @@ RSpec.shared_examples 'recipe upload_urls endpoint' do expected_response = { 'conan_sources.tgz': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conan_sources.tgz", - 'conan_export.tgz': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conan_export.tgz", + 'conan_export.tgz': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conan_export.tgz", 'conanmanifest.txt': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt" } @@ -547,7 +547,7 @@ RSpec.shared_examples 'package upload_urls endpoint' do it 'returns a set of upload urls for the files requested' do expected_response = { - 'conaninfo.txt': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conaninfo.txt", + 'conaninfo.txt': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conaninfo.txt", 'conanmanifest.txt': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conanmanifest.txt", 'conan_package.tgz': "#{url_prefix}/packages/conan/v1/files/#{package.conan_recipe_path}/0/package/123456789/0/conan_package.tgz" } diff --git a/spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb b/spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb index 9f7ec6e90e9..1b609915f32 100644 --- a/spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb @@ -9,9 +9,10 @@ RSpec.shared_examples 'group and project packages query' do let_it_be(:composer_package) { create(:composer_package, project: project2, name: 'dab', version: '4.0.0', created_at: 3.days.ago) } let_it_be(:debian_package) { create(:debian_package, project: project2, name: 'aab', version: '5.0.0', created_at: 2.days.ago) } let_it_be(:composer_metadatum) do - create(:composer_metadatum, package: composer_package, - target_sha: 'afdeh', - composer_json: { name: 'x', type: 'y', license: 'z', version: 1 }) + create(:composer_metadatum, + package: composer_package, + target_sha: 'afdeh', + composer_json: { name: 'x', type: 'y', license: 'z', version: 1 }) end let(:package_names) { graphql_data_at(resource_type, :packages, :nodes, :name) } diff --git a/spec/support/shared_examples/routing/resource_routing_shared_examples.rb b/spec/support/shared_examples/routing/resource_routing_shared_examples.rb index b98901a57ea..d7a674f3522 100644 --- a/spec/support/shared_examples/routing/resource_routing_shared_examples.rb +++ b/spec/support/shared_examples/routing/resource_routing_shared_examples.rb @@ -43,12 +43,12 @@ RSpec.shared_examples 'resource routing' do let(:default_actions) do { - index: [:get, ''], - show: [:get, '/:id'], - new: [:get, '/new'], - create: [:post, ''], - edit: [:get, '/:id/edit'], - update: [:put, '/:id'], + index: [:get, ''], + show: [:get, '/:id'], + new: [:get, '/new'], + create: [:post, ''], + edit: [:get, '/:id/edit'], + update: [:put, '/:id'], destroy: [:delete, '/:id'] } end diff --git a/spec/support/shared_examples/routing/wiki_routing_shared_examples.rb b/spec/support/shared_examples/routing/wiki_routing_shared_examples.rb index 9289934677e..64f237f0d4d 100644 --- a/spec/support/shared_examples/routing/wiki_routing_shared_examples.rb +++ b/spec/support/shared_examples/routing/wiki_routing_shared_examples.rb @@ -6,9 +6,9 @@ RSpec.shared_examples 'wiki routing' do let(:actions) { %i[show new create edit update destroy] } let(:additional_actions) do { - pages: [:get, '/pages'], - history: [:get, '/:id/history'], - git_access: [:get, '/git_access'], + pages: [:get, '/pages'], + history: [:get, '/:id/history'], + git_access: [:get, '/git_access'], preview_markdown: [:post, '/:id/preview_markdown'] } end diff --git a/spec/support/shared_examples/services/container_registry_auth_service_shared_examples.rb b/spec/support/shared_examples/services/container_registry_auth_service_shared_examples.rb index 3be59af6a37..352326de868 100644 --- a/spec/support/shared_examples/services/container_registry_auth_service_shared_examples.rb +++ b/spec/support/shared_examples/services/container_registry_auth_service_shared_examples.rb @@ -199,8 +199,8 @@ RSpec.shared_examples 'a container registry auth service' do describe '.import_access_token' do let(:access) do [{ 'type' => 'registry', - 'name' => 'import', - 'actions' => ['*'] }] + 'name' => 'import', + 'actions' => ['*'] }] end let(:token) { described_class.import_access_token } -- cgit v1.2.3