Remove deprecated section meta tags.

alext · alext · commit d397d13352b3 · 2012-09-17T15:04:34.000Z
diff --git a/app/presenters/flow_registration_presenter.rb b/app/presenters/flow_registration_presenter.rb
@@ -17,10 +17,6 @@ def title
     lookup_translation("title") || @flow.name.to_s.humanize
   end
 
-  def section
-    lookup_translation("section") || @flow.section_slug.try(:humanize)
-  end
-
   def paths
     [@flow.name, "#{@flow.name}.json"]
   end
diff --git a/app/presenters/smart_answer_presenter.rb b/app/presenters/smart_answer_presenter.rb
@@ -8,7 +8,7 @@ class SmartAnswerPresenter
 
   attr_reader :request, :params, :flow
 
-  def_delegators :@flow, :section_slug, :subsection_slug, :need_id
+  def_delegators :@flow, :need_id
 
   def initialize(request, flow)
     @request = request
@@ -39,10 +39,6 @@ def title
     lookup_translation(:title) || @flow.name.to_s.humanize
   end
 
-  def section_name
-    lookup_translation(:section_name) || @flow.section_slug.to_s.humanize
-  end
-
   def subtitle
     lookup_translation(:subtitle)
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,7 +3,6 @@
   <head>
     <title><%= yield :title %> | GOV.UK</title>
     <%= javascript_include_tag "smart-answers", defer: true %>
-    <%= yield :section_meta_tags %>
     <%= yield :head %>
   </head>
 <body class="mainstream">
diff --git a/app/views/smart_answers/show.html.erb b/app/views/smart_answers/show.html.erb
@@ -1,9 +1,4 @@
 <% content_for :title do %><%= @presenter.title %><% end %>
-<% content_for :section_meta_tags do %>
-<meta name="x-section-name" content="<%= @presenter.section_name %>" />
-<meta name="x-section-link" content="/browse/<%= @presenter.section_slug %>" />
-<meta name="x-section-format" content="smart_answer" />
-<% end %>
 <section id="content"<% if @presenter.started? %> class="smart-answer-questions group"<% end %>>
   <%= render partial: "content" %>
 </section>
diff --git a/test/functional/smart_answers_controller_test.rb b/test/functional/smart_answers_controller_test.rb
@@ -95,12 +95,6 @@ def submit_json_response(response = nil, other_params = {})
       assert_select "head meta[name=robots][content=noindex]"
     end
 
-    should "send slimmer section meta tags" do
-      get :show, id: 'sample'
-      assert_select "head meta[name=x-section-name][content=Family]"
-      assert_select "head meta[name=x-section-link][content=/browse/family]"
-    end
-
     should "send the artefact to slimmer" do
       artefact = artefact_for_slug('sample')
       SmartAnswerPresenter.any_instance.stubs(:artefact).returns(artefact)
@@ -109,14 +103,6 @@ def submit_json_response(response = nil, other_params = {})
       get :show, id: 'sample'
     end
 
-    should "look up section name in translation file" do
-      using_translation_file(fixture_file('smart_answers_controller_test/section_name.yml')) do
-        get :show, id: 'sample'
-      end
-      assert_select 'head meta[name=x-section-name][content="Section Name From Translation File"]'
-      assert_select "head meta[name=x-section-link][content=/browse/family]"
-    end
-
     should "send slimmer analytics headers" do
       get :show, id: 'sample'
       assert_equal "smart_answer", @response.headers["X-Slimmer-Format"]
diff --git a/test/unit/flow_registration_presenter_test.rb b/test/unit/flow_registration_presenter_test.rb
@@ -41,23 +41,6 @@ def teardown
     end
   end
 
-  context "section" do
-    should "use the translated section_name" do
-      assert_equal "SECTION", @presenter.section
-    end
-
-    should "use the humanized section_slug if no translation is available" do
-      I18n.stubs(:translate!).raises(I18n::MissingTranslationData.new(:en, "anything", {}))
-      assert_equal "Sample", @presenter.section
-    end
-
-    should "return nil if there is no translation, and no section_slug defined" do
-      I18n.stubs(:translate!).raises(I18n::MissingTranslationData.new(:en, "anything", {}))
-      @flow.stubs(:section_slug).returns(nil)
-      assert_equal nil, @presenter.section
-    end
-  end
-
   context "paths" do
     should "generate flow.name and flow.name.json" do
       assert_equal ["flow-sample", "flow-sample.json"], @presenter.paths
