Commit 913e2654 authored by Eulyeon Ko's avatar Eulyeon Ko

Apply reviewer suggestions 2

DRY parameters
parent 0e50390a
...@@ -52,11 +52,16 @@ RSpec.describe 'User visits issue boards', :js do ...@@ -52,11 +52,16 @@ RSpec.describe 'User visits issue boards', :js do
board.update!(label_ids: [label.id, scoped_label.id]) board.update!(label_ids: [label.id, scoped_label.id])
end end
label_params1 = { "label_name" => [label_name] }
label_params2 = { "label_name" => [label_name, scoped_label_name] }
assignee_param = { "assignee_username" => assignee_username }
combined_params = label_params2.merge(assignee_param)
where(:params, :expected_params, :expected_issues) do where(:params, :expected_params, :expected_issues) do
{} | { "label_name" => [label_name, scoped_label_name] } | [issue_with_all_filters] {} | label_params2 | [issue_with_all_filters]
{ "label_name" => [label_name] } | { "label_name" => [label_name, scoped_label_name] } | [issue_with_all_filters] label_params1 | label_params2 | [issue_with_all_filters]
{ "label_name" => [label_name, scoped_label_name] } | { "label_name" => [label_name, scoped_label_name] } | [issue_with_all_filters] # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands label_params2 | label_params2 | [issue_with_all_filters] # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
{ "assignee_username" => assignee_username } | { "label_name" => [label_name, scoped_label_name], "assignee_username" => assignee_username } | [issue_with_all_filters] assignee_param | combined_params | [issue_with_all_filters]
end end
with_them do with_them do
...@@ -72,12 +77,14 @@ RSpec.describe 'User visits issue boards', :js do ...@@ -72,12 +77,14 @@ RSpec.describe 'User visits issue boards', :js do
board.update!(assignee: assignee) board.update!(assignee: assignee)
end end
scoped_label_param = { "label_name" => [scoped_label_name] }
assignee_param = { "assignee_username" => assignee_username }
combined_params = scoped_label_param.merge(assignee_param)
where(:params, :expected_params, :expected_issues) do where(:params, :expected_params, :expected_issues) do
[ {} | assignee_param | [issue_with_assignee, issue_with_all_filters]
[{}, { "assignee_username" => assignee_username }, [issue_with_assignee, issue_with_all_filters]], assignee_param | assignee_param | [issue_with_assignee, issue_with_all_filters] # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
[{ "assignee_username" => assignee_username }, { "assignee_username" => assignee_username }, [issue_with_assignee, issue_with_all_filters]], scoped_label_param | combined_params | [issue_with_all_filters]
[{ "label_name" => [scoped_label_name] }, { "assignee_username" => assignee_username, "label_name" => [scoped_label_name] }, [issue_with_all_filters]]
]
end end
with_them do with_them do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment