Skip to content
Snippets Groups Projects
Commit bfc1b029 authored by Vitali Tatarintev's avatar Vitali Tatarintev
Browse files

Fix Layout/ArgumentAlignment in shared_contexts

Fix Layout/ArgumentAlignment in shared_contexts
parent 9ea16d18
No related branches found
No related tags found
2 merge requests!122597doc/gitaly: Remove references to removed metrics,!118627Fix Layout/ArgumentAlignment in shared_contexts
......@@ -2543,12 +2543,6 @@ Layout/ArgumentAlignment:
- 'spec/sidekiq/cron/job_gem_dependency_spec.rb'
- 'spec/support/import_export/export_file_helper.rb'
- 'spec/support/redis/redis_shared_examples.rb'
- 'spec/support/shared_contexts/bulk_imports_requests_shared_context.rb'
- 'spec/support/shared_contexts/design_management_shared_contexts.rb'
- 'spec/support/shared_contexts/merge_request_create_shared_context.rb'
- 'spec/support/shared_contexts/merge_request_edit_shared_context.rb'
- 'spec/support/shared_contexts/merge_requests_allowing_collaboration_shared_context.rb'
- 'spec/support/shared_contexts/requests/api/graphql/releases_and_group_releases_shared_context.rb'
- 'spec/support/shared_examples/controllers/snippets_sort_order_shared_examples.rb'
- 'spec/support/shared_examples/controllers/wiki_actions_shared_examples.rb'
- 'spec/support/shared_examples/features/search/redacted_search_results_shared_examples.rb'
......
......@@ -24,16 +24,18 @@
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)
.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
)
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(
......@@ -45,6 +47,7 @@
full_name: 'Stub',
full_path: 'stub-group'
}].to_json,
headers: page_response_headers)
headers: page_response_headers
)
end
end
......@@ -13,24 +13,33 @@
let_it_be(:design_d) { create(:design, issue: issue) }
let_it_be(:first_version) do
create(:design_version, issue: issue,
created_designs: [design_a],
modified_designs: [],
deleted_designs: [])
create(
:design_version,
issue: issue,
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: [])
create(
:design_version,
issue: issue,
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])
create(
:design_version,
issue: issue,
created_designs: [],
modified_designs: [design_a],
deleted_designs: [design_d]
)
end
before do
......
......@@ -15,12 +15,13 @@
target_project.add_maintainer(user2)
sign_in(user)
visit project_new_merge_request_path(target_project,
merge_request: {
source_project_id: source_project.id,
target_project_id: target_project.id,
source_branch: 'fix',
target_branch: 'master'
})
visit project_new_merge_request_path(
target_project,
merge_request: {
source_project_id: source_project.id,
target_project_id: target_project.id,
source_branch: 'fix',
target_branch: 'master'
})
end
end
......@@ -9,11 +9,13 @@
let(:target_project) { create(:project, :public, :repository) }
let(:source_project) { target_project }
let(:merge_request) do
create(:merge_request,
source_project: source_project,
target_project: target_project,
source_branch: 'fix',
target_branch: 'master')
create(
:merge_request,
source_project: source_project,
target_project: target_project,
source_branch: 'fix',
target_branch: 'master'
)
end
before do
......
......@@ -8,10 +8,12 @@
before do
canonical.add_maintainer(user)
create(:merge_request,
target_project: canonical,
source_project: forked_project,
source_branch: 'feature',
allow_collaboration: true)
create(
:merge_request,
target_project: canonical,
source_project: forked_project,
source_branch: 'feature',
allow_collaboration: true
)
end
end
......@@ -13,40 +13,40 @@
let(:query) do
graphql_query_for(resource_type, { fullPath: resource.full_path },
%(
releases {
count
nodes {
tagName
tagPath
name
commit {
sha
}
assets {
count
sources {
%(
releases {
count
nodes {
tagName
tagPath
name
commit {
sha
}
assets {
count
sources {
nodes {
url
}
}
}
evidences {
nodes {
url
sha
}
}
}
evidences {
nodes {
sha
links {
selfUrl
openedMergeRequestsUrl
mergedMergeRequestsUrl
closedMergeRequestsUrl
openedIssuesUrl
closedIssuesUrl
}
}
links {
selfUrl
openedMergeRequestsUrl
mergedMergeRequestsUrl
closedMergeRequestsUrl
openedIssuesUrl
closedIssuesUrl
}
}
}
))
))
end
let(:params_for_issues_and_mrs) { { scope: 'all', state: 'opened', release_tag: release.tag } }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment