Merge pull request #1068 from alphagov/fix-links-out-content-nav

Fix content out links for content pages AB
alphagov · Sep 3, 2018 · d683e9d · d683e9d
2 parents c51a56a + 108b365
commit d683e9d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb
@@ -72,7 +72,7 @@ def load_taxonomy_navigation
 
       @taxonomy_navigation = {}
       @content_item.links_out_supergroups.each do |supergroup|
-        supergroup_taxon_links = "Supergroups::#{supergroup.camelcase}".constantize.new(current_base_path, taxon_ids, filter_content_purpose_subgroup: @content_item.links_out_subgroups)
+        supergroup_taxon_links = "Supergroups::#{supergroup.camelcase}".constantize.new(current_base_path, taxon_ids, filter_content_purpose_subgroup: @content_item.links_out_subgroups(supergroup))
         @taxonomy_navigation[supergroup.to_sym] = supergroup_taxon_links.tagged_content
       end
 

diff --git a/app/presenters/content_item/links_out.rb b/app/presenters/content_item/links_out.rb
@@ -4,8 +4,8 @@ def links_out_supergroups
       @links_out_supergroups ||= fetch_links_out_supergroups
     end
 
-    def links_out_subgroups
-      @links_out_subgroups ||= fetch_links_out_subgroups
+    def links_out_subgroups(supergroup)
+      fetch_links_out_subgroups(supergroup)
     end
 
   private
@@ -14,10 +14,10 @@ def fetch_links_out_supergroups
       links_out.map { |link| link["supergroup"] }.uniq
     end
 
-    def fetch_links_out_subgroups
+    def fetch_links_out_subgroups(supergroup)
       subgroups = []
       links_out.each do |link|
-        if link["type"] == "content_purpose_subgroup"
+        if link["type"] == "content_purpose_subgroup" && link["supergroup"] == supergroup
           subgroups << link["title"]
         end
       end

diff --git a/app/presenters/supergroups/supergroup.rb b/app/presenters/supergroups/supergroup.rb
@@ -3,7 +3,7 @@ class Supergroup
     def initialize(current_path, taxon_ids, filters, content_order_class)
       @current_path = current_path
       @taxon_ids = taxon_ids
-      @filters = default_filters.merge(filters)
+      @filters = filters.merge(default_filters)
       @content = fetch_content(content_order_class)
     end
 

diff --git a/test/presenters/content_item/links_out_test.rb b/test/presenters/content_item/links_out_test.rb
@@ -100,7 +100,7 @@ def assert_returns_guide
   end
 
   def assert_returns_guidance
-    assert_equal %w(guidance), @links_out.links_out_subgroups
+    assert_equal %w(guidance), @links_out.links_out_subgroups("guidance_and_regulation")
   end
 
   def assert_returns_guidance_and_regulation
@@ -220,7 +220,16 @@ def content_item
     amended_rules["document_type"] = nil
 
     stub_load_rules(amended_rules)
-    assert_equal %w(link_to_news), @links_out.links_out_subgroups
+    assert_equal %w(link_to_news), @links_out.links_out_subgroups("news_and_communications")
+  end
+
+  test 'links_out_subgroups returns no subgroup names if content_purpose_subgroup is not a subgroup of the supergroup' do
+    amended_rules = rules
+    amended_rules["content_purpose_subgroup"]["guidance"] << news_rule
+    amended_rules["document_type"] = nil
+
+    stub_load_rules(amended_rules)
+    assert_equal [], @links_out.links_out_subgroups("guidance_and_regulation")
   end
 
   test 'links_out_subgroups returns correct subgroup names for content_purpose_subgroup rules' do
@@ -229,14 +238,14 @@ def content_item
     amended_rules["document_type"] = nil
 
     stub_load_rules(amended_rules)
-    assert_equal %w(link_to_guidance link_to_news), @links_out.links_out_subgroups
+    assert_equal %w(link_to_news), @links_out.links_out_subgroups("news_and_communications")
   end
 
   test 'links_out_subgroups returns correct subgroup names for document_type rules' do
     amended_rules = rules
     amended_rules["document_type"]["guide"] << news_rule
 
     stub_load_rules(amended_rules)
-    assert_equal %w(link_to_news), @links_out.links_out_subgroups
+    assert_equal %w(link_to_news), @links_out.links_out_subgroups("news_and_communications")
   end
 end