From d218e0965489e39671caad18411204e4aad07e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 25 Oct 2019 22:41:32 +0200
Subject: [PATCH] Use squiggly heredocs

This is a feature which was introduced in Ruby 2.3, and makes it much
easier to write readable heredocs.
---
 .rubocop.yml                                  |  3 +
 spec/factories/legislations.rb                | 16 ++--
 spec/models/legislation/draft_version_spec.rb | 78 +++++++++----------
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 3a1070ace..c12530402 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -61,6 +61,9 @@ Layout/ExtraSpacing:
 Layout/IndentAssignment:
   Enabled: true
 
+Layout/IndentHeredoc:
+  Enabled: true
+
 Layout/IndentationConsistency:
   EnforcedStyle: indented_internal_methods
 
diff --git a/spec/factories/legislations.rb b/spec/factories/legislations.rb
index bfb1e7948..22c904ffb 100644
--- a/spec/factories/legislations.rb
+++ b/spec/factories/legislations.rb
@@ -124,19 +124,19 @@ FactoryBot.define do
     changelog { "What changed in this version" }
     status { "draft" }
     final_version { false }
-    body { <<-LOREM_IPSUM }
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+    body { <<~LOREM_IPSUM }
+      Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
 
-Expetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id.
+      Expetenda tincidunt in sed, ex partem placerat sea, porro commodo ex eam. His putant aeterno interesset at. Usu ea mundi tincidunt, omnium virtute aliquando ius ex. Ea aperiri sententiae duo. Usu nullam dolorum quaestio ei, sit vidit facilisis ea. Per ne impedit iracundia neglegentur. Consetetur neglegentur eum ut, vis animal legimus inimicus id.
 
-His audiam deserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu.
+      His audiam deserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu.
 
-Est ei erat mucius quaeque. Ei his quas phaedrum, efficiantur mediocritatem ne sed, hinc oratio blandit ei sed. Blandit gloriatur eam et. Brute noluisse per et, verear disputando neglegentur at quo. Sea quem legere ei, unum soluta ne duo. Ludus complectitur quo te, ut vide autem homero pro.
+      Est ei erat mucius quaeque. Ei his quas phaedrum, efficiantur mediocritatem ne sed, hinc oratio blandit ei sed. Blandit gloriatur eam et. Brute noluisse per et, verear disputando neglegentur at quo. Sea quem legere ei, unum soluta ne duo. Ludus complectitur quo te, ut vide autem homero pro.
 
-Vis id minim dicant sensibus. Pri aliquip conclusionemque ad, ad malis evertitur torquatos his. Has ei solum harum reprimique, id illum saperet tractatos his. Ei omnis soleat antiopam quo. Ad augue inani postulant mel, mel ea qualisque forensibus.
+      Vis id minim dicant sensibus. Pri aliquip conclusionemque ad, ad malis evertitur torquatos his. Has ei solum harum reprimique, id illum saperet tractatos his. Ei omnis soleat antiopam quo. Ad augue inani postulant mel, mel ea qualisque forensibus.
 
-Lorem salutandi eu mea, eam in soleat iriure assentior. Tamquam lobortis id qui. Ea sanctus democritum mei, per eu alterum electram adversarium. Ea vix probo dicta iuvaret, posse epicurei suavitate eam an, nam et vidit menandri. Ut his accusata petentium.
-LOREM_IPSUM
+      Lorem salutandi eu mea, eam in soleat iriure assentior. Tamquam lobortis id qui. Ea sanctus democritum mei, per eu alterum electram adversarium. Ea vix probo dicta iuvaret, posse epicurei suavitate eam an, nam et vidit menandri. Ut his accusata petentium.
+    LOREM_IPSUM
 
     trait :published do
       status { "published" }
diff --git a/spec/models/legislation/draft_version_spec.rb b/spec/models/legislation/draft_version_spec.rb
index 33eadb98d..b0416d590 100644
--- a/spec/models/legislation/draft_version_spec.rb
+++ b/spec/models/legislation/draft_version_spec.rb
@@ -20,64 +20,64 @@ describe Legislation::DraftVersion do
   end
 
   def body_markdown
-    <<-BODY_MARKDOWN
-# Title 1
+    <<~BODY_MARKDOWN
+      # Title 1
 
-Some paragraph.
+      Some paragraph.
 
-A list:
+      A list:
 
-- item 1
-- item 2
+      - item 1
+      - item 2
 
-## Subtitle
+      ## Subtitle
 
-Another paragraph.
+      Another paragraph.
 
-# Title 2
+      # Title 2
 
-Something about this.
-BODY_MARKDOWN
+      Something about this.
+    BODY_MARKDOWN
   end
 
   def body_html
-    <<-BODY_HTML
-<h1 id="title-1">Title 1</h1>
+    <<~BODY_HTML
+      <h1 id="title-1">Title 1</h1>
 
-<p>Some paragraph.</p>
+      <p>Some paragraph.</p>
 
-<p>A list:</p>
+      <p>A list:</p>
 
-<ul>
-<li>item 1</li>
-<li>item 2</li>
-</ul>
+      <ul>
+      <li>item 1</li>
+      <li>item 2</li>
+      </ul>
 
-<h2 id="subtitle">Subtitle</h2>
+      <h2 id="subtitle">Subtitle</h2>
 
-<p>Another paragraph.</p>
+      <p>Another paragraph.</p>
 
-<h1 id="title-2">Title 2</h1>
+      <h1 id="title-2">Title 2</h1>
 
-<p>Something about this.</p>
-BODY_HTML
+      <p>Something about this.</p>
+    BODY_HTML
   end
 
   def toc_html
-    <<-TOC_HTML
-<ul>
-<li>
-<a href="#title-1">Title 1</a>
-<ul>
-<li>
-<a href="#subtitle">Subtitle</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#title-2">Title 2</a>
-</li>
-</ul>
-TOC_HTML
+    <<~TOC_HTML
+      <ul>
+      <li>
+      <a href="#title-1">Title 1</a>
+      <ul>
+      <li>
+      <a href="#subtitle">Subtitle</a>
+      </li>
+      </ul>
+      </li>
+      <li>
+      <a href="#title-2">Title 2</a>
+      </li>
+      </ul>
+    TOC_HTML
   end
 end