Skip to content

Commit

Permalink
Bump rubocop-rails from 2.17.4 to 2.19.1 (#1015)
Browse files Browse the repository at this point in the history
* Bump rubocop-rails from 2.17.4 to 2.19.1

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.17.4 to 2.19.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rails@v2.17.4...v2.19.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* ignore Rails/ThreeStateBooleanColumn for some migrations

* use parsed_body for Rails/ResponseParsedBody

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Eito Katagiri <eitoball@gmail.com>
  • Loading branch information
dependabot[bot] and eitoball committed Apr 29, 2023
1 parent 7792579 commit ffbaec5
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
12 changes: 12 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,15 @@ Naming/VariableName:
# This cop checks schema in db/schema.rb, but ours is empty.
Rails/UniqueValidationWithoutIndex:
Enabled: false

Rails/ThreeStateBooleanColumn:
Exclude:
- db/migrate/20120307130803_add_approved_to_measurement_import.rb
- db/migrate/20120307150105_add_moderator_to_user.rb
- db/migrate/20160531111906_add_rejected_to_bgeigie_imports.rb
- db/migrate/20191017054450_add_would_auto_approve_to_measurement_imports.rb
- db/migrate/20191022080113_add_cpm_equals_zero_to_measurement_imports.rb
- db/migrate/20191025034816_add_auto_approve_rules_to_measruement_imports.rb
- db/migrate/20191025034816_add_auto_approve_rules_to_measruement_imports.rb
- db/migrate/20191025034816_add_auto_approve_rules_to_measruement_imports.rb
- db/migrate/20191025034816_add_auto_approve_rules_to_measruement_imports.rb
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ GEM
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
coderay (1.1.3)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
crack (0.4.5)
rexml
crass (1.0.6)
Expand Down Expand Up @@ -312,7 +312,7 @@ GEM
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
minitest (5.18.0)
momentjs-rails (2.29.4.1)
railties (>= 3.1)
msgpack (1.6.0)
Expand All @@ -339,7 +339,7 @@ GEM
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.2.1.0)
parser (3.2.2.0)
ast (~> 2.4.1)
pg (1.4.5)
pg (1.4.5-x64-mingw32)
Expand Down Expand Up @@ -444,18 +444,18 @@ GEM
rubocop-ast (>= 1.23.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.26.0)
rubocop-ast (1.28.0)
parser (>= 3.2.1.0)
rubocop-performance (1.16.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.17.4)
rubocop-rails (2.19.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.17.0)
rubocop (~> 1.33)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby-vips (2.1.4)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/measurements_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
let(:count_format) { :json }

# Test can't assert 2 since switching to estimated row count
it { expect(JSON.parse(response.body)).to eq('count' => 0) }
it { expect(response.parsed_body).to eq('count' => 0) }
end
end

Expand Down

0 comments on commit ffbaec5

Please sign in to comment.