diff --git a/lib/comfortable_mexican_sofa/seeds.rb b/lib/comfortable_mexican_sofa/seeds.rb index 56b58e27a..6bdf8fe5a 100644 --- a/lib/comfortable_mexican_sofa/seeds.rb +++ b/lib/comfortable_mexican_sofa/seeds.rb @@ -98,8 +98,12 @@ def export!(classes = nil) def write_file_content(path, data) ::File.open(::File.join(path), "wb") do |f| data.each do |item| - f.write("[#{item[:header]}]\n") - f.write("#{item[:content]}\n") + f.write("[#{item[:header]}]\n#{item[:content]}") + # adds a newline between items if not already there + # makes sure last item does not have a newline + if data.last != item && !item[:content].to_s.end_with?("\n") + f.write("\n") + end end end end diff --git a/test/lib/seeds/layouts_test.rb b/test/lib/seeds/layouts_test.rb index 1308a77bc..9f8fefae8 100644 --- a/test/lib/seeds/layouts_test.rb +++ b/test/lib/seeds/layouts_test.rb @@ -102,13 +102,12 @@ def test_export assert File.exist?(layout_2_content_path) assert File.exist?(layout_3_content_path) - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Default Layout app_layout:\s position: 0 - [content] {{cms:textarea content}} [js] @@ -116,15 +115,15 @@ def test_export [css] default_css TEXT + assert_equal out, IO.read(layout_1_content_path) - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Nested Layout app_layout:\s position: 0 - [content] {{cms:text header}} {{cms:textarea content}} @@ -135,13 +134,12 @@ def test_export TEXT assert_equal out, IO.read(layout_2_content_path) - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Child Layout app_layout:\s position: 0 - [content] {{cms:textarea left_column}} {{cms:textarea right_column}} diff --git a/test/lib/seeds/pages_test.rb b/test/lib/seeds/pages_test.rb index ee7f4b3c2..48d97b8e0 100644 --- a/test/lib/seeds/pages_test.rb +++ b/test/lib/seeds/pages_test.rb @@ -176,7 +176,7 @@ def test_export ComfortableMexicanSofa::Seeds::Page::Exporter.new("default-site", "test-site").export! - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Default Page @@ -186,7 +186,6 @@ def test_export - Default is_published: true position: 0 - [checkbox boolean] true [file file] @@ -200,7 +199,7 @@ def test_export assert File.exist?(page_1_attachment_path) - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Child Page @@ -213,13 +212,12 @@ def test_export TEXT assert_equal out, IO.read(page_2_content_path) - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Default Translation layout: default is_published: true - [markdown content] translation content TEXT diff --git a/test/lib/seeds/snippets_test.rb b/test/lib/seeds/snippets_test.rb index bb6f99d1c..0b5612c36 100644 --- a/test/lib/seeds/snippets_test.rb +++ b/test/lib/seeds/snippets_test.rb @@ -81,14 +81,13 @@ def test_export ComfortableMexicanSofa::Seeds::Snippet::Exporter.new("default-site", "test-site").export! assert File.exist?(content_path) - out = <<~TEXT + out = <<~TEXT.chomp [attributes] --- label: Default Snippet categories: - Default position: 0 - [content] snippet content TEXT