Merge pull request #859 from alphagov/fix-the-hovering-blue-sidebar-o…

…n-pages-without-related-links

Avoid rendering the side content when there's no content

app/views/govuk_component/related_items.raw.html.erb

@@ -1,39 +1,38 @@
-<%
-  sections ||= []
-%>
-<aside class="govuk-related-items" role="complementary">
-  <% sections.each do |section| %>
-    <h2
-      <% if section[:id] %>id="<%= section[:id] %>"<% end %>
-    >
-      <%= section[:title] %>
-    </h2>
-    <nav role="navigation" <% if section[:id] %>aria-labelledby="<%= section[:id] %>"<% end %>>
-      <ul>
-        <% section[:items].each do |item| %>
-          <li>
-            <a
-              href="<%= item[:url] %>"
-              <% if item[:rel] %>rel="<%= item[:rel] %>"<% end %>
-            >
-              <%= item[:title] %>
-            </a>
-          </li>
-        <% end %>
-        <% if section[:url] %>
-          <li class="related-items-more">
-            <a href="<%= section[:url] %>">
-              <%= t("govuk_component.related_items.more", default: "More") %>
-              <% if section[:title] %>
-                <span class="visuallyhidden">
-                  <%= t("govuk_component.related_items.in", default: "in") %>
-                  <%= section[:title] %>
-                </span>
-              <% end %>
-            </a>
-          </li>
-        <% end %>
-      </ul>
-    </nav>
-  <% end %>
-</aside>
+<% if local_assigns[:sections] && !sections.blank? %>
+  <aside class="govuk-related-items" role="complementary">
+    <% sections.each do |section| %>
+      <h2
+        <% if section[:id] %>id="<%= section[:id] %>"<% end %>
+      >
+        <%= section[:title] %>
+      </h2>
+      <nav role="navigation" <% if section[:id] %>aria-labelledby="<%= section[:id] %>"<% end %>>
+        <ul>
+          <% section[:items].each do |item| %>
+            <li>
+              <a
+                href="<%= item[:url] %>"
+                <% if item[:rel] %>rel="<%= item[:rel] %>"<% end %>
+              >
+                <%= item[:title] %>
+              </a>
+            </li>
+          <% end %>
+          <% if section[:url] %>
+            <li class="related-items-more">
+              <a href="<%= section[:url] %>">
+                <%= t("govuk_component.related_items.more", default: "More") %>
+                <% if section[:title] %>
+                  <span class="visuallyhidden">
+                    <%= t("govuk_component.related_items.in", default: "in") %>
+                    <%= section[:title] %>
+                  </span>
+                <% end %>
+              </a>
+            </li>
+          <% end %>
+        </ul>
+      </nav>
+    <% end %>
+  </aside>
+<% end %>

test/govuk_component/related_items_test.rb

@@ -7,8 +7,7 @@ def component_name
 
   test "no error if no parameters passed in" do
     assert_nothing_raised do
-      render_component({})
-      assert_select ".govuk-related-items"
+      assert_empty render_component({})
     end
   end