Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@tahb
tahb committed Dec 17, 2020
2 parents 0d2a659 + 68d7fa4 commit 3ab36e5
Show file tree
Hide file tree
Showing 83 changed files with 1,908 additions and 262 deletions.
1 change: 1 addition & 0 deletions .env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ROLLBAR_ENV=development

DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-development
REDIS_CACHE_URL=redis://localhost:6379/1
REDIS_SIDEKIQ_URL=redis://localhost:6379/2

# Contentful
CONTENTFUL_URL=cdn.contentful.com
Expand Down
3 changes: 2 additions & 1 deletion .env.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
# Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use

DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-test
REDIS_CACHE_URL=redis://localhost:6379/2
REDIS_CACHE_URL=redis://localhost:6379/11
REDIS_SIDEKIQ_URL=redis://localhost:6379/12

# Contentful
CONTENTFUL_URL=cdn.contentful.com
Expand Down
18 changes: 17 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,21 @@ The format is based on [Keep a Changelog 1.0.0].

## [Unreleased]

## [release-004] - 2020-12-17

- fix primary key type on long_text_answers table to UUID
- nightly task to warm the Contentful cache for all entries
- form button content is configurable through Contentful
- users can be asked to provide a single date answer
- add Webmock to prevent real http requests in the test suite
- content users can see a journey map of all the Contentful steps
- users can be asked to provide multiple answers via a checkbox question
- journey map shows an error to the content team if a duplicate entry is detected
- journey map shows an error to the content team if the journey doesn't end within 50 steps
- refactor how we store and access a Step's associated Contentful Entry ID
- users can edit their answers
- only add Contentful entries that form part of a valid journey to the cache

## [release-003] - 2020-12-07

- add database foreign key constraints for better data integrity
Expand Down Expand Up @@ -36,7 +51,8 @@ Contentful fixture
- Contentful can redirect users to preview endpoints
- users can be asked to answer a long text question

[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-003...HEAD
[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-004...HEAD
[release-004]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-003...release-004
[release-003]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-002...release-003
[release-002]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-001...release-002
[release-001]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-000...release-001
Expand Down
5 changes: 4 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ gem "puma", "~> 5.1"
gem "redis", "~> 4.2"
gem "redis-namespace"
gem "rollbar"
gem "rails", "~> 6.0.0"
gem "rails", "~> 6.1.0"
gem "sass-rails", "~> 6.0"
gem "sidekiq", "~> 6.1"
gem "sidekiq-cron", "~> 1.2"
gem "turbolinks", "~> 5"
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
gem "uglifier", ">= 1.3.0"
Expand All @@ -37,6 +39,7 @@ group :test do
gem "selenium-webdriver"
gem "shoulda-matchers"
gem "simplecov"
gem "webmock"
end

group :development do
Expand Down
154 changes: 90 additions & 64 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.3.4)
actionpack (= 6.0.3.4)
actioncable (6.1.0)
actionpack (= 6.1.0)
activesupport (= 6.1.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
actionmailbox (6.1.0)
actionpack (= 6.1.0)
activejob (= 6.1.0)
activerecord (= 6.1.0)
activestorage (= 6.1.0)
activesupport (= 6.1.0)
mail (>= 2.7.1)
actionmailer (6.0.3.4)
actionpack (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
actionmailer (6.1.0)
actionpack (= 6.1.0)
actionview (= 6.1.0)
activejob (= 6.1.0)
activesupport (= 6.1.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.4)
actionview (= 6.0.3.4)
activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.0)
actionview (= 6.1.0)
activesupport (= 6.1.0)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.4)
actionpack (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
actiontext (6.1.0)
actionpack (= 6.1.0)
activerecord (= 6.1.0)
activestorage (= 6.1.0)
activesupport (= 6.1.0)
nokogiri (>= 1.8.5)
actionview (6.0.3.4)
activesupport (= 6.0.3.4)
actionview (6.1.0)
activesupport (= 6.1.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.4)
activesupport (= 6.0.3.4)
activejob (6.1.0)
activesupport (= 6.1.0)
globalid (>= 0.3.6)
activemodel (6.0.3.4)
activesupport (= 6.0.3.4)
activerecord (6.0.3.4)
activemodel (= 6.0.3.4)
activesupport (= 6.0.3.4)
activestorage (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
activemodel (6.1.0)
activesupport (= 6.1.0)
activerecord (6.1.0)
activemodel (= 6.1.0)
activesupport (= 6.1.0)
activestorage (6.1.0)
actionpack (= 6.1.0)
activejob (= 6.1.0)
activerecord (= 6.1.0)
activesupport (= 6.1.0)
marcel (~> 0.3.1)
activesupport (6.0.3.4)
mimemagic (~> 0.3.2)
activesupport (6.1.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1)
Expand All @@ -68,7 +72,7 @@ GEM
msgpack (~> 1.0)
brakeman (4.10.0)
builder (3.2.4)
bullet (6.1.0)
bullet (6.1.2)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
Expand All @@ -91,9 +95,11 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.7)
connection_pool (2.2.3)
contentful (2.15.4)
http (> 0.8, < 5.0)
multi_json (~> 1)
crack (0.4.4)
crass (1.0.6)
database_cleaner (1.8.5)
diff-lcs (1.4.4)
Expand All @@ -105,6 +111,8 @@ GEM
dotenv (= 2.7.6)
railties (>= 3.2)
erubi (1.10.0)
et-orbi (1.2.4)
tzinfo
execjs (2.7.0)
factory_bot (6.1.0)
activesupport (>= 5.0.0)
Expand All @@ -117,12 +125,16 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fugit (1.4.1)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.4)
globalid (0.4.2)
activesupport (>= 4.2.0)
govuk_design_system_formbuilder (2.1.5)
actionview (>= 5.2)
activemodel (>= 5.2)
activesupport (>= 5.2)
hashdiff (1.0.1)
high_voltage (3.1.2)
http (4.4.1)
addressable (~> 2.3)
Expand Down Expand Up @@ -176,38 +188,39 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
puma (5.1.0)
puma (5.1.1)
nio4r (~> 2.0)
raabro (1.4.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.4)
actioncable (= 6.0.3.4)
actionmailbox (= 6.0.3.4)
actionmailer (= 6.0.3.4)
actionpack (= 6.0.3.4)
actiontext (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
activemodel (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
bundler (>= 1.3.0)
railties (= 6.0.3.4)
rails (6.1.0)
actioncable (= 6.1.0)
actionmailbox (= 6.1.0)
actionmailer (= 6.1.0)
actionpack (= 6.1.0)
actiontext (= 6.1.0)
actionview (= 6.1.0)
activejob (= 6.1.0)
activemodel (= 6.1.0)
activerecord (= 6.1.0)
activestorage (= 6.1.0)
activesupport (= 6.1.0)
bundler (>= 1.15.0)
railties (= 6.1.0)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_layout (1.0.42)
railties (6.0.3.4)
actionpack (= 6.0.3.4)
activesupport (= 6.0.3.4)
railties (6.1.0)
actionpack (= 6.1.0)
activesupport (= 6.1.0)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.1)
rb-fsevent (0.10.4)
Expand Down Expand Up @@ -267,6 +280,13 @@ GEM
rubyzip (>= 1.2.2)
shoulda-matchers (4.4.1)
activesupport (>= 4.2.0)
sidekiq (6.1.2)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
sidekiq-cron (1.2.0)
fugit (~> 1.1)
sidekiq (>= 4.2.1)
simplecov (0.20.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand All @@ -286,17 +306,16 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
standard (0.10.1)
standard (0.10.2)
rubocop (= 1.4.2)
rubocop-performance (= 1.9.1)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.8)
thread_safe (~> 0.1)
tzinfo (2.0.3)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
Expand All @@ -309,6 +328,10 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webmock (3.10.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -344,7 +367,7 @@ DEPENDENCIES
pg
pry
puma (~> 5.1)
rails (~> 6.0.0)
rails (~> 6.1.0)
rails_layout
redis (~> 4.2)
redis-namespace
Expand All @@ -353,6 +376,8 @@ DEPENDENCIES
sass-rails (~> 6.0)
selenium-webdriver
shoulda-matchers
sidekiq (~> 6.1)
sidekiq-cron (~> 1.2)
simplecov
spring
spring-commands-rspec
Expand All @@ -362,6 +387,7 @@ DEPENDENCIES
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
webmock

RUBY VERSION
ruby 2.6.6p146
Expand Down
Loading

0 comments on commit 3ab36e5

Please sign in to comment.