Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Fix tests dealing with Plaintext::Resolver

Christophe Bliard8c7a4e30ccc7
diff --git a/spec/features/work_packages/table/queries/filter_spec.rb b/spec/features/work_packages/table/queries/filter_spec.rb
index 25bcfdfa284..72b1628d48e 100644
--- a/spec/features/work_packages/table/queries/filter_spec.rb
+++ b/spec/features/work_packages/table/queries/filter_spec.rb
@@ -447,12 +447,15 @@ RSpec.describe "filter work packages", :js do
end
let(:wp_without_attachment) { create(:work_package, subject: "WP no attachment", project:) }
let(:wp_table) { Pages::WorkPackagesTable.new }
+ let(:plaintext_file_handler) do
+ Plaintext::Resolver.file_handlers.find { |h| h.accept? "text/plain" }
+ end
before do
- allow_any_instance_of(Plaintext::Resolver).to receive(:text).and_return("I am the first text $1.99.")
+ allow(plaintext_file_handler).to receive(:text).and_return("I am the first text $1.99.")
wp_with_attachment_a
Attachments::ExtractFulltextJob.perform_now(attachment_a.id)
- allow_any_instance_of(Plaintext::Resolver).to receive(:text).and_return("I am the second text.")
+ allow(plaintext_file_handler).to receive(:text).and_return("I am the second text.")
wp_with_attachment_b
Attachments::ExtractFulltextJob.perform_now(attachment_b.id)
wp_without_attachment
diff --git a/spec/models/queries/work_packages/filter/attachment_content_filter_spec.rb b/spec/models/queries/work_packages/filter/attachment_content_filter_spec.rb
index 3b4d42a24c4..2a4012a7997 100644
--- a/spec/models/queries/work_packages/filter/attachment_content_filter_spec.rb
+++ b/spec/models/queries/work_packages/filter/attachment_content_filter_spec.rb
@@ -43,11 +43,16 @@ RSpec.describe Queries::WorkPackages::Filter::AttachmentContentFilter do
let(:work_package) { create(:work_package) }
let(:text) { "lorem ipsum" }
let(:attachment) { create(:attachment, container: work_package) }
+ let(:plaintext_file_handler) do
+ Plaintext::Resolver.file_handlers.find { |h| h.accept? attachment.content_type }.tap do |plaintext_file_handler|
+ if plaintext_file_handler.nil?
+ fail "Plaintext::FileHandler not found for content type #{attachment.content_type}"
+ end
+ end
+ end
before do
- allow_any_instance_of(Plaintext::Resolver).to receive(:text).and_return(text)
- allow(attachment).to receive(:readable?).and_return(true)
- attachment.reload
+ allow(plaintext_file_handler).to receive(:text).and_return(text)
end
it "finds WP through attachment content" do
diff --git a/spec/models/queries/work_packages/filter/search_filter_spec.rb b/spec/models/queries/work_packages/filter/search_filter_spec.rb
index 14b583d3233..7a7fd05cb38 100644
--- a/spec/models/queries/work_packages/filter/search_filter_spec.rb
+++ b/spec/models/queries/work_packages/filter/search_filter_spec.rb
@@ -116,12 +116,16 @@ RSpec.describe Queries::WorkPackages::Filter::SearchFilter do
let(:text) { "lorem ipsum" }
let(:filename) { "plaintext-file.txt" }
let(:attachment) { create(:attachment, container: work_package, filename:) }
+ let(:plaintext_file_handler) do
+ Plaintext::Resolver.file_handlers.find { |h| h.accept? attachment.content_type }.tap do |plaintext_file_handler|
+ if plaintext_file_handler.nil?
+ fail "Plaintext::FileHandler not found for content type #{attachment.content_type}"
+ end
+ end
+ end
before do
- allow_any_instance_of(Plaintext::Resolver).to receive(:text).and_return(text)
- allow(attachment).to receive(:readable?).and_return(true)
- attachment.reload
- work_package.reload
+ allow(plaintext_file_handler).to receive(:text).and_return(text)
end
it "finds in attachment content" do
@@ -146,12 +150,16 @@ RSpec.describe Queries::WorkPackages::Filter::SearchFilter do
let(:filename) { "plaintext-file.txt" }
let(:attachment) { create(:attachment, container: work_package, filename:) }
let(:attachment2) { create(:attachment, container: work_package, filename:) }
+ let(:plaintext_file_handler) do
+ Plaintext::Resolver.file_handlers.find { |h| h.accept? attachment.content_type }.tap do |plaintext_file_handler|
+ if plaintext_file_handler.nil?
+ fail "Plaintext::FileHandler not found for content type #{attachment.content_type}"
+ end
+ end
+ end
before do
- allow_any_instance_of(Plaintext::Resolver).to receive(:text).and_return(text)
- allow(attachment).to receive(:readable?).and_return(true)
- allow(attachment2).to receive(:readable?).and_return(true)
- work_package.reload
+ allow(plaintext_file_handler).to receive(:text).and_return(text)
end
context "with the search string in both attachments" do