diff --git a/CHANGELOG.md b/CHANGELOG.md index 92eb554..dcd2383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole +## 1.7.6 - 2024-06 + +- (Jon) - Updated the deployment.yaml file to mirror the new branch names post + branch cleanup. +- (Jon) Reconfigured the `detailed documentation` links, both english and welsh, + to point to the `app/doc/ppd` path; alongside adding tests querying the new + route to ensure the route is valid and contains the expected content. All + redirections for any old routes will now handled by the proxy server. + ## 1.7.5 - 2023-11-23 - (Jon) Updated the `lr_common_styles` gem to the latest 1.9.3 patch release. diff --git a/Dockerfile b/Dockerfile index c7ba76b..11d86f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --update \ nodejs \ tzdata \ && rm -rf /var/cache/apk/* \ - && gem update --system \ + && gem update --system 3.4.22 \ && gem install bundler:$BUNDLER_VERSION \ && bundle config --global frozen 1 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7dc66f6..9df9271 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -28,5 +28,4 @@ def set_locale def change_default_caching_policy expires_in 5.minutes, public: true, must_revalidate: true if Rails.env.production? end - end diff --git a/app/lib/version.rb b/app/lib/version.rb index 30b1795..4b828a8 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 1 MINOR = 7 - REVISION = 5 + REVISION = 6 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}#{SUFFIX && ".#{SUFFIX}"}" end diff --git a/app/views/landing/_index_cy.html.haml b/app/views/landing/_index_cy.html.haml index aec224b..bcdadcb 100644 --- a/app/views/landing/_index_cy.html.haml +++ b/app/views/landing/_index_cy.html.haml @@ -91,8 +91,7 @@ %h3.heading-small Gwybodaeth bellach %ul.list.list-bullet %li - = link_to( ppd_doc_path ) do - dogfennaeth fanwl + = link_to('dogfennaeth fanwl', '/app/doc/ppd') am y Data Pris a Dalwyd, y model data, a defnyddio’r data. %h2#standard-reports.heading-medium Lluniwr Adroddiad Safonol diff --git a/app/views/landing/_index_en.html.haml b/app/views/landing/_index_en.html.haml index 08bb6bc..bd47045 100644 --- a/app/views/landing/_index_en.html.haml +++ b/app/views/landing/_index_en.html.haml @@ -91,8 +91,7 @@ %h3.heading-small Further information %ul.list.list-bullet %li - = link_to( ppd_doc_path ) do - detailed documentation + = link_to('detailed documentation', '/app/doc/ppd') about the Price Paid Data, the data model, and using the data. %h2#standard-reports.heading-medium Standard Report Builder diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index 623e854..ae6a3ce 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -3,7 +3,7 @@ if ENV['SENTRY_API_KEY'] Sentry.init do |config| config.dsn = ENV['SENTRY_API_KEY'] - config.environment = ENV['DEPLOYMENT_ENVIRONMENT'] || Rails.env + config.environment = ENV.fetch('DEPLOYMENT_ENVIRONMENT') { Rails.env } config.enabled_environments = %w[production] config.release = Version::VERSION config.breadcrumbs_logger = %i[active_support_logger http_logger] diff --git a/deployment.yaml b/deployment.yaml index 012ee5d..3b73b17 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -8,7 +8,7 @@ deployments: - branch: "preprod" deploy: "preprod" publish: "preprod" - - branch: "dev-infrastructure" + - branch: "dev" deploy: "dev" publish: "dev" - branch: "[a-zA-Z0-9]+" diff --git a/test/integration/documentation_test.rb b/test/integration/documentation_test.rb index bb212a5..6f5d519 100644 --- a/test/integration/documentation_test.rb +++ b/test/integration/documentation_test.rb @@ -14,8 +14,14 @@ class DocumentationTest < ActionDispatch::IntegrationTest assert_equal(302, response.status) end - test 'PPD docs page' do - get '/doc/ppd' + test 'ppd_doc_path variable links correctly' do + get ppd_doc_path + assert_response :success + end + + test 'ppd doc loads correctly' do + get ppd_doc_path assert_select 'h1', 'Price Paid Linked Data' + assert_select 'h2', 'What does the Price Paid Dataset consist of?' end end