Commit 9062f63e authored by Thong Kuah's avatar Thong Kuah

Merge branch 'sh-clean-null-bytes-rspec' into 'master'

Strip rspec-profiling output of NULL bytes

Closes #120012

See merge request gitlab-org/gitlab!22190
parents 2958a4b5 70cc7dc0
...@@ -35,6 +35,8 @@ def insert_data(path) ...@@ -35,6 +35,8 @@ def insert_data(path)
files.each do |filename| files.each do |filename|
puts "#{Time.now} Inserting #{filename}..." puts "#{Time.now} Inserting #{filename}..."
# Strip file of NULL bytes to ensure data gets inserted
system("sed", "-i", "-e", "s/\\x00//g", filename)
result = RspecProfiling::Collectors::PSQL::Result.copy_from(filename) result = RspecProfiling::Collectors::PSQL::Result.copy_from(filename)
puts "#{Time.now} Inserted #{result.cmd_tuples} lines in #{filename}, DB response: #{result.cmd_status}" puts "#{Time.now} Inserted #{result.cmd_tuples} lines in #{filename}, DB response: #{result.cmd_status}"
end end
......
...@@ -230,7 +230,7 @@ describe Banzai::Pipeline::WikiPipeline do ...@@ -230,7 +230,7 @@ describe Banzai::Pipeline::WikiPipeline do
] ]
invalid_slugs.each do |slug| invalid_slugs.each do |slug|
context "with the invalid slug #{slug}" do context "with the invalid slug #{slug.delete("\000")}" do
invalid_js_links.each do |link| invalid_js_links.each do |link|
it "doesn't include a prohibited slug in a (.) relative link '#{link}'" do it "doesn't include a prohibited slug in a (.) relative link '#{link}'" do
output = described_class.to_html( output = described_class.to_html(
......
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