From 65f80f6c1eb2034ef2ed168795a6553551572c96 Mon Sep 17 00:00:00 2001
From: Paul Hayes <fofr@users.noreply.github.com>
Date: Thu, 6 Apr 2017 13:53:58 +0100
Subject: [PATCH] Bump slimmer to 10.1.3

* Fix memory leak with components: https://github.com/alphagov/slimmer/pull/191
* Stub locale requests: https://github.com/alphagov/slimmer/pull/159
---
 Gemfile                                      | 2 +-
 Gemfile.lock                                 | 6 +++---
 app/controllers/application_controller.rb    | 2 +-
 spec/contracts/govuk_content_schemas_spec.rb | 2 --
 spec/rails_helper.rb                         | 1 +
 spec/support/app_helpers.rb                  | 4 ----
 spec/support/slimmer.rb                      | 1 -
 7 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 spec/support/slimmer.rb

diff --git a/Gemfile b/Gemfile
index 574d1e74..c9f08d13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rails', '4.2.7.1'
-gem 'slimmer', '9.0.1'
+gem 'slimmer', '~> 10.1.3'
 
 gem 'govuk_frontend_toolkit', '1.2.0'
 gem 'sass-rails', '~> 5.0.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 30a49780..55da9f34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,13 +214,13 @@ GEM
     scss_lint (0.52.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
-    slimmer (9.0.1)
+    slimmer (10.1.3)
       activesupport
       json
       nokogiri (>= 1.5.0, < 1.7.0)
       null_logger
       plek (>= 1.1.0)
-      rack (>= 1.3.5)
+      rack
       rest-client
     slop (3.6.0)
     sprockets (2.11.0)
@@ -279,7 +279,7 @@ DEPENDENCIES
   rails (= 4.2.7.1)
   rspec-rails (~> 3.0)
   sass-rails (~> 5.0.6)
-  slimmer (= 9.0.1)
+  slimmer (~> 10.1.3)
   statsd-ruby (= 1.3.0)
   uglifier (>= 1.3.0)
   unicorn (= 4.8.2)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fcecafbe..cbdadaef 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  include Slimmer::SharedTemplates
+  include Slimmer::GovukComponents
 
   before_filter :slimmer_headers
 
diff --git a/spec/contracts/govuk_content_schemas_spec.rb b/spec/contracts/govuk_content_schemas_spec.rb
index fe02cb5e..43f24c8f 100644
--- a/spec/contracts/govuk_content_schemas_spec.rb
+++ b/spec/contracts/govuk_content_schemas_spec.rb
@@ -1,7 +1,5 @@
 require 'rails_helper'
 require 'gds_api/test_helpers/content_store'
-require 'slimmer/test_helpers/shared_templates'
-include Slimmer::TestHelpers::SharedTemplates
 
 feature "Viewing manuals and sections examples from govuk-content-schemas" do
   include GdsApi::TestHelpers::ContentStore
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3a3f86e8..4bbf9041 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -2,6 +2,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
+require 'slimmer/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
diff --git a/spec/support/app_helpers.rb b/spec/support/app_helpers.rb
index 27577b82..3806bf4d 100644
--- a/spec/support/app_helpers.rb
+++ b/spec/support/app_helpers.rb
@@ -1,8 +1,4 @@
-require 'slimmer/test_helpers/shared_templates'
-
 module AppHelpers
-  include Slimmer::TestHelpers::SharedTemplates
-
   def view_manual_change_notes
     updates_path = "#{current_path}/updates"
     expect_component("metadata", in_scope: 'header') do |metadata|
diff --git a/spec/support/slimmer.rb b/spec/support/slimmer.rb
deleted file mode 100644
index 7c7adc67..00000000
--- a/spec/support/slimmer.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'slimmer/test'