Skip to content
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
8 changes: 5 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ inherit_gem:
inherit_from:
.rubocop_todo.yml

require:
- rubocop-rails
plugins:
- rubocop-performance
- standard
- standard-rails
- standard-performance

require:
- rubocop-rails
- standard

AllCops:
Exclude:
- "vendor/**/*"
Expand Down
32 changes: 17 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ GEM
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jmespath (1.6.2)
json (2.10.2)
json (2.11.3)
jwt (2.10.1)
base64
kaminari (1.2.2)
Expand Down Expand Up @@ -454,8 +454,8 @@ GEM
paper_trail (16.0.0)
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.26.3)
parser (3.3.7.4)
parallel (1.27.0)
parser (3.3.8.0)
ast (~> 2.4.1)
racc
pdf-core (0.10.0)
Expand Down Expand Up @@ -596,22 +596,24 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.2)
rubocop (1.70.0)
rubocop (1.75.4)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.43.0)
rubocop-ast (1.44.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-performance (1.23.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-performance (1.25.0)
lint_roller (~> 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rails (2.25.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
Expand Down Expand Up @@ -672,18 +674,18 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stackprof (0.2.27)
standard (1.44.0)
standard (1.49.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.70.0)
rubocop (~> 1.75.2)
standard-custom (~> 1.0.0)
standard-performance (~> 1.6)
standard-performance (~> 1.8)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.6.0)
standard-performance (1.8.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.23.0)
rubocop-performance (~> 1.25.0)
standard-rails (1.1.0)
lint_roller (~> 1.0)
rubocop-rails (~> 2.25.0)
Expand Down
4 changes: 2 additions & 2 deletions app/services/partners/update_family.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Partners
module UpdateFamily
extend ServiceObjectErrorsMixin
# rubocop:disable Rails::SkipsModelValidations
# rubocop:disable Rails/SkipsModelValidations
def self.archive(family)
if family.children.exists?
ActiveRecord::Base.transaction do
Expand All @@ -16,6 +16,6 @@ def self.archive(family)
end
self
end
# rubocop:enable Rails::SkipsModelValidations
# rubocop:enable Rails/SkipsModelValidations
end
end
8 changes: 4 additions & 4 deletions spec/services/organization_update_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
before do
organization.update!(enable_individual_requests: false)
# Want to have an invalid email on purpose
# rubocop:disable Rails::SkipsModelValidations
# rubocop:disable Rails/SkipsModelValidations
partner_one.update_columns(email: "not/an_email")
# rubocop:enable Rails::SkipsModelValidations
# rubocop:enable Rails/SkipsModelValidations
end

it "updates the organization and returns true" do
Expand All @@ -113,9 +113,9 @@
before do
organization.update!(enable_individual_requests: false)
# Want to have an invalid email on purpose
# rubocop:disable Rails::SkipsModelValidations
# rubocop:disable Rails/SkipsModelValidations
profile.update_columns(pick_up_email: "not/an/email")
# rubocop:enable Rails::SkipsModelValidations
# rubocop:enable Rails/SkipsModelValidations
end

it "returns false" do
Expand Down
4 changes: 2 additions & 2 deletions spec/services/partner_profile_update_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@

before do
# Want to have an invalid email on purpose
# rubocop:disable Rails::SkipsModelValidations
# rubocop:disable Rails/SkipsModelValidations
partner.update_columns(email: "not/an_email")
# rubocop:enable Rails::SkipsModelValidations
# rubocop:enable Rails/SkipsModelValidations
end

it "returns failure" do
Expand Down