Merge pull request #975 from alphagov/revert-973-track-theme

Revert "Track themes"
alphagov · Mar 29, 2017 · 6e9b997 · 6e9b997
2 parents e00df44 + d53f3b8
commit 6e9b997
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 134 deletions.
diff --git a/app/assets/javascripts/analytics/static-analytics.js b/app/assets/javascripts/analytics/static-analytics.js
@@ -99,7 +99,6 @@
   };
 
   StaticAnalytics.prototype.setDimensionsThatHaveDefaultValues = function(dimensions) {
-    this.setThemesDimension(dimensions['themes']);
     this.setNavigationPageTypeDimension(dimensions['navigation-page-type']);
     this.setUserJourneyStage(dimensions['user-journey-stage']);
   };
@@ -166,10 +165,6 @@
     this.setDimension(2, format);
   };
 
-  StaticAnalytics.prototype.setThemesDimension = function(themes) {
-    this.setDimension(3, themes || 'other');
-  };
-
   StaticAnalytics.prototype.setResultCountDimension = function(count) {
     this.setDimension(5, count);
   };

diff --git a/app/views/govuk_component/analytics_meta_tags.raw.html.erb b/app/views/govuk_component/analytics_meta_tags.raw.html.erb
@@ -34,27 +34,6 @@
 
   navigation_document_type = content_item_hash[:navigation_document_supertype]
   meta_tags["govuk:navigation-document-type"] = navigation_document_type if navigation_document_type
-
-  def root_taxons(content_item)
-    root_taxon_set = Set.new
-
-    links = content_item[:links]
-    # Taxons will have :parent_taxons, but content items will have :taxons
-    parent_taxons = links[:parent_taxons] || links[:taxons] unless links.nil?
-
-    if parent_taxons.blank?
-      root_taxon_set << content_item[:title] if content_item[:document_type] == 'taxon'
-    else
-      parent_taxons.each do |parent_taxon|
-        root_taxon_set += root_taxons(parent_taxon)
-      end
-    end
-
-    root_taxon_set
-  end
-
-  themes = root_taxons(content_item_hash)
-  meta_tags["govuk:themes"] = themes.to_a.sort.join('; ') unless themes.empty?
 %>
 <% meta_tags.each do |name, content| %>
   <meta name="<%= name %>" content="<%= content %>">

diff --git a/spec/javascripts/analytics/static-analytics-spec.js b/spec/javascripts/analytics/static-analytics-spec.js
@@ -14,7 +14,7 @@ describe("GOVUK.StaticAnalytics", function() {
 
   describe('when created', function() {
     // The number of setup arguments which are set before the dimensions
-    const expectedDefaultArgumentCount = 8;
+    const expectedDefaultArgumentCount = 7;
 
     var universalSetupArguments;
 
@@ -132,23 +132,17 @@ describe("GOVUK.StaticAnalytics", function() {
       });
 
       [
-        {
-          name: 'themes',
-          number: 3,
-          defaultValue: 'other',
-          setupArgumentsIndex: 5
-        },
         {
           name: 'navigation-page-type',
           number: 32,
           defaultValue: 'none',
-          setupArgumentsIndex: 6
+          setupArgumentsIndex: 5
         },
         {
           name: 'user-journey-stage',
           number: 33,
           defaultValue: 'thing',
-          setupArgumentsIndex: 7
+          setupArgumentsIndex: 6
         }
       ].forEach(function (dimension) {
         it('sets the ' + dimension.name + ' dimension from a meta tag if present', function () {

diff --git a/test/govuk_component/analytics_meta_tags_test.rb b/test/govuk_component/analytics_meta_tags_test.rb
@@ -118,105 +118,6 @@ def example_document_for(format, example_name)
     assert_political_status_for(political, current, 'non-political')
   end
 
-  test "renders themes metatag for root taxon" do
-    taxon = {
-      title: 'Root taxon',
-      links: {
-        parent_taxons: [],
-      },
-    }
-    render_component(content_item: example_document_for('taxon', 'taxon').merge(taxon))
-    assert_meta_tag('govuk:themes', 'Root taxon')
-  end
-
-  test "renders themes metatag for child taxon" do
-    taxon = {
-      title: 'Child taxon',
-      links: {
-        parent_taxons: [
-          {
-            title: 'Root taxon',
-            document_type: 'taxon',
-          },
-        ],
-      },
-    }
-    render_component(content_item: example_document_for('taxon', 'taxon').merge(taxon))
-    assert_meta_tag('govuk:themes', 'Root taxon')
-  end
-
-  test "renders themes metatag for content item" do
-    content_item = {
-      links: {
-        taxons: [
-          {
-            title: 'Child taxon',
-            document_type: 'taxon',
-            links: {
-              parent_taxons: [
-                {
-                  title: 'Root taxon',
-                  document_type: 'taxon',
-                },
-              ],
-            },
-          },
-        ],
-      },
-    }
-    render_component(content_item: example_document_for('case_study', 'case_study').merge(content_item))
-    assert_meta_tag('govuk:themes', 'Root taxon')
-  end
-
-  test "renders themes metatag for content item with multiple roots" do
-    content_item = {
-      links: {
-        taxons: [
-          {
-            title: 'Education child taxon',
-            document_type: 'taxon',
-            links: {
-              parent_taxons: [
-                {
-                  title: 'Education root taxon',
-                  document_type: 'taxon',
-                },
-              ],
-            },
-          },
-          {
-            title: 'Parenting grandchild taxon',
-            document_type: 'taxon',
-            links: {
-              parent_taxons: [
-                title: 'Parenting child taxon',
-                document_type: 'taxon',
-                links: {
-                  parent_taxons: [
-                    {
-                      title: 'Parenting root taxon',
-                      document_type: 'taxon',
-                    }
-                  ],
-                },
-              ],
-            },
-          },
-        ],
-      },
-    }
-    render_component(content_item: example_document_for('case_study', 'case_study').merge(content_item))
-    assert_meta_tag('govuk:themes', 'Education root taxon; Parenting root taxon')
-  end
-
-  test "does not render themes metatag for content item with no taxon" do
-    content_item = {
-      links: {},
-    }
-    render_component(content_item: example_document_for('case_study', 'case_study').merge(content_item))
-    assert_select "meta[name='govuk:themes']", 0
-  end
-
   def assert_political_status_for(political, current, expected_political_status)
     render_component(content_item: { details: { political: political, government: { current: current, slug: 'government' } } })
     assert_meta_tag('govuk:political-status', expected_political_status)