KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(deps): bump puma from to 5.6.2, rails to 6.1.4.6 (#3969)

Browse source
This commit is contained in:
dependabot[bot] 2022-02-14 20:09:21 +05:30 • committed by GitHub
parent 9c7044c81b
commit f34a2e6115
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

116
Gemfile.lock
View file

@ -9,63 +9,63 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.1.4.3) actioncable (6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.3) actionmailbox (6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
activejob (= 6.1.4.3) activejob (= 6.1.4.6)
activerecord (= 6.1.4.3) activerecord (= 6.1.4.6)
activestorage (= 6.1.4.3) activestorage (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.4.3) actionmailer (6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
actionview (= 6.1.4.3) actionview (= 6.1.4.6)
activejob (= 6.1.4.3) activejob (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.4.3) actionpack (6.1.4.6)
actionview (= 6.1.4.3) actionview (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.4.3) actiontext (6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
activerecord (= 6.1.4.3) activerecord (= 6.1.4.6)
activestorage (= 6.1.4.3) activestorage (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.4.3) actionview (6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_record_query_trace (1.8) active_record_query_trace (1.8)
activejob (6.1.4.3) activejob (6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.4.3) activemodel (6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
activerecord (6.1.4.3) activerecord (6.1.4.6)
activemodel (= 6.1.4.3) activemodel (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
activerecord-import (1.2.0) activerecord-import (1.2.0)
activerecord (>= 3.2) activerecord (>= 3.2)
activestorage (6.1.4.3) activestorage (6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
activejob (= 6.1.4.3) activejob (= 6.1.4.6)
activerecord (= 6.1.4.3) activerecord (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
marcel (~> 1.0.0) marcel (~> 1.0.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (6.1.4.3) activesupport (6.1.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -300,7 +300,7 @@ GEM
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.11) i18n (1.9.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
image_processing (1.12.1) image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5) mini_magick (>= 4.9.5, < 5)
@ -346,7 +346,7 @@ GEM
listen (3.7.0) listen (3.7.0)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.13.0) loofah (2.14.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@ -400,7 +400,7 @@ GEM
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.5.2) puma (5.6.2)
nio4r (~> 2.0) nio4r (~> 2.0)
pundit (2.1.1) pundit (2.1.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -416,29 +416,29 @@ GEM
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-timeout (0.6.0) rack-timeout (0.6.0)
rails (6.1.4.3) rails (6.1.4.6)
actioncable (= 6.1.4.3) actioncable (= 6.1.4.6)
actionmailbox (= 6.1.4.3) actionmailbox (= 6.1.4.6)
actionmailer (= 6.1.4.3) actionmailer (= 6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
actiontext (= 6.1.4.3) actiontext (= 6.1.4.6)
actionview (= 6.1.4.3) actionview (= 6.1.4.6)
activejob (= 6.1.4.3) activejob (= 6.1.4.6)
activemodel (= 6.1.4.3) activemodel (= 6.1.4.6)
activerecord (= 6.1.4.3) activerecord (= 6.1.4.6)
activestorage (= 6.1.4.3) activestorage (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.4.3) railties (= 6.1.4.6)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2) rails-html-sanitizer (1.4.2)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.1.4.3) railties (6.1.4.6)
actionpack (= 6.1.4.3) actionpack (= 6.1.4.6)
activesupport (= 6.1.4.3) activesupport (= 6.1.4.6)
method_source method_source
rake (>= 0.13) rake (>= 0.13)
thor (~> 1.0) thor (~> 1.0)
@ -583,7 +583,7 @@ GEM
squasher (0.6.2) squasher (0.6.2)
statsd-ruby (1.5.0) statsd-ruby (1.5.0)
telephone_number (1.4.12) telephone_number (1.4.12)
thor (1.1.0) thor (1.2.1)
tilt (2.0.10) tilt (2.0.10)
time_diff (0.3.0) time_diff (0.3.0)
activesupport activesupport
@ -635,7 +635,7 @@ GEM
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
wisper (2.0.0) wisper (2.0.0)
zeitwerk (2.5.1) zeitwerk (2.5.4)
PLATFORMS PLATFORMS
arm64-darwin-20 arm64-darwin-20

5
spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
View file

@ -131,11 +131,12 @@ RSpec.describe 'Campaigns API', type: :request do
twilio_inbox = create(:inbox, channel: twilio_sms) twilio_inbox = create(:inbox, channel: twilio_sms)
label1 = create(:label, account: account) label1 = create(:label, account: account)
label2 = create(:label, account: account) label2 = create(:label, account: account)
scheduled_at = 2.days.from_now
post "/api/v1/accounts/#{account.id}/campaigns", post "/api/v1/accounts/#{account.id}/campaigns",
params: { params: {
inbox_id: twilio_inbox.id, title: 'test', message: 'test message', inbox_id: twilio_inbox.id, title: 'test', message: 'test message',
scheduled_at: 2.days.from_now, scheduled_at: scheduled_at,
audience: [{ type: 'Label', id: label1.id }, { type: 'Label', id: label2.id }] audience: [{ type: 'Label', id: label1.id }, { type: 'Label', id: label2.id }]
}, },
headers: administrator.create_new_auth_token, headers: administrator.create_new_auth_token,
@ -145,7 +146,7 @@ RSpec.describe 'Campaigns API', type: :request do
response_data = JSON.parse(response.body, symbolize_names: true) response_data = JSON.parse(response.body, symbolize_names: true)
expect(response_data[:campaign_type]).to eq('one_off') expect(response_data[:campaign_type]).to eq('one_off')
expect(response_data[:scheduled_at].present?).to eq true expect(response_data[:scheduled_at].present?).to eq true
expect(response_data[:scheduled_at]).to eq(2.days.from_now.to_i) expect(response_data[:scheduled_at]).to eq(scheduled_at.to_i)
expect(response_data[:audience].pluck(:id)).to include(label1.id, label2.id) expect(response_data[:audience].pluck(:id)).to include(label1.id, label2.id)
end end
end end