alphagov · dsingleton · Jan 13, 2015 · Jan 12, 2015
diff --git a/lib/slimmer.rb b/lib/slimmer.rb
@@ -22,9 +22,6 @@ module Slimmer
   autoload :ComponentResolver, 'slimmer/component_resolver'
 
   module Processors
-    autoload :AlphaLabelInserter, 'slimmer/processors/alpha_label_inserter'
-    autoload :BetaNoticeInserter, 'slimmer/processors/beta_notice_inserter'
-    autoload :BetaLabelInserter, 'slimmer/processors/beta_label_inserter'
     autoload :BodyClassCopier, 'slimmer/processors/body_class_copier'
     autoload :BodyInserter, 'slimmer/processors/body_inserter'
     autoload :ConditionalCommentMover, 'slimmer/processors/conditional_comment_mover'

diff --git a/lib/slimmer/headers.rb b/lib/slimmer/headers.rb
@@ -5,10 +5,7 @@ module Headers
     HEADER_PREFIX = "X-Slimmer"
 
     SLIMMER_HEADER_MAPPING = {
-      alpha_label:          "Alpha-Label",
       application_name:     "Application-Name",
-      beta:                 "Beta",
-      beta_label:           "Beta-Label",
       format:               "Format",
       page_owner:           "Page-Owner",
       proposition:          "Proposition",
@@ -23,11 +20,8 @@ module Headers
       template:             "Template",
     }
 
-    ALPHA_LABEL = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:alpha_label]}"
     APPLICATION_NAME_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:application_name]}"
     ARTEFACT_HEADER = "#{HEADER_PREFIX}-Artefact"
-    BETA_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:beta]}"
-    BETA_LABEL = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:beta_label]}"
     FORMAT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:format]}"
     ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}"
     REPORT_A_PROBLEM_FORM = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:report_a_problem]}"

diff --git a/lib/slimmer/processors/alpha_label_inserter.rb b/lib/slimmer/processors/alpha_label_inserter.rb
diff --git a/lib/slimmer/processors/beta_label_inserter.rb b/lib/slimmer/processors/beta_label_inserter.rb
diff --git a/lib/slimmer/processors/beta_notice_inserter.rb b/lib/slimmer/processors/beta_notice_inserter.rb
diff --git a/lib/slimmer/skin.rb b/lib/slimmer/skin.rb
@@ -126,9 +126,6 @@ def success(source_request, response, body)
                                                response.headers,
                                                wrapper_id),
         Processors::MetaViewportRemover.new(self, response.headers),
-        Processors::BetaNoticeInserter.new(self, response.headers),
-        Processors::BetaLabelInserter.new(self, response.headers),
-        Processors::AlphaLabelInserter.new(self, response.headers),
       ]
 
       template_name = response.headers[Headers::TEMPLATE_HEADER] || 'wrapper'

diff --git a/lib/slimmer/test_templates/alpha_label.html b/lib/slimmer/test_templates/alpha_label.html
diff --git a/lib/slimmer/test_templates/beta_label.html b/lib/slimmer/test_templates/beta_label.html
diff --git a/lib/slimmer/test_templates/beta_notice.html b/lib/slimmer/test_templates/beta_notice.html
diff --git a/test/deprecated_usage_test.rb b/test/deprecated_usage_test.rb
diff --git a/test/fixtures/alpha_label.html.erb b/test/fixtures/alpha_label.html.erb
diff --git a/test/fixtures/beta_label.html.erb b/test/fixtures/beta_label.html.erb
diff --git a/test/fixtures/beta_notice.html.erb b/test/fixtures/beta_notice.html.erb
diff --git a/test/processors/alpha_label_inserter_test.rb b/test/processors/alpha_label_inserter_test.rb
diff --git a/test/processors/beta_label_inserter_test.rb b/test/processors/beta_label_inserter_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -92,9 +92,6 @@ def given_response(code, body, headers={}, app_options={})
     use_template(template_name)
     use_template('related.raw')
     use_template('report_a_problem.raw')
-    use_template('alpha_label')
-    use_template('beta_notice')
-    use_template('beta_label')
 
     fetch_page
   end

diff --git a/test/typical_usage_test.rb b/test/typical_usage_test.rb
@@ -131,11 +131,6 @@ def test_should_copy_the_class_of_the_body_element
     def test_should_insert_section_links_into_the_navigation
       assert_rendered_in_template "#global-breadcrumb ol li a[href='https://www.test.gov.uk/browse/this-section']", "This section"
     end
-
-    def test_should_not_add_beta_notice_to_non_beta_pages
-      assert_no_selector "body.beta"
-      assert_no_selector ".beta-notice"
-    end
   end
 
   class ConditionalCommentTest < SlimmerIntegrationTest
@@ -250,34 +245,6 @@ def test_should_add_the_current_url_to_the_form
     end
   end
 
-  class BetaLabelInserterTest < SlimmerIntegrationTest
-    def test_should_add_beta_label
-      given_response 200, %{
-        <html>
-          <body class="wibble">
-            <div id="wrapper">The body of the page</div>
-          </body>
-        </html>
-      }, { Slimmer::Headers::BETA_LABEL => 'after:#wrapper' }
-
-      assert_rendered_in_template '.beta-label'
-    end
-  end
-
-  class AlphaLabelInserterTest < SlimmerIntegrationTest
-    def test_should_add_alpha_label
-      given_response 200, %{
-        <html>
-          <body class="wibble">
-            <div id="wrapper">The body of the page</div>
-          </body>
-        </html>
-      }, { Slimmer::Headers::ALPHA_LABEL => 'after:#wrapper' }
-
-      assert_rendered_in_template '.alpha-label'
-    end
-  end
-
   class Error500ResponseTest < SlimmerIntegrationTest
     given_response 500, %{
       <html>