Skip to content

Commit

Permalink
setup local env for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
matthillco committed Sep 16, 2024
1 parent cbbbf70 commit 4c2a627
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem "govspeak"
gem "govuk_ab_testing"
gem "govuk_app_config"
gem "govuk_personalisation"
gem "govuk_publishing_components"
gem "govuk_publishing_components", path: "../govuk_publishing_components"
gem "htmlentities"
gem "plek"
gem "rails-controller-testing"
Expand Down
33 changes: 18 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
PATH
remote: ../govuk_publishing_components
specs:
govuk_publishing_components (43.1.1)
govuk_app_config
govuk_personalisation (>= 0.7.0)
kramdown
plek
rails (>= 6)
rouge
sprockets (>= 3)
sprockets-rails

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -129,10 +142,10 @@ GEM
rest-client (~> 2.0)
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (4.28.0)
google-protobuf (4.28.1)
bigdecimal
rake (>= 13)
googleapis-common-protos-types (1.15.0)
googleapis-common-protos-types (1.16.0)
google-protobuf (>= 3.18, < 5.a)
govspeak (8.3.4)
actionview (>= 6)
Expand Down Expand Up @@ -160,15 +173,6 @@ GEM
govuk_personalisation (1.0.0)
plek (>= 1.9.0)
rails (>= 6, < 8)
govuk_publishing_components (43.1.1)
govuk_app_config
govuk_personalisation (>= 0.7.0)
kramdown
plek
rails (>= 6)
rouge
sprockets (>= 3)
sprockets-rails
govuk_schemas (5.0.4)
faker (~> 3.4.1)
json-schema (>= 2.8, < 4.4)
Expand Down Expand Up @@ -207,7 +211,7 @@ GEM
rexml
language_server-protocol (3.17.0.3)
link_header (0.0.8)
logger (1.6.0)
logger (1.6.1)
logstasher (2.1.5)
activesupport (>= 5.2)
request_store
Expand Down Expand Up @@ -236,7 +240,6 @@ GEM
mocha (2.4.5)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
mutex_m (0.2.0)
net-imap (0.4.16)
date
net-protocol
Expand Down Expand Up @@ -265,7 +268,7 @@ GEM
opentelemetry-helpers-mysql (0.1.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21)
opentelemetry-helpers-sql-obfuscation (0.1.1)
opentelemetry-helpers-sql-obfuscation (0.2.0)
opentelemetry-common (~> 0.21)
opentelemetry-instrumentation-action_mailer (0.1.0)
opentelemetry-api (~> 1.0)
Expand Down Expand Up @@ -657,7 +660,7 @@ DEPENDENCIES
govuk_ab_testing
govuk_app_config
govuk_personalisation
govuk_publishing_components
govuk_publishing_components!
govuk_schemas
govuk_test
htmlentities
Expand Down
4 changes: 2 additions & 2 deletions app/views/content_items/detailed_guide.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>

<div class="govuk-grid-row">
<div class="govuk-grid-row gem-print-columns-fullwidth">
<div class="govuk-grid-column-two-thirds">
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
</div>
Expand All @@ -23,7 +23,7 @@
<% if @content_item.withdrawn? %>
<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
<% end %>
<div class="govuk-grid-row">
<div class="govuk-grid-row gem-print-columns-fullwidth">
<div class="govuk-grid-column-two-thirds">
<% if @content_item.national_applicability.present? %>
<%= render "govuk_publishing_components/components/devolved_nations", {
Expand Down
2 changes: 1 addition & 1 deletion app/views/content_items/guide.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<%= render 'shared/intervention_banner' %>

<div class="govuk-grid-row">
<div class="govuk-grid-row gem-print-columns-fullwidth">
<div class="govuk-grid-column-two-thirds">
<%= render 'govuk_publishing_components/components/title', { title: @content_item.content_title } %>
Expand Down
2 changes: 1 addition & 1 deletion startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function set_env() {
if [[ $1 == "--live" ]] ; then
set_env "gov.uk"
export GOVUK_PROXY_STATIC_ENABLED=true
export PLEK_SERVICE_STATIC_URI=${PLEK_SERVICE_STATIC_URI-https://assets.publishing.service.gov.uk}
export PLEK_SERVICE_STATIC_URI=${PLEK_SERVICE_STATIC_URI-http://static.dev.gov.uk}
./bin/dev
else
echo "ERROR: other startup modes are not supported"
Expand Down

0 comments on commit 4c2a627

Please sign in to comment.