gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Rubocop linting issues

Browse source
This commit is contained in:
CactusPuppy 2021-03-31 21:22:28 -07:00
parent f0296e2150
commit 1d89bbd59c
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/models/concerns/track_saved_changes.rb
View file

@ -17,7 +17,7 @@ module TrackSavedChanges
# filter out any changes that result in the original value # filter out any changes that result in the original value
def saved_changes def saved_changes
@saved_changes_unfiltered.reject { |k,v| v[0] == v[1] } @saved_changes_unfiltered.reject { |_k, v| v[0] == v[1] }
end end
private private
@ -31,20 +31,18 @@ module TrackSavedChanges
end end
# v is an an array of [prev, current] # v is an an array of [prev, current]
def track_saved_change(k, v) def track_saved_change(key, value)
if @saved_changes_unfiltered.key? k if @saved_changes_unfiltered.key? key
@saved_changes_unfiltered[k][1] = track_saved_value v[1] @saved_changes_unfiltered[key][1] = track_saved_value value[1]
else else
@saved_changes_unfiltered[k] = v.dup @saved_changes_unfiltered[key] = value.dup
end end
end end
# type safe dup inspred by http://stackoverflow.com/a/20955038 # type safe dup inspred by http://stackoverflow.com/a/20955038
def track_saved_value(v) def track_saved_value(value)
begin value.dup
v.dup rescue TypeError
rescue TypeError value
v
end
end end
end end

2
app/models/user.rb
View file

@ -391,7 +391,7 @@ class User < ApplicationRecord
def mailbluster_update_email def mailbluster_update_email
# FIXME: May fail if multiple saves occur in one commit # FIXME: May fail if multiple saves occur in one commit
MailblusterEditLeadJob.perform_later(self, old_email: self.saved_changes['email'][0]) MailblusterEditLeadJob.perform_later(self, old_email: saved_changes['email'][0])
end end
def touch_events def touch_events

8
spec/services/mailbluster_manager_spec.rb
View file

@ -30,7 +30,7 @@ describe MailblusterManager, type: :model do
}" }"
stub_request(:post, url) stub_request(:post, url)
.to_return(body: response_body, status: 200) .to_return(body: response_body, status: 200)
response = MailblusterManager.create_lead(user) response = described_class.create_lead(user)
expect(WebMock).to have_requested(:post, url).with(body: { expect(WebMock).to have_requested(:post, url).with(body: {
'email': user.email, 'email': user.email,
@ -64,7 +64,7 @@ describe MailblusterManager, type: :model do
user.save user.save
stub_request(:put, url + Digest::MD5.hexdigest(old_email)) stub_request(:put, url + Digest::MD5.hexdigest(old_email))
.to_return(body: response_body, status: 200) .to_return(body: response_body, status: 200)
response = MailblusterManager.edit_lead(user, old_email: old_email) response = described_class.edit_lead(user, old_email: old_email)
expect(WebMock).to have_requested(:put, url + Digest::MD5.hexdigest(old_email)).with(body: { expect(WebMock).to have_requested(:put, url + Digest::MD5.hexdigest(old_email)).with(body: {
'email': user.email, 'email': user.email,
@ -93,7 +93,7 @@ describe MailblusterManager, type: :model do
stub_request(:put, url + Digest::MD5.hexdigest(user.email)) stub_request(:put, url + Digest::MD5.hexdigest(user.email))
.to_return(body: response_body, status: 200) .to_return(body: response_body, status: 200)
add_tags = ['2021'] add_tags = ['2021']
response = MailblusterManager.edit_lead(user, add_tags: add_tags) response = described_class.edit_lead(user, add_tags: add_tags)
expect(WebMock).to have_requested(:put, url + Digest::MD5.hexdigest(user.email)).with(body: { expect(WebMock).to have_requested(:put, url + Digest::MD5.hexdigest(user.email)).with(body: {
'email': user.email, 'email': user.email,
@ -115,7 +115,7 @@ describe MailblusterManager, type: :model do
lead_url = url + email_hash.to_s lead_url = url + email_hash.to_s
stub_request(:delete, lead_url) stub_request(:delete, lead_url)
.to_return(body: response_body) .to_return(body: response_body)
response = MailblusterManager.delete_lead(user) response = described_class.delete_lead(user)
expect(WebMock).to have_requested(:delete, lead_url) expect(WebMock).to have_requested(:delete, lead_url)
expect(response).to eq(response_body) expect(response).to eq(response_body)