diff --git a/src/supermarket/engines/fieri/app/models/cookbook_artifact.rb b/src/supermarket/engines/fieri/app/models/cookbook_artifact.rb index 20e81586ef..d4b2e10fc0 100644 --- a/src/supermarket/engines/fieri/app/models/cookbook_artifact.rb +++ b/src/supermarket/engines/fieri/app/models/cookbook_artifact.rb @@ -107,7 +107,9 @@ def binary?(filepath) # need to check for application/xml explicitly because only versions of # libmagic < 5.26 are available on Ubuntu 14.04 and 16.04 which are our # CI (Travis and Automate) node platforms - Utils::FileFormat.get_mime_type(file_path: filepath) !~ %r{^(text\/|inode\/x-empty|application\/xml)} + # s = File.read(filepath, 1024) || "" + # s.count("\0") == 0 ? false : true + Utils::FileFormat.get_mime_type(file_path: filepath) !~ %r{^text\/|inode\/x-empty|application\/xml|application\/json} # %r{^(text\/|inode\/x-empty|application\/xml)} end def too_big?(filepath) diff --git a/src/supermarket/engines/fieri/spec/models/cookbook_artifact_spec.rb b/src/supermarket/engines/fieri/spec/models/cookbook_artifact_spec.rb index 8379f90fc1..7eb9ecef7d 100644 --- a/src/supermarket/engines/fieri/spec/models/cookbook_artifact_spec.rb +++ b/src/supermarket/engines/fieri/spec/models/cookbook_artifact_spec.rb @@ -49,7 +49,7 @@ it "returns an empty string" do binary_files = artifact.binaries - expect(binary_files).to eq("apache2/metadata.json") + expect(binary_files).to eq("") end end diff --git a/src/supermarket/engines/fieri/spec/models/no_binaries_worker_spec.rb b/src/supermarket/engines/fieri/spec/models/no_binaries_worker_spec.rb index c7e543420c..1e64999d6b 100644 --- a/src/supermarket/engines/fieri/spec/models/no_binaries_worker_spec.rb +++ b/src/supermarket/engines/fieri/spec/models/no_binaries_worker_spec.rb @@ -33,8 +33,8 @@ subject.perform(valid_params) assert_requested(:post, test_evaluation_endpoint) do |req| - expect(req.body).to include("no_binaries_feedback=Failure") - expect(req.body).to include("no_binaries_failure=true") + expect(req.body).to include("no_binaries_feedback=passed") + expect(req.body).to include("no_binaries_failure=false") end end