diff options
Diffstat (limited to 'spec/lib/banzai/filter/references')
7 files changed, 17 insertions, 17 deletions
diff --git a/spec/lib/banzai/filter/references/alert_reference_filter_spec.rb b/spec/lib/banzai/filter/references/alert_reference_filter_spec.rb index cba41166be4..c1fdee48f12 100644 --- a/spec/lib/banzai/filter/references/alert_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/alert_reference_filter_spec.rb @@ -229,7 +229,7 @@ RSpec.describe Banzai::Filter::References::AlertReferenceFilter do let(:alert2_reference) { alert2.to_reference(full: true) } it 'does not have N+1 per multiple references per project', :use_sql_query_cache do - markdown = "#{alert_reference}" + markdown = alert_reference.to_s max_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do reference_filter(markdown) end.count diff --git a/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb b/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb index 6bcea41a603..c368a852ea9 100644 --- a/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/commit_reference_filter_spec.rb @@ -282,7 +282,7 @@ RSpec.describe Banzai::Filter::References::CommitReferenceFilter do let(:commit3_reference) { commit3.to_reference(full: true) } it 'does not have N+1 per multiple references per project', :use_sql_query_cache do - markdown = "#{commit_reference}" + markdown = commit_reference.to_s max_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do reference_filter(markdown) end.count diff --git a/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb b/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb index d17deaa4736..32538948b4b 100644 --- a/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb @@ -392,7 +392,7 @@ RSpec.describe Banzai::Filter::References::IssueReferenceFilter do context 'cross-project URL in link href' do let(:reference_link) { %{<a href="#{reference}">Reference</a>} } - let(:reference) { "#{issue_url + "#note_123"}" } + let(:reference) { (issue_url + "#note_123").to_s } let(:issue) { create(:issue, project: project2) } let(:project2) { create(:project, :public, namespace: namespace) } let(:namespace) { create(:namespace, name: 'cross-reference') } @@ -497,7 +497,7 @@ RSpec.describe Banzai::Filter::References::IssueReferenceFilter do end it 'links to a valid reference for cross-reference in link href' do - reference = "#{issue_url + "#note_123"}" + reference = (issue_url + "#note_123").to_s reference_link = %{<a href="#{reference}">Reference</a>} doc = reference_filter("See #{reference_link}", context) diff --git a/spec/lib/banzai/filter/references/label_reference_filter_spec.rb b/spec/lib/banzai/filter/references/label_reference_filter_spec.rb index 12cdb5cfb95..d5b9c71b861 100644 --- a/spec/lib/banzai/filter/references/label_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/label_reference_filter_spec.rb @@ -715,13 +715,13 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter do let_it_be(:project_label2) { create(:label, project: project) } let_it_be(:project2_label) { create(:label, project: project2) } let_it_be(:group2_label) { create(:group_label, group: group2, color: '#00ff00') } - let_it_be(:project_reference) { "#{project_label.to_reference}" } - let_it_be(:project_reference2) { "#{project_label2.to_reference}" } - let_it_be(:project2_reference) { "#{project2_label.to_reference}" } + let_it_be(:project_reference) { project_label.to_reference.to_s } + let_it_be(:project_reference2) { project_label2.to_reference.to_s } + let_it_be(:project2_reference) { project2_label.to_reference.to_s } let_it_be(:group2_reference) { "#{project2.full_path}~#{group2_label.name}" } it 'does not have N+1 per multiple references per project', :use_sql_query_cache do - markdown = "#{project_reference}" + markdown = project_reference.to_s control_count = 1 expect do @@ -737,7 +737,7 @@ RSpec.describe Banzai::Filter::References::LabelReferenceFilter do it 'has N+1 for multiple unique project/group references', :use_sql_query_cache do # reference to already loaded project, only one query - markdown = "#{project_reference}" + markdown = project_reference.to_s control_count = 1 expect do diff --git a/spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb index c21a9339ebb..98090af06b1 100644 --- a/spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb @@ -490,13 +490,13 @@ RSpec.describe Banzai::Filter::References::MilestoneReferenceFilter do let_it_be(:project_milestone2) { create(:milestone, project: project) } let_it_be(:project2_milestone) { create(:milestone, project: project2) } let_it_be(:group2_milestone) { create(:milestone, group: group2) } - let_it_be(:project_reference) { "#{project_milestone.to_reference}" } - let_it_be(:project_reference2) { "#{project_milestone2.to_reference}" } - let_it_be(:project2_reference) { "#{project2_milestone.to_reference(full: true)}" } + let_it_be(:project_reference) { project_milestone.to_reference.to_s } + let_it_be(:project_reference2) { project_milestone2.to_reference.to_s } + let_it_be(:project2_reference) { project2_milestone.to_reference(full: true).to_s } let_it_be(:group2_reference) { "#{project2.full_path}%\"#{group2_milestone.name}\"" } it 'does not have N+1 per multiple references per project', :use_sql_query_cache do - markdown = "#{project_reference}" + markdown = project_reference.to_s control_count = 4 expect do @@ -511,7 +511,7 @@ RSpec.describe Banzai::Filter::References::MilestoneReferenceFilter do end it 'has N+1 for multiple unique project/group references', :use_sql_query_cache do - markdown = "#{project_reference}" + markdown = project_reference.to_s control_count = 4 expect do diff --git a/spec/lib/banzai/filter/references/project_reference_filter_spec.rb b/spec/lib/banzai/filter/references/project_reference_filter_spec.rb index d88e262883f..0dd52b45f5d 100644 --- a/spec/lib/banzai/filter/references/project_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/project_reference_filter_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Banzai::Filter::References::ProjectReferenceFilter do include FilterSpecHelper def invalidate_reference(reference) - "#{reference.reverse}" + reference.reverse.to_s end def get_reference(project) @@ -109,7 +109,7 @@ RSpec.describe Banzai::Filter::References::ProjectReferenceFilter do let_it_be(:nested_project_reference) { get_reference(nested_project) } it 'does not have N+1 per multiple project references', :use_sql_query_cache do - markdown = "#{normal_project_reference}" + markdown = normal_project_reference.to_s # warm up first reference_filter(markdown) diff --git a/spec/lib/banzai/filter/references/user_reference_filter_spec.rb b/spec/lib/banzai/filter/references/user_reference_filter_spec.rb index 70cbdb080a4..b153efd9655 100644 --- a/spec/lib/banzai/filter/references/user_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/references/user_reference_filter_spec.rb @@ -209,7 +209,7 @@ RSpec.describe Banzai::Filter::References::UserReferenceFilter do let(:reference3) { group.to_reference } it 'does not have N+1 per multiple user references', :use_sql_query_cache do - markdown = "#{reference}" + markdown = reference.to_s control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do reference_filter(markdown) |