Commit d5d6c927 authored by Jarka Košanová's avatar Jarka Košanová

Merge branch 'fix_empty_line_in_license_usage_file' into 'master'

Fix empty line to contain two values

See merge request gitlab-org/gitlab!78678
parents 2dab461b 872dfcc8
...@@ -39,7 +39,7 @@ module HistoricalUserData ...@@ -39,7 +39,7 @@ module HistoricalUserData
csv << ['License End Date', license.expires_at&.to_s(:csv)] csv << ['License End Date', license.expires_at&.to_s(:csv)]
csv << ['Company', license.licensee_company] csv << ['Company', license.licensee_company]
csv << ['Generated At', Time.current.to_s(:csv)] csv << ['Generated At', Time.current.to_s(:csv)]
csv << [''] csv << ['', '']
end end
end end
end end
......
...@@ -92,6 +92,13 @@ RSpec.describe HistoricalUserData::CsvService do ...@@ -92,6 +92,13 @@ RSpec.describe HistoricalUserData::CsvService do
end end
end end
context 'Empty Row' do
it 'adds an empty row between the License Information Header and the User Count Table' do
expect(csv[6][0]).to eq('')
expect(csv[6][1]).to eq('')
end
end
context 'User Count Table' do context 'User Count Table' do
let_it_be(:historical_datum) do let_it_be(:historical_datum) do
create(:historical_data, recorded_at: license_start_date, active_user_count: 1) create(:historical_data, recorded_at: license_start_date, active_user_count: 1)
......
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