From c5b230c42845e751d450df1b4315f6e594e43325 Mon Sep 17 00:00:00 2001 From: Matt Rayner Date: Tue, 23 Oct 2018 19:09:25 +0100 Subject: [PATCH 1/2] Update Alpine version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ccf2aed0..03c93faa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.5.3-alpine3.7 +FROM ruby:2.5.3-alpine3.8 # Add command line argument variables used to customise the image at build-time. From 5ed4daf32e0c0618f628de28bb1a9eccabf09c82 Mon Sep 17 00:00:00 2001 From: Matt Rayner Date: Wed, 24 Oct 2018 13:22:23 +0100 Subject: [PATCH 2/2] Update home page statutory instruments link --- Gemfile.lock | 10 ++++++---- .../page_serializer/home_page_serializer.rb | 2 +- .../controllers/home_controller/index/fixture.yml | 2 +- .../page_serializer/home_page_serializer/fixture.yml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c73a6fe5..09e7627c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,13 +54,14 @@ GEM msgpack (~> 1.0) builder (3.2.3) byebug (10.0.2) - capybara (3.9.0) + capybara (3.10.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - xpath (~> 3.1) + regexp_parser (~> 1.2) + xpath (~> 3.2) concurrent-ruby (1.0.5) coveralls (0.8.22) json (>= 1.8, < 3) @@ -128,7 +129,7 @@ GEM parliament-opensearch (0.7.0) activesupport (>= 5.0.0.1) feedjira (~> 2.1, >= 2.1.2) - parliament-routes (0.6.15) + parliament-routes (0.6.17) parliament-ruby (0.10.2) parser (2.5.1.2) ast (~> 2.4.0) @@ -178,6 +179,7 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-vocab (2.2.9) rdf (>= 2.2, < 4.0) + regexp_parser (1.2.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) rspec-expectations (3.8.2) @@ -186,7 +188,7 @@ GEM rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.0) + rspec-rails (3.8.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) diff --git a/app/serializers/page_serializer/home_page_serializer.rb b/app/serializers/page_serializer/home_page_serializer.rb index a5b82c48..07a1540e 100644 --- a/app/serializers/page_serializer/home_page_serializer.rb +++ b/app/serializers/page_serializer/home_page_serializer.rb @@ -25,7 +25,7 @@ def section_components content << heading_serializer(translation_key: 'home.mps-and-lords.heading') content << list_serializer(components: mps_lords_list_components) content << heading_serializer(translation_key: 'home.parliament-activity.heading') - content << list_serializer(components: [card(heading_content: 'home.parliament-activity.statutory-instruments.heading', heading_link: statutory_instruments_path, paragraph_content: 'home.parliament-activity.statutory-instruments.find')]) + content << list_serializer(components: [card(heading_content: 'home.parliament-activity.statutory-instruments.heading', heading_link: find_a_statutory_instrument_path, paragraph_content: 'home.parliament-activity.statutory-instruments.find')]) content << heading_serializer(translation_key: 'home.guides.heading') content << list_serializer(components: [card(heading_content: 'home.guides.guide-to-procedure.heading', heading_link: collection_path('6i8XQAfD'), paragraph_content: 'home.guides.guide-to-procedure.find')]) end diff --git a/spec/fixtures/controllers/home_controller/index/fixture.yml b/spec/fixtures/controllers/home_controller/index/fixture.yml index 5ca40bae..1c141a27 100644 --- a/spec/fixtures/controllers/home_controller/index/fixture.yml +++ b/spec/fixtures/controllers/home_controller/index/fixture.yml @@ -187,7 +187,7 @@ main-components: content: - home.parliament-activity.statutory-instruments.heading size: 3 - link: "/statutory-instruments" + link: "/find-a-statutory-instrument" paragraph: name: paragraph data: diff --git a/spec/fixtures/serializers/page_serializer/home_page_serializer/fixture.yml b/spec/fixtures/serializers/page_serializer/home_page_serializer/fixture.yml index 3ac44daf..4fda7631 100644 --- a/spec/fixtures/serializers/page_serializer/home_page_serializer/fixture.yml +++ b/spec/fixtures/serializers/page_serializer/home_page_serializer/fixture.yml @@ -187,7 +187,7 @@ main-components: content: - home.parliament-activity.statutory-instruments.heading size: 3 - link: "/statutory-instruments" + link: "/find-a-statutory-instrument" paragraph: name: paragraph data: