Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rubocop-govuk from 4.12.0 to 4.13.0 #1004

Merged
merged 2 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,8 @@ GEM
table_print (~> 1.5)
term-ansicolor (~> 1.7)
thor (>= 0.20, < 2.0)
parallel (1.23.0)
parser (3.2.2.4)
parallel (1.24.0)
parser (3.3.0.2)
ast (~> 2.4.1)
racc
parslet (2.0.0)
Expand Down Expand Up @@ -626,7 +626,7 @@ GEM
redis (4.8.1)
redis-namespace (1.11.0)
redis (>= 4)
regexp_parser (2.8.3)
regexp_parser (2.9.0)
reline (0.4.1)
io-console (~> 0.5)
request_store (1.5.1)
Expand Down Expand Up @@ -657,37 +657,38 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.55.0)
rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop (~> 1.33)
rubocop-govuk (4.12.0)
rubocop (= 1.55.0)
rubocop-ast (= 1.29.0)
rubocop-rails (= 2.20.2)
rubocop-factory_bot (2.25.1)
rubocop (~> 1.41)
rubocop-govuk (4.13.0)
rubocop (= 1.59.0)
rubocop-ast (= 1.30.0)
rubocop-rails (= 2.23.0)
rubocop-rake (= 0.6.0)
rubocop-rspec (= 2.22.0)
rubocop-rails (2.20.2)
rubocop-rspec (= 2.25.0)
rubocop-rails (2.23.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.22.0)
rubocop (~> 1.33)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-progressbar (1.13.0)
Expand Down
4 changes: 2 additions & 2 deletions db/migrate/20220810082140_create_actions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ def change
t.integer :requester_id
t.integer :approver_id
t.datetime :approved
t.string :comment # How long?
t.string :request_type # How long?
t.string :comment # How long?
t.string :request_type # How long?
t.timestamps
end
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20220810083737_create_csv_datas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def change
create_table :csv_data do |t|
t.string :service_slug
t.integer :data_set_version
t.text :data # 16 Mb?
t.text :data # 16 Mb?
t.timestamps
end
end
Expand Down
6 changes: 3 additions & 3 deletions lib/tasks/export.rake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace :export do
CSV.open("tmp/exports/users.csv", "w") do |csv|
fields = User.first.fields.keys.excluding("_id")
csv << fields
User.all.each do |user|
User.all.find_each do |user|
row = []
fields.each do |f|
row << if f == "permissions"
Expand All @@ -31,7 +31,7 @@ namespace :export do
CSV.open("tmp/exports/places.csv", "w") do |csv|
fields = Place.first.fields.keys.excluding("_id")
csv << fields
Place.all.each do |place|
Place.all.find_each do |place|
row = []
fields.each do |f|
row << if f == "location"
Expand All @@ -57,7 +57,7 @@ namespace :export do
CSV.open("tmp/exports/place_archives.csv", "w") do |csv|
fields = PlaceArchive.first.fields.keys.excluding("_id")
csv << fields
PlaceArchive.all.each do |place|
PlaceArchive.all.find_each do |place|
row = []
fields.each do |f|
row << if f == "location"
Expand Down
2 changes: 1 addition & 1 deletion test/workers/delete_historic_records_worker_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class DeleteHistoricRecordsWorkerTest < ActiveSupport::TestCase

assert_equal 9, PlaceArchive.where(service_slug: @service.slug).count
assert_equal [4, 5, 6, 7], @service.reload.data_sets.pluck(:version).sort
@service.reload.data_sets.where(version: [4, 5, 6]).each do |data_set|
@service.reload.data_sets.where(version: [4, 5, 6]).find_each do |data_set|
assert_equal 3, PlaceArchive.where(service_slug: @service.slug,
data_set_version: data_set.version).count
end
Expand Down
Loading