slimmer 3.0.0 → 3.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.1.0
+
+* 'Breadcrumb' trail is now populated from the artefact data. It adds the section.
+subsection, and title.
+
 # 3.0.0
 
 Backwards-incompatible changes:

data/lib/slimmer/artefact.rb

@@ -8,12 +8,24 @@ class Slimmer::Artefact
   end
 
   def tags_of_type(type)
-    return [] unless @data.has_key?("tags")
-    @data["tags"].select do |t|
+    return [] unless self.tags
+    self.tags.select do |t|
       t["details"]["type"] == type
     end
   end
 
+  def primary_section
+    tags_of_type("section").first
+  end
+
+  def primary_root_section
+    section = primary_section
+    while section and section["parent"]
+      section = section["parent"]
+    end
+    section
+  end
+
   def legacy_sources
     tags_of_type('legacy_source').map do |t|
       id_to_slug(t["id"])
@@ -21,14 +33,16 @@ class Slimmer::Artefact
   end
 
   def related_artefacts
-    return [] unless @data.has_key?("related")
-    @data["related"].map do |r|
+    return [] unless self.related
+    self.related.map do |r|
       self.class.new(r)
     end
   end
 
   def method_missing(name, *args)
-    @data[name.to_s] || @data["details"][name.to_s]
+    value = @data[name.to_s]
+    value ||= @data["details"][name.to_s] if @data["details"]
+    value
   end
 
   private

data/lib/slimmer/headers.rb

@@ -31,5 +31,19 @@ module Slimmer
       artefact = artefact_input.dup
       headers[ARTEFACT_HEADER] = artefact.to_json
     end
+
+    def set_slimmer_dummy_artefact(details = {})
+      artefact = {}
+      artefact["title"] = details[:title] if details[:title]
+      if details[:section_name] and details[:section_link]
+        tag = {
+          "title" => details[:section_name],
+          "details" => {"type" => "section"},
+          "content_with_tag" => {"web_url" => details[:section_link]},
+        }
+        artefact["tags"] = [tag]
+      end
+      headers[ARTEFACT_HEADER] = artefact.to_json
+    end
   end
 end

data/lib/slimmer/processors/logo_class_inserter.rb

@@ -8,23 +8,13 @@ module Slimmer
       end
 
       def filter(source, dest)
-        return unless @artefact and @artefact["tags"]
-        classes_to_use = LOGO_CLASSES & legacy_sources
+        return unless @artefact
+        classes_to_use = LOGO_CLASSES & @artefact.legacy_sources
         wrapper = dest.css('#wrapper')
         classes_to_use.each do |klass|
           wrapper.add_class(klass)
         end
       end
-
-      def legacy_sources
-        legacy_source_tags = @artefact["tags"].select do |tag| 
-          tag["details"]["type"] == "legacy_source"
-        end
-        legacy_sources = legacy_source_tags.map do |tag| 
-          tag["id"].split("/").last.chomp(".json")
-        end
-        legacy_sources
-      end
     end
   end
 end

data/lib/slimmer/processors/related_items_inserter.rb

@@ -12,29 +12,11 @@ class Slimmer::Processors::RelatedItemsInserter
     end
   end
   
+  private
+
   def related_item_block
     artefact = @artefact
-    root_primary_section = root_primary_section(artefact)
-    related_block_template = @skin.template('related.raw')
-    html = ERB.new(related_block_template).result(binding)
+    html = ERB.new(@skin.template('related.raw')).result(binding)
     Nokogiri::HTML.fragment(html)
   end
-
-  # Duplicated in Frontend
-  def root_primary_section(artefact)
-    primary_section = artefact["tags"].detect do |tag| 
-      tag["details"]["type"] == "section"
-    end
-
-    if primary_section.nil?
-      nil
-    else
-      if primary_section["parent"]
-        primary_section["parent"]
-      else
-        primary_section
-      end
-    end
-  end
-
 end

data/lib/slimmer/processors/section_inserter.rb

@@ -1,20 +1,37 @@
 module Slimmer::Processors
   class SectionInserter
+    def initialize(artefact)
+      @artefact = artefact
+    end
+
     def filter(src,dest)
-      meta_name = dest.at_css('meta[name="x-section-name"]')
-      meta_link = dest.at_css('meta[name="x-section-link"]')
-      list = dest.at_css('nav[role=navigation] ol')
+      if @artefact and (list = dest.at_css('.header-context nav[role=navigation] ol'))
+        if (section = @artefact.primary_section)
+          append_tag(list, section["parent"]) if section["parent"]
+          append_tag(list, section)
+        end
+        append_text(list, @artefact.title) if @artefact.title and @artefact.title !~ /\A\s*\z/
+      end
+    end
 
-      if meta_name && meta_link && list
-        link_node = Nokogiri::XML::Node.new('a', dest)
-        link_node['href'] = meta_link['content']
-        link_node.content = meta_name['content']
+    private
 
-        list_item = Nokogiri::XML::Node.new('li', dest)
-        list_item.add_child(link_node)
+    def append_tag(list, tag)
+      link_node = Nokogiri::XML::Node.new('a', list)
+      link_node['href'] = tag["content_with_tag"]["web_url"]
+      link_node.content = tag["title"]
 
-        list.add_child(list_item)
-      end
+      list_item = Nokogiri::XML::Node.new('li', list)
+      list_item.add_child(link_node)
+
+      list.add_child(list_item)
+    end
+
+    def append_text(list, text)
+      list_item = Nokogiri::XML::Node.new('li', list)
+      list_item.content = text
+
+      list.add_child(list_item)
     end
   end
 end

data/lib/slimmer/skin.rb

@@ -128,7 +128,7 @@ module Slimmer
         Processors::BodyInserter.new(options[:wrapper_id] || 'wrapper'),
         Processors::BodyClassCopier.new,
         Processors::HeaderContextInserter.new(),
-        Processors::SectionInserter.new(),
+        Processors::SectionInserter.new(artefact),
         Processors::GoogleAnalyticsConfigurator.new(response),
         Processors::SearchPathSetter.new(response),
         Processors::RelatedItemsInserter.new(self, artefact),
@@ -149,10 +149,13 @@ module Slimmer
 
     def artefact_from_header(response)
       if response.headers.include?(Headers::ARTEFACT_HEADER)
-        JSON.parse(response.headers[Headers::ARTEFACT_HEADER])
+        Artefact.new JSON.parse(response.headers[Headers::ARTEFACT_HEADER])
       else
         nil
       end
+    rescue JSON::ParserError => e
+      logger.error "Slimmer: Failed while parsing artefact header: #{[ e.message, e.backtrace ].flatten.join("\n")}"
+      nil
     end
   end
 end

data/lib/slimmer/test_template.rb

@@ -19,12 +19,13 @@ module Slimmer::TestTemplate
         <script src="http://static.preview.alphagov.co.uk/static/jquery.tabs.js" defer></script>
       </head>
       <body>
-        <nav role="navigation" class="header-context">
-          <ol class="group">
-            <li><a href="/">Home</a></li>
-            <li><a href="/browse">All sections</a></li>
-          </ol>
-        </nav>
+        <div class="header-context">
+          <nav role="navigation">
+            <ol class="group">
+              <li><a href="/">Home</a></li>
+            </ol>
+          </nav>
+        </div>
 
         <div id="wrapper"></div>
       </body>

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/test/artefact_test.rb

@@ -9,6 +9,66 @@ describe Slimmer::Artefact do
     assert_equal 'vat-rates', a.slug
   end
 
+  describe "Primary section" do
+    before do
+      @data = artefact_for_slug('something')
+      @tag1 = tag_for_slug("fooey", "section")
+      @tag2 = tag_for_slug("gooey", "section")
+      @data["tags"] << @tag1 << @tag2
+    end
+
+    it "should return the first section tag" do
+      assert_equal @tag1, Slimmer::Artefact.new(@data).primary_section
+    end
+
+    it "should ignore other tag types" do
+      @data["tags"].unshift(tag_for_slug("businesslink", "legacy_source"))
+      assert_equal @tag1, Slimmer::Artefact.new(@data).primary_section
+    end
+
+    it "should return nil if there are no sections" do
+      @data["tags"] = [tag_for_slug("businesslink", "legacy_source")]
+      assert_equal nil, Slimmer::Artefact.new(@data).primary_section
+    end
+
+    it "should return nil if there is no tags element" do
+      @data.delete("tags")
+      assert_equal nil, Slimmer::Artefact.new(@data).primary_section
+    end
+  end
+
+  describe "Primary root section" do
+    before do
+      @artefact = Slimmer::Artefact.new(artefact_for_slug('something'))
+      @tag1 = tag_for_slug("fooey", "section")
+      @tag2 = tag_for_slug("gooey", "section")
+      @tag3 = tag_for_slug("kablooie", "section")
+    end
+
+    it "should return the primary section if it has no parent" do
+      @artefact.stubs(:primary_section).returns(@tag1)
+      assert_equal @tag1, @artefact.primary_root_section
+    end
+
+    it "should return the primary section's parent" do
+      @tag1["parent"] = @tag2
+      @artefact.stubs(:primary_section).returns(@tag1)
+      assert_equal @tag2, @artefact.primary_root_section
+    end
+
+    it "should support arbitrarily deep heirarchies" do
+      @tag1["parent"] = @tag3
+      @tag3["parent"] = @tag2
+      @artefact.stubs(:primary_section).returns(@tag1)
+      assert_equal @tag2, @artefact.primary_root_section
+    end
+
+    it "should return nil if there is no primary section" do
+      @artefact.stubs(:primary_section).returns(nil)
+      assert_equal nil, @artefact.primary_root_section
+    end
+  end
+
   describe "Related artefacts" do
     before do
       @data = artefact_for_slug('something')
@@ -74,5 +134,10 @@ describe Slimmer::Artefact do
     it "should return nil if the field doesn't exist" do
       assert_equal nil, @a.non_existent
     end
+
+    it "should not blow up if the details attribute doesn't exist" do
+      @data.delete("details")
+      assert_equal nil, @a.non_existent
+    end
   end
 end

data/test/fixtures/related.raw.html.erb

@@ -10,21 +10,18 @@
         <h2>More like this:</h2>
         <nav role="navigation">
           <ul>
-            <!-- Content API style Artefact -->
-            <% if artefact["related"] %>
-              <% if artefact["related"].any? %>
-                <% artefact["related"].each do |item| %>
-
-                  <li>
-                    <a href="<%= h item["web_url"] %>"><%= h item["title"] %></a>
-                  </li>
-                <% end %>
+            <%# Content API style Artefact %>
+            <% if artefact.respond_to?(:related_artefacts) %>
+              <% artefact.related_artefacts.each do |item| %>
+                <li>
+                  <a href="<%= h item.web_url %>"><%= h item.title %></a>
+                </li>
               <% end %>
-              <% if root_primary_section %>
-                <li class="related-topic"><a href="<%= root_primary_section["content_with_tag"]["web_url"] %>"
-                  >More from the <span><%= h root_primary_section["title"] %></span> category</a></li>
+              <% if root_section = artefact.root_primary_section %>
+                <li class="related-topic"><a href="<%= h root_section["content_with_tag"]["web_url"] %>"
+                  >More from the <span><%= h root_section["title"] %></span> category</a></li>
               <% end %>
-            <% else %> <!-- Panopticon API style Artefact (deprecated) -->
+            <% else %> <%# Panopticon API style Artefact (deprecated) %>
               <% if artefact["related_items"].any? %>
                 <% artefact["related_items"].each do |item| %>
                   <% if item["artefact"] %>

data/test/headers_test.rb

@@ -84,4 +84,24 @@ describe Slimmer::Headers do
       assert_equal artefact_copy, artefact
     end
   end
+
+  describe "setting a dummy artefact in the artefact header" do
+    it "should setup an artefact title" do
+      self.set_slimmer_dummy_artefact(:title => "Foo")
+
+      artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
+
+      assert_equal "Foo", artefact["title"]
+    end
+
+    it "should setup a section tag for the given name and link" do
+      self.set_slimmer_dummy_artefact(:section_name => "Foo", :section_link => "/something/foo")
+
+      artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
+
+      assert_equal "Foo", artefact["tags"][0]["title"]
+      assert_equal "section", artefact["tags"][0]["details"]["type"]
+      assert_equal "/something/foo", artefact["tags"][0]["content_with_tag"]["web_url"]
+    end
+  end
 end

data/test/processors/logo_class_inserter_test.rb

@@ -9,7 +9,7 @@ describe Slimmer::Processors::LogoClassInserter do
     legacy_sources.each do |legacy_source|
       artefact["tags"] << tag_for_slug(legacy_source, "legacy_source")
     end
-    artefact
+    Slimmer::Artefact.new(artefact)
   end
 
   def business_link_artefact
@@ -68,7 +68,7 @@ describe Slimmer::Processors::LogoClassInserter do
 
   it "should do nothing if the artefact has no tag_ids" do
     template = example_template
-    artefact = artefact_for_slug("vat")
+    artefact = Slimmer::Artefact.new(artefact_for_slug("vat"))
     process(artefact, template)
     assert_in template, "div#wrapper"
   end

data/test/processors/related_items_inserter_test.rb

@@ -8,7 +8,7 @@ class RelatedItemsInserterTest < MiniTest::Unit::TestCase
     super
     @related_template = File.read( File.dirname(__FILE__) + "/../fixtures/related.raw.html.erb" )
     @skin = stub("Skin", :template => @related_template)
-    @artefact = artefact_for_slug_with_related_artefacts("vat", ["vat-rates", "starting-to-import"])
+    @artefact = Slimmer::Artefact.new artefact_for_slug_with_related_artefacts("vat", ["vat-rates", "starting-to-import"])
   end
   
   def test_should_add_related_items

data/test/processors/section_inserter_test.rb

@@ -1,105 +1,190 @@
 require_relative "../test_helper"
+require 'gds_api/test_helpers/content_api'
 
 class SectionInserterTest < MiniTest::Unit::TestCase
+  include GdsApi::TestHelpers::ContentApi
 
-  # Note: the SectionInserter processor runs after the TagMover processor, so the meta
-  # tags have already been moved into the destination template
+  def create_artefact(slug, attributes = {})
+    if section_slug = attributes.delete("section_slug")
+      if subsection_slug = attributes.delete("subsection_slug")
+        a = artefact_for_slug_in_a_subsection(slug, "#{section_slug}/#{subsection_slug}")
+      else
+        a = artefact_for_slug_in_a_section(slug, section_slug)
+      end
+    else
+      a = artefact_for_slug(slug)
+    end
+    Slimmer::Artefact.new(a.merge(attributes))
+  end
+
+  def test_should_add_section_link_and_title_to_breadcrumb
+    artefact = create_artefact("something",
+                               "section_slug" => "business",
+                               "title" => "Something gooey")
 
-  def test_should_add_section_link_to_breadcrumb
     template = as_nokogiri %{
       <html>
-        <head>
-          <meta content="Business" name="x-section-name">
-          <meta content="/browse/business" name="x-section-link">
-        </head>
         <body>
-          <nav role="navigation">
-            <ol><li><a href="/">Home</a></li></ol>
-          </nav>
+          <div class="header-context">
+            <nav role="navigation">
+              <ol class="group">
+                <li><a href="/">Home</a></li>
+              </ol>
+            </nav>
+          </div>
         </body>
       </html>
     }
 
-    Slimmer::Processors::SectionInserter.new.filter(:any_source, template)
-    assert_in template, "nav[role=navigation] ol li:nth-child(1)", %{<a href="/">Home</a>}
-    assert_in template, "nav[role=navigation] ol li:nth-child(2)", %{<a href="/browse/business">Business</a>}
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
+    list = template.at_css(".header-context nav[role=navigation] ol")
+    assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
+    assert_in list, "li:nth-child(2)", %{<a href="https://www.test.gov.uk/browse/business">Business</a>}
+    assert_in list, "li:nth-child(3)", %{Something gooey}
   end
 
-  def test_should_add_section_link_after_last_item_in_breadcrumb
+  def test_should_add_section_link_subsection_link_and_title_to_breadcrumb
+    artefact = create_artefact("something",
+                               "section_slug" => "business",
+                               "subsection_slug" => "employing-people",
+                               "title" => "Something gooey")
+
     template = as_nokogiri %{
       <html>
-        <head>
-          <meta content="Business" name="x-section-name">
-          <meta content="/browse/business" name="x-section-link">
-        </head>
         <body>
-          <nav role="navigation">
-            <ol>
-              <li><a href="/">Home</a></li>
-              <li><a href="/browse">All Sections</a></li>
-            </ol>
-          </nav>
+          <div class="header-context">
+            <nav role="navigation">
+              <ol class="group"><li><a href="/">Home</a></li></ol>
+            </nav>
+          </div>
         </body>
       </html>
     }
 
-    Slimmer::Processors::SectionInserter.new.filter(:any_source, template)
-    assert_in template, "nav[role=navigation] ol li:nth-child(1)", %{<a href="/">Home</a>}
-    assert_in template, "nav[role=navigation] ol li:nth-child(2)", %{<a href="/browse">All Sections</a>}
-    assert_in template, "nav[role=navigation] ol li:nth-child(3)", %{<a href="/browse/business">Business</a>}
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
+    list = template.at_css(".header-context nav[role=navigation] ol")
+    assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
+    assert_in list, "li:nth-child(2)", %{<a href="https://www.test.gov.uk/browse/business">Business</a>}
+    assert_in list, "li:nth-child(3)", %{<a href="https://www.test.gov.uk/browse/business/employing-people">Employing people</a>}
+    assert_in list, "li:nth-child(4)", %{Something gooey}
   end
 
-  def test_should_not_add_section_link_if_no_section_name_tag
+  def test_should_not_append_title_if_its_blank
+    artefact = create_artefact("something",
+                               "section_slug" => "business",
+                               "subsection_slug" => "employing-people",
+                               "title" => nil)
+
     template = as_nokogiri %{
       <html>
-        <head>
-          <meta content="/browse/business" name="x-section-link">
-        </head>
         <body>
-          <nav role="navigation">
-            <ol><li><a href="/">Home</a></li></ol>
-          </nav>
+          <div class="header-context">
+            <nav role="navigation">
+              <ol class="group"><li><a href="/">Home</a></li></ol>
+            </nav>
+          </div>
         </body>
       </html>
     }
 
-    Slimmer::Processors::SectionInserter.new.filter(:any_source, template)
-    assert_in template, "nav[role=navigation] ol li:nth-child(1)", %{<a href="/">Home</a>}
-    assert_not_in template, "nav[role=navigation] ol li:nth-child(2)"
+    t = template.dup
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, t)
+    list = t.at_css(".header-context nav[role=navigation] ol")
+    assert_not_in list, "li:nth-child(4)"
+
+    artefact = create_artefact("something",
+                               "section_slug" => "business",
+                               "subsection_slug" => "employing-people",
+                               "title" => "")
+
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
+    list = template.at_css(".header-context nav[role=navigation] ol")
+    assert_not_in list, "li:nth-child(4)"
   end
 
-  def test_should_not_add_section_link_if_no_section_link_tag
+  def test_should_add_links_after_last_item_in_breadcrumb
+    artefact = create_artefact("something",
+                               "section_slug" => "business",
+                               "subsection_slug" => "employing-people",
+                               "title" => "Something gooey")
+
     template = as_nokogiri %{
       <html>
-        <head>
-          <meta content="Business" name="x-section-name">
-        </head>
         <body>
-          <nav role="navigation">
-            <ol><li><a href="/">Home</a></li></ol>
-          </nav>
+          <div class="header-context">
+            <nav role="navigation">
+              <ol class="group">
+                <li><a href="/">Home</a></li>
+                <li><a href="/browse">All Sections</a></li>
+              </ol>
+            </nav>
+          </div>
         </body>
       </html>
     }
 
-    Slimmer::Processors::SectionInserter.new.filter(:any_source, template)
-    assert_in template, "nav[role=navigation] ol li:nth-child(1)", %{<a href="/">Home</a>}
-    assert_not_in template, "nav[role=navigation] ol li:nth-child(2)"
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
+    list = template.at_css(".header-context nav[role=navigation] ol")
+    assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
+    assert_in list, "li:nth-child(2)", %{<a href="/browse">All Sections</a>}
+    assert_in list, "li:nth-child(3)", %{<a href="https://www.test.gov.uk/browse/business">Business</a>}
+    assert_in list, "li:nth-child(4)", %{<a href="https://www.test.gov.uk/browse/business/employing-people">Employing people</a>}
+    assert_in list, "li:nth-child(5)", %{Something gooey}
   end
 
   def test_should_do_nothing_if_navigation_not_in_template
+    artefact = create_artefact("something")
     template = as_nokogiri %{
       <html>
-        <head>
-          <meta content="Business" name="x-section-name">
-          <meta content="/browse/business" name="x-section-link">
-        </head>
         <body>
         </body>
       </html>
     }
 
-    Slimmer::Processors::SectionInserter.new.filter(:any_source, template)
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
     assert_not_in template, "nav[role=navigation]"
   end
+
+  def test_should_do_nothing_with_no_artefact
+    template = as_nokogiri %{
+      <html>
+        <body>
+          <div class="header-context">
+            <nav role="navigation">
+              <ol class="group"><li><a href="/">Home</a></li></ol>
+            </nav>
+          </div>
+        </body>
+      </html>
+    }
+
+    Slimmer::Processors::SectionInserter.new(nil).filter(:any_source, template)
+    list = template.at_css(".header-context nav[role=navigation] ol")
+    assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
+    assert_not_in list, "li:nth-child(2)"
+  end
+
+  def test_should_not_fail_with_no_sections
+    artefact = create_artefact("something",
+                               "title" => "Something gooey")
+
+    template = as_nokogiri %{
+      <html>
+        <body>
+          <div class="header-context">
+            <nav role="navigation">
+              <ol class="group">
+                <li><a href="/">Home</a></li>
+              </ol>
+            </nav>
+          </div>
+        </body>
+      </html>
+    }
+
+    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
+    list = template.at_css(".header-context nav[role=navigation] ol")
+    assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
+    assert_in list, "li:nth-child(2)", %{Something gooey}
+  end
 end

data/test/skin_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 class SkinTest < MiniTest::Unit::TestCase
   def test_template_can_be_loaded
@@ -54,3 +54,30 @@ class SkinTest < MiniTest::Unit::TestCase
     end
   end
 end
+
+describe Slimmer::Skin do
+
+  describe "parsing artefact from header" do
+    before do
+      @skin = Slimmer::Skin.new
+      @headers = {}
+      @response = stub("Response", :headers => @headers)
+    end
+
+    it "should construct and return an artefact with the parsed json" do
+      data = {"foo" => "bar", "baz" => 1}
+      @headers[Slimmer::Headers::ARTEFACT_HEADER] = data.to_json
+      Slimmer::Artefact.expects(:new).with(data).returns(:an_artefact)
+      assert_equal :an_artefact, @skin.artefact_from_header(@response)
+    end
+
+    it "should return nil if there is no artefact header" do
+      assert_equal nil, @skin.artefact_from_header(@response)
+    end
+
+    it "should return nil if there is invalid JSON in the artefact header" do
+      @headers[Slimmer::Headers::ARTEFACT_HEADER] = "fooey"
+      assert_equal nil, @skin.artefact_from_header(@response)
+    end
+  end
+end

data/test/typical_usage_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 module TypicalUsage
 
@@ -52,8 +52,6 @@ module TypicalUsage
       <html>
       <head><title>The title of the page</title>
       <meta name="something" content="yes">
-      <meta name="x-section-name" content="This section">
-      <meta name="x-section-link" content="/this_section">
       <script src="blah.js"></script>
       <link href="app.css" rel="stylesheet" type="text/css">
       </head>
@@ -72,14 +70,12 @@ module TypicalUsage
   class NormalResponseTest < SlimmerIntegrationTest
     def setup
       super
-      @artefact = artefact_for_slug("some-slug")
+      @artefact = artefact_for_slug_in_a_section("some-article", 'this-section')
       @artefact["tags"] << tag_for_slug("directgov", "legacy_source")
       given_response 200, %{
         <html>
         <head><title>The title of the page</title>
         <meta name="something" content="yes">
-        <meta name="x-section-name" content="This section">
-        <meta name="x-section-link" content="/this_section">
         <script src="blah.js"></script>
         <link href="app.css" rel="stylesheet" type="text/css">
         </head>
@@ -114,8 +110,9 @@ module TypicalUsage
       assert_rendered_in_template "body.body_class"
     end
 
-    def test_should_insert_meta_navigation_links_into_the_navigation
-      assert_rendered_in_template "nav[role=navigation] li a[href='/this_section']", "This section"
+    def test_should_insert_section_links_into_the_navigation
+      assert_rendered_in_template "nav[role=navigation] li a[href='https://www.test.gov.uk/browse/this-section']", "This section"
+      assert_rendered_in_template "nav[role=navigation] li:last-child", "Some article"
     end
 
     def test_should_add_logo_classes_to_wrapper
@@ -173,8 +170,8 @@ module TypicalUsage
     end
 
     def test_should_insert_related_items_block
-      assert_rendered_in_template "div.related nav li a", "How to test computer software automatically"
-      assert_rendered_in_template "div.related nav li", %r{href="https://www.test.gov.uk/how-to-test-computer-software-automatically"}
+      assert_rendered_in_template "div.related nav li a[href='https://www.test.gov.uk/how-to-test-computer-software-automatically']",
+        "How to test computer software automatically"
     end
   end
 
@@ -200,8 +197,6 @@ module TypicalUsage
       <html>
       <head><title>The title of the page</title>
       <meta name="something" content="yes">
-      <meta name="x-section-name" content="This section">
-      <meta name="x-section-link" content="/this_section">
       <script src="blah.js"></script>
       <link href="app.css" rel="stylesheet" type="text/css">
       </head>
@@ -242,8 +237,6 @@ module TypicalUsage
       <html>
       <head><title>500 Error</title>
       <meta name="something" content="yes">
-      <meta name="x-section-name" content="This section">
-      <meta name="x-section-link" content="/this_section">
       <script src="blah.js"></script>
       <link href="app.css" rel="stylesheet" type="text/css">
       </head>
@@ -273,8 +266,6 @@ module TypicalUsage
       <html>
       <head><title>404 Missing</title>
       <meta name="something" content="yes">
-      <meta name="x-section-name" content="This section">
-      <meta name="x-section-link" content="/this_section">
       <script src="blah.js"></script>
       <link href="app.css" rel="stylesheet" type="text/css">
       </head>
@@ -304,8 +295,6 @@ module TypicalUsage
       <html>
       <head><title>406 Not Acceptable</title>
       <meta name="something" content="yes">
-      <meta name="x-section-name" content="This section">
-      <meta name="x-section-link" content="/this_section">
       <script src="blah.js"></script>
       <link href="app.css" rel="stylesheet" type="text/css">
       </head>

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 Z
+date: 2012-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -141,7 +141,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.9.1
+        version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: *id012
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2567614616492657902
+      hash: 2041451578136689132
       segments: 
       - 0
       version: "0"
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2567614616492657902
+      hash: 2041451578136689132
       segments: 
       - 0
       version: "0"