telegram-bot 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f0e613a4546cd530c2abf33c26521740b2210ad1a4d1fedf1fc9b46be804ef
-  data.tar.gz: 623c0f1bfc57ce2d021be33237df291e93cde17573cbce64cf04ab53c83b14f5
+  metadata.gz: 61a22f62815ac892095b9a544fa1ce2cf2273f9e3c1d6bbe371b7a548e1f8762
+  data.tar.gz: 5b80eb16b7bd5bef68a4dcbf5a30cda40d1aaba95774930f9d78000dec3db624
 SHA512:
-  metadata.gz: 04aefa97d17e5d67881e9be5e291464bd04c933ff53d8b9daadd43a87d30387b38c14bf97567affe4b4ec9ef9292e7402d437aa5545bd87e6d3a833212e1d223
-  data.tar.gz: d279d8954013c7b6a2e6f7e923bef162f389751f5ce3e0672fc2ec7d9b8622c79125870fbc69043488e9d9933ef6967b2629c17c28321d786046109b18216fe6
+  metadata.gz: 6cbf0d110b678071dae96a0cabb0ac6142089c5482f25906a0684ba904c348300c48422c9254884025ccab214ce7487fad852b7d22ba696384937155b4030896
+  data.tar.gz: 54f32643648797d54ac815f989bc2902faee6ed17357e69d83fcbbfe17640ddcc3b669b83fd16e54ab72574cecccc40b03161f716340552851f017711d3bf68f

data/.codeclimate.yml

@@ -2,7 +2,3 @@ checks:
   method-complexity:
     config:
       threshold: 6 # should be just fine
-
-plugins:
-  rubocop:
-    enabled: true

data/.github/workflows/ci.yml

@@ -3,15 +3,15 @@ name: Lint & Test
 on: [push, pull_request]
 
 jobs:
-  # lint:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ruby/setup-ruby@v1
-  #       with:
-  #         ruby-version: '3.0'
-  #         bundler-cache: true
-  #     - run: bundle exec rubocop
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+      - run: bundle exec rubocop
 
   test:
     runs-on: ubuntu-latest

data/.rubocop.yml

@@ -1,15 +1,18 @@
-# Rubocop does not support 2.0
-Gemspec/RequiredRubyVersion: {Enabled: false}
+require: rubocop-rails
 
-Rails: {Enabled: true}
+AllCops:
+  TargetRubyVersion: 2.4
+  NewCops: enable
+  SuggestExtensions: false
+  Exclude:
+    - gemfiles/*
+    - tmp/*
+    - vendor/**/* # for github actions
 
-Layout/AlignParameters:
-  # Disable, till rubocop supports combination of styles.
-  # Use one of this styles where appropriate, keep it clean, compact and readable.
-  Enabled: false
-  # EnforcedStyle:
-  # - with_first_parameter
-  # - with_fixed_indentation
+Gemspec/DevelopmentDependencies: {Enabled: false}
+
+Layout/ArgumentAlignment: {EnforcedStyle: with_fixed_indentation}
+Layout/ParameterAlignment: {EnforcedStyle: with_fixed_indentation}
 
 # Breaks
 #
@@ -19,7 +22,11 @@ Layout/AlignParameters:
 #   )
 Layout/ClosingParenthesisIndentation: {Enabled: false}
 Layout/DotPosition: {EnforcedStyle: trailing}
+Layout/EmptyLineAfterGuardClause: {Enabled: false}
 Layout/FirstParameterIndentation: {EnforcedStyle: consistent}
+Layout/LineContinuationLeadingSpace: {Enabled: false}
+Layout/LineEndStringConcatenationIndentation: {EnforcedStyle: indented}
+Layout/LineLength: {Max: 100}
 # Same as Layout/ClosingParenthesisIndentation
 Layout/MultilineMethodCallBraceLayout: {Enabled: false}
 Layout/MultilineMethodCallIndentation: {EnforcedStyle: indented}
@@ -28,8 +35,16 @@ Layout/SpaceInsideHashLiteralBraces: {EnforcedStyle: no_space}
 
 # Offences named scopes and `expect {}.to change {}`.
 Lint/AmbiguousBlockAssociation: {Enabled: false}
+Lint/EmptyBlock:
+  Exclude:
+    - spec/**/*
 
+Naming/FileName:
+  Exclude:
+    - lib/tasks/telegram-bot.rake
+Naming/MethodParameterName: {MinNameLength: 2}
 Naming/PredicateName: {Enabled: false}
+Naming/RescuedExceptionsVariableName: {PreferredName: exception}
 Naming/VariableNumber: {EnforcedStyle: snake_case}
 
 Style/Alias: {Enabled: false}
@@ -45,12 +60,16 @@ Style/ModuleFunction: {Enabled: false}
 Style/NestedParenthesizedCalls: {Enabled: false}
 Style/SignalException: {EnforcedStyle: only_raise}
 Style/TrailingCommaInArguments: {Enabled: false}
-Style/TrailingCommaInLiteral: {EnforcedStyleForMultiline: comma}
+Style/TrailingCommaInArrayLiteral: {EnforcedStyleForMultiline: comma}
+Style/TrailingCommaInHashLiteral: {EnforcedStyleForMultiline: comma}
 
 Metrics/AbcSize: {Max: 21}
 # Other metrics are just enough.
 # This one offences all specs, routes and some initializers.
 Metrics/BlockLength: {Enabled: false}
-Metrics/LineLength: {Max: 100}
 Metrics/MethodLength: {Max: 30}
 Metrics/CyclomaticComplexity: {Max: 8}
+
+Rails/IndexWith: {Enabled: false}
+Rails/RakeEnvironment: {Enabled: false}
+Rails/ShortI18n: {Enabled: false}

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'rails-71' do
   gem 'actionpack', '~> 7.1.0'
   gem 'railties', '~> 7.1.0'

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# 0.16.2
+
+- Update to Bot API 7.3
+- Add `# frozen_string_literal: true` to all source files.
+
 # 0.16.1
 
 - Fix logger in poller mode in rails 7.1

data/Gemfile

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
 group :development do
   gem 'appraisal', '~> 2.2'
 
-  gem 'pry', '~> 0.14.1'
-  gem 'pry-byebug', '~> 3.10.1'
+  gem 'debug', '~> 1.9.2'
   gem 'sdoc', '~> 2.0.3'
 
   gem 'telegram-bot-types', '~> 0.6.3'
@@ -14,7 +15,8 @@ group :development do
   gem 'rspec-its', '~> 1.3.0'
   gem 'rspec-rails', '~> 4.0.2'
 
-  gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop', '~> 1.59.0'
+  gem 'rubocop-rails', '~> 2.23.1'
 
   gem 'coveralls', '~> 0.8.23', require: false
 end

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'telegram/bot'
 
-require 'pry'
-Pry.start
+require 'irb'
+require 'irb/completion'
+
+IRB.setup(nil)
+IRB::Irb.new.run(IRB.conf)

data/bin/fetch-telegram-methods

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Fetch list of methods from Telegram docs.
 # Use it to update client.rb.
@@ -6,7 +8,7 @@
 require 'net/http'
 require 'nokogiri'
 
-DOCS_URL = 'https://core.telegram.org/bots/api'.freeze
+DOCS_URL = 'https://core.telegram.org/bots/api'
 
 page_html = Net::HTTP.get(URI(DOCS_URL))
 doc = Nokogiri::HTML(page_html)
@@ -18,11 +20,11 @@ headers = doc.css('h3, h4').
   map { |g| g.map(&:text) }
 
 # Method starts with lowercase and does not have spaces.
-NOT_METHOD_REGEXP = /(\A[^a-z])|\s/
+NOT_METHOD_REGEXP = /(\A[^a-z])|\s/.freeze
 
 # Filter method names.
 method_list = headers.
-  map { |g| g.reject { |x| x.match?(NOT_METHOD_REGEXP) } }.
+  map { |g| g.grep_v(NOT_METHOD_REGEXP) }.
   reject(&:empty?)
 
 api_version = doc.text.match(/^(?:Introducing )?(Bot API ([\d\.]+))\.?$/)

data/bin/install_git_hooks

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-root = File.expand_path('../../', __FILE__)
+root = File.expand_path('..', __dir__)
 hooks_dir = "#{root}/bin/git-hooks"
 
 `ls -1 #{hooks_dir}`.each_line.map(&:strip).each do |file|

data/gemfiles/rails_51.gemfile

@@ -7,14 +7,14 @@ gem "railties", "~> 5.1.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.14.1"
-  gem "pry-byebug", "~> 3.10.1"
+  gem "debug", "~> 1.9.2"
   gem "sdoc", "~> 2.0.3"
   gem "telegram-bot-types", "~> 0.6.3"
   gem "rspec", "~> 3.12.0"
   gem "rspec-its", "~> 1.3.0"
   gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 0.52.1"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
   gem "coveralls", "~> 0.8.23", require: false
 end
 

data/gemfiles/rails_52.gemfile

@@ -7,14 +7,14 @@ gem "railties", "~> 5.2.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.14.1"
-  gem "pry-byebug", "~> 3.10.1"
+  gem "debug", "~> 1.9.2"
   gem "sdoc", "~> 2.0.3"
   gem "telegram-bot-types", "~> 0.6.3"
   gem "rspec", "~> 3.12.0"
   gem "rspec-its", "~> 1.3.0"
   gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 0.52.1"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
   gem "coveralls", "~> 0.8.23", require: false
 end
 

data/gemfiles/rails_60.gemfile

@@ -7,14 +7,14 @@ gem "railties", "~> 6.0.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.14.1"
-  gem "pry-byebug", "~> 3.10.1"
+  gem "debug", "~> 1.9.2"
   gem "sdoc", "~> 2.0.3"
   gem "telegram-bot-types", "~> 0.6.3"
   gem "rspec", "~> 3.12.0"
   gem "rspec-its", "~> 1.3.0"
   gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 0.52.1"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
   gem "coveralls", "~> 0.8.23", require: false
 end
 

data/gemfiles/rails_61.gemfile

@@ -7,14 +7,14 @@ gem "railties", "~> 6.1.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.14.1"
-  gem "pry-byebug", "~> 3.10.1"
+  gem "debug", "~> 1.9.2"
   gem "sdoc", "~> 2.0.3"
   gem "telegram-bot-types", "~> 0.6.3"
   gem "rspec", "~> 3.12.0"
   gem "rspec-its", "~> 1.3.0"
   gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 0.52.1"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
   gem "coveralls", "~> 0.8.23", require: false
 end
 

data/gemfiles/rails_70.gemfile

@@ -7,14 +7,14 @@ gem "railties", "~> 7.0.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.14.1"
-  gem "pry-byebug", "~> 3.10.1"
+  gem "debug", "~> 1.9.2"
   gem "sdoc", "~> 2.0.3"
   gem "telegram-bot-types", "~> 0.6.3"
   gem "rspec", "~> 3.12.0"
   gem "rspec-its", "~> 1.3.0"
   gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 0.52.1"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
   gem "coveralls", "~> 0.8.23", require: false
 end
 

data/gemfiles/rails_71.gemfile

@@ -7,14 +7,14 @@ gem "railties", "~> 7.1.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
-  gem "pry", "~> 0.14.1"
-  gem "pry-byebug", "~> 3.10.1"
+  gem "debug", "~> 1.9.2"
   gem "sdoc", "~> 2.0.3"
   gem "telegram-bot-types", "~> 0.6.3"
   gem "rspec", "~> 3.12.0"
   gem "rspec-its", "~> 1.3.0"
   gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 0.52.1"
+  gem "rubocop", "~> 1.59.0"
+  gem "rubocop-rails", "~> 2.23.1"
   gem "coveralls", "~> 0.8.23", require: false
 end
 

data/lib/tasks/telegram-bot.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :telegram do
   namespace :bot do
     desc 'Run poller. It broadcasts Rails.logger to STDOUT in dev like `rails s` do. ' \
@@ -6,14 +8,14 @@ namespace :telegram do
       ENV['BOT_POLLER_MODE'] = 'true'
       Rake::Task['environment'].invoke
       if ENV.fetch('LOG_TO_STDOUT') { Rails.env.development? }.present?
-        console = ActiveSupport::Logger.new(STDERR)
-        if ::Rails.logger.respond_to?(:broadcast_to)
-          ::Rails.logger.broadcast_to(console)
+        console = ActiveSupport::Logger.new($stderr)
+        if Rails.logger.respond_to?(:broadcast_to)
+          Rails.logger.broadcast_to(console)
         else
           Rails.logger.extend ActiveSupport::Logger.broadcast console
         end
       end
-      Telegram::Bot::UpdatesPoller.start(ENV['BOT'].try!(:to_sym) || :default)
+      Telegram::Bot::UpdatesPoller.start(ENV['BOT']&.to_sym || :default)
     end
 
     desc 'Set webhook urls for all bots'

data/lib/telegram/bot/async.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     # Telegram clients can perform requests in async way with
@@ -128,7 +130,7 @@ module Telegram
       #
       # If no block is given returns previously set value or the global one,
       # set by #async=.
-      def async(val = true)
+      def async(val = true) # rubocop:disable Style/OptionalBooleanParameter
         thread_key = object_id
         thread_store = Async.thread_store
         return thread_store.fetch(thread_key) { @async } unless block_given?
@@ -137,7 +139,7 @@ module Telegram
           thread_store[thread_key] = self.class.prepare_async_val(val)
           yield
         ensure
-          if MISSING_VALUE == old_val
+          if old_val == MISSING_VALUE
             thread_store.delete(thread_key)
           else
             thread_store[thread_key] = old_val

data/lib/telegram/bot/client/api_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 
 module Telegram
   module Bot
     class Client
       module ApiHelper
-        METHODS_LIST_FILE = File.expand_path('../api_methods.txt', __FILE__)
+        METHODS_LIST_FILE = File.expand_path('api_methods.txt', __dir__)
 
         class << self
           def methods_list(file = METHODS_LIST_FILE)

data/lib/telegram/bot/client/api_methods.txt

@@ -1,5 +1,5 @@
 # Generated with bin/fetch-telegram-methods
-# Bot API 6.8
+# Bot API 7.3
 
 getUpdates
 setWebhook
@@ -11,7 +11,9 @@ logOut
 close
 sendMessage
 forwardMessage
+forwardMessages
 copyMessage
+copyMessages
 sendPhoto
 sendAudio
 sendDocument
@@ -26,6 +28,7 @@ sendContact
 sendPoll
 sendDice
 sendChatAction
+setMessageReaction
 getUserProfilePhotos
 getFile
 banChatMember
@@ -70,6 +73,8 @@ hideGeneralForumTopic
 unhideGeneralForumTopic
 unpinAllGeneralForumTopicMessages
 answerCallbackQuery
+getUserChatBoosts
+getBusinessConnection
 setMyCommands
 deleteMyCommands
 getMyCommands
@@ -92,6 +97,7 @@ stopMessageLiveLocation
 editMessageReplyMarkup
 stopPoll
 deleteMessage
+deleteMessages
 
 sendSticker
 getStickerSet
@@ -101,6 +107,7 @@ createNewStickerSet
 addStickerToSet
 setStickerPositionInSet
 deleteStickerFromSet
+replaceStickerInSet
 setStickerEmojiList
 setStickerKeywords
 setStickerMaskPosition

data/lib/telegram/bot/client/request_body_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Telegram

data/lib/telegram/bot/client/typed_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/client/api_helper'
 require 'active_support/core_ext/string/inflections'
 

data/lib/telegram/bot/client.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/keys'
 require 'httpclient'
 
 module Telegram
   module Bot
     class Client
-      SERVER = 'https://api.telegram.org'.freeze
-      URL_TEMPLATE = '%<server>s/bot%<token>s/'.freeze
+      SERVER = 'https://api.telegram.org'
+      URL_TEMPLATE = '%<server>s/bot%<token>s/'
 
       autoload :RequestBodyFormatter, 'telegram/bot/client/request_body_formatter'
       autoload :TypedResponse, 'telegram/bot/client/typed_response'
@@ -41,7 +43,7 @@ module Telegram
         end
 
         def error_for_response(response)
-          result = JSON.parse(response.body) rescue nil # rubocop:disable RescueModifier
+          result = JSON.parse(response.body) rescue nil # rubocop:disable Style/RescueModifier
           return Error.new(response.reason) unless result
           message = result['description'] || '-'
           # This errors are raised only for valid responses from Telegram

data/lib/telegram/bot/client_stub.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     # Stubbed client for tests. Saves all requests into #requests hash.
@@ -17,7 +19,7 @@ module Telegram
       class << self
         # Any call to Client.new will return ClientStub instance when `enabled` is true.
         # Can be used with a block.
-        def stub_all!(enabled = true)
+        def stub_all!(enabled = true) # rubocop:disable Style/OptionalBooleanParameter
           Client.extend(StubbedConstructor) unless Client < StubbedConstructor
           return @_stub_all = enabled unless block_given?
           begin
@@ -34,7 +36,7 @@ module Telegram
         end
       end
 
-      def initialize(token = nil, username = nil, **options)
+      def initialize(token = nil, username = nil, **options) # rubocop:disable Lint/MissingSuper
         @token = token || options[:token]
         @username = username || options[:username] || token
         reset

data/lib/telegram/bot/config_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/indifferent_access'
 
@@ -44,7 +46,7 @@ module Telegram
       # from `secrets.yml` merging `telegram['bot']` at `:default` key.
       #
       # Can be overwritten with .bots_config=
-      def bots_config
+      def bots_config # rubocop:disable Metrics/PerceivedComplexity
         @bots_config ||=
           if defined?(Rails.application)
             app = Rails.application

data/lib/telegram/bot/debug_client.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module DebugClient
-      def debug!(dev = STDOUT)
+      def debug!(dev = $stdout)
         if block_given?
           begin
             old_dev = client.debug_dev

data/lib/telegram/bot/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/json'
@@ -21,7 +23,7 @@ module Telegram
       end
 
       def inspect
-        "#<#{self.class.name}(#{controller.try!(:name)})>"
+        "#<#{self.class.name}(#{controller&.name})>"
       end
     end
   end

data/lib/telegram/bot/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/routes_helper'
 
 module Telegram
@@ -10,7 +12,7 @@ module Telegram
       end
 
       config.before_initialize do
-        ::ActionDispatch::Routing::Mapper.send(:include, RoutesHelper)
+        ::ActionDispatch::Routing::Mapper.include RoutesHelper
       end
 
       initializer 'telegram.bot.updates_controller.set_config' do |app|

data/lib/telegram/bot/routes_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'openssl'
 

data/lib/telegram/bot/rspec/callback_query_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec'
 require 'telegram/bot/rspec/message_helpers'
 
@@ -7,7 +9,7 @@ RSpec.shared_context 'telegram/bot/callback_query' do
 
   subject { -> { dispatch callback_query: payload } }
   let(:payload) { {id: callback_query_id, from: from, message: message, data: data} }
-  let(:callback_query_id) { 11 }
+  let(:callback_query_id) { '11' }
   let(:message_id) { 22 }
   let(:message) { {message_id: message_id, chat: chat, text: 'message text'} }
   let(:data) { raise '`let(:data) { "callback query data here" }` is required' }

data/lib/telegram/bot/rspec/client_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module RSpec
@@ -61,14 +63,14 @@ module Telegram
 
           attr_reader :performed_requests, :description
 
-          def initialize(bot, action, description: nil)
+          def initialize(bot, action, description: nil) # rubocop:disable Lint/MissingSuper
             @bot = bot
             @action = action
             @description = description || "make #{action} telegram request"
             exactly(1)
           end
 
-          def matches?(proc) # rubocop:disable AbcSize
+          def matches?(proc) # rubocop:disable Metrics/AbcSize
             raise ArgumentError, 'matcher only supports block expectations' unless proc.is_a?(Proc)
             original_requests_count = bot.requests[action].count
             proc.call
@@ -115,15 +117,15 @@ module Telegram
             :arg_list_matcher, :matching_requests_count
 
           def base_message
-            "make #{expectation_type.to_s.tr('_', ' ')} #{expected_number} " \
-              "#{bot.inspect}.#{action} requests,".tap do |msg|
-              msg << " with #{arg_list_matcher}," if arg_list_matcher
-              msg << " but made #{matching_requests_count}"
-              if performed_requests
-                actual_args = performed_requests.map(&:inspect).join(', ')
-                msg << ", and #{performed_requests.count} with #{actual_args}"
-              end
+            msg = "make #{expectation_type.to_s.tr('_', ' ')} #{expected_number} " \
+              "#{bot.inspect}.#{action} requests,"
+            msg += " with #{arg_list_matcher}," if arg_list_matcher
+            msg += " but made #{matching_requests_count}"
+            if performed_requests
+              actual_args = performed_requests.map(&:inspect).join(', ')
+              msg += ", and #{performed_requests.count} with #{actual_args}"
             end
+            msg
           end
         end
 

data/lib/telegram/bot/rspec/integration/poller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/rspec/integration/shared'
 
 RSpec.shared_context 'telegram/bot/integration/poller' do