chore: Upgrade rails and ruby versions (#2400)

ruby version: 3.0.2 rails version: 6.1.4
2021-08-03 20:11:52 +05:30
parent 7e960b7c72
commit ab54d9c629
61 changed files with 498 additions and 626 deletions
--- a/spec/actions/contact_merge_action_spec.rb
+++ b/spec/actions/contact_merge_action_spec.rb
@@ -8,9 +8,11 @@ describe ::ContactMergeAction do
  let!(:mergee_contact) { create(:contact, account: account) }

  before do
-    2.times.each { create(:conversation, contact: base_contact) }
-    2.times.each { create(:conversation, contact: mergee_contact) }
-    2.times.each { create(:message, sender: mergee_contact) }
+    2.times.each do
+      create(:conversation, contact: base_contact)
+      create(:conversation, contact: mergee_contact)
+      create(:message, sender: mergee_contact)
+    end
  end

  describe '#perform' do