rebased

alphagov · Aug 14, 2018 · b549356 · b549356
1 parent 2246cbf
commit b549356
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/app/services/most_popular_content.rb b/app/services/most_popular_content.rb
@@ -4,8 +4,8 @@ class MostPopularContent
   include RummagerFields
 
   attr_reader :content_ids, :current_path, :filters, :number_of_links
-  
-  def initialize(content_ids:, current_path:, filter_content_purpose_supergroup:, number_of_links: 3)
+
+  def initialize(content_ids:, current_path:, filters: {}, number_of_links: 3)
     @content_ids = content_ids
     @current_path = current_path
     @filters = filters

diff --git a/app/services/most_recent_content.rb b/app/services/most_recent_content.rb
@@ -1,7 +1,7 @@
 class MostRecentContent
   attr_reader :content_id, :current_path, :filters, :number_of_links
 
-  def initialize(content_ids:, current_path:, filter_content_purpose_supergroup:, number_of_links: 3)
+  def initialize(content_ids:, current_path:, filters: {}, number_of_links: 3)
     @content_ids = content_ids
     @current_path = current_path
     @filters = filters

diff --git a/test/integration/content_pages_navigation_test.rb b/test/integration/content_pages_navigation_test.rb
@@ -96,7 +96,6 @@ def setup
     assert page.has_css?('.gem-c-highlight-boxes__title[data-track-category="ServicesHighlightBoxClicked"]', text: 'Free school meals form')
     assert page.has_css?('.gem-c-highlight-boxes__title[data-track-action="1"]', text: 'Free school meals form')
     assert page.has_css?('.gem-c-highlight-boxes__title[data-track-label="/government/publications/meals"]', text: 'Free school meals form')
-    assert_has_services_section
   end
 
   test "does not show the Services section if there is no tagged content" do
@@ -122,7 +121,11 @@ def setup
 
     setup_and_visit_content_item_with_taxons('guide', taxons)
 
-    assert_has_policy_and_engagement_section
+    assert page.has_css?('h3', text: "Policy and engagement")
+
+    assert page.has_css?('.gem-c-document-list__item a[data-track-category="policyAndEngagementDocumentListClicked"]', text: 'Free school meals form')
+    assert page.has_css?('.gem-c-document-list__item a[data-track-action="1"]', text: 'Free school meals form')
+    assert page.has_css?('.gem-c-document-list__item a[data-track-label="/government/publications/meals"]', text: 'Free school meals form')
   end
 
   test "does not show the Policy section if there is no tagged content" do
@@ -200,15 +203,12 @@ def setup
 
     setup_and_visit_content_item_with_taxons('guide', taxons)
 
-<<<<<<< HEAD
     assert page.has_css?('h3', text: "News and communications")
     assert page.has_css?('.gem-c-image-card__title', text: 'Free school meals form')
     assert page.has_css?('.gem-c-image-card__title-link[data-track-category="newsAndCommunicationsImageCardClicked"]', text: 'Free school meals form')
     assert page.has_css?('.gem-c-image-card__title-link[data-track-action="1"]', text: 'Free school meals form')
     assert page.has_css?('.gem-c-image-card__title-link[data-track-label="/government/publications/meals"]', text: 'Free school meals form')
-=======
     assert_has_news_and_communications_section
->>>>>>> Add links out to configure taxonomy navigation
   end
 
   test "does not show the News and comms section if there is no tagged content" do

diff --git a/test/support/content_pages_nav_test_helper.rb b/test/support/content_pages_nav_test_helper.rb
@@ -120,10 +120,6 @@ def assert_has_services_section
     assert page.has_css?('.gem-c-highlight-boxes__title[data-track-category="ServicesHighlightBoxClicked"]', text: 'Free school meals form')
     assert page.has_css?('.gem-c-highlight-boxes__title[data-track-action="1"]', text: 'Free school meals form')
     assert page.has_css?('.gem-c-highlight-boxes__title[data-track-label="/government/publications/meals"]', text: 'Free school meals form')
-
-    assert page.has_css?('.gem-c-document-list__item a[data-track-category="ServicesDocumentListClicked"]', text: 'Free school meals form')
-    assert page.has_css?('.gem-c-document-list__item a[data-track-action="1"]', text: 'Free school meals form')
-    assert page.has_css?('.gem-c-document-list__item a[data-track-label="/government/publications/meals"]', text: 'Free school meals form')
   end
 
   def assert_has_policy_and_engagement_section