From 4329616c53c8fdcc3e3cc7e0e27f8292e5386f31 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 8 Nov 2023 09:43:17 -0500 Subject: [PATCH] Ignore block result of `send` method and remove `rubocop:disable` in deepl spec (#27741) --- spec/lib/translation_service/deepl_spec.rb | 43 +++++++++++----------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/spec/lib/translation_service/deepl_spec.rb b/spec/lib/translation_service/deepl_spec.rb index 5a1d0f094a..4797a3dc63 100644 --- a/spec/lib/translation_service/deepl_spec.rb +++ b/spec/lib/translation_service/deepl_spec.rb @@ -8,12 +8,14 @@ RSpec.describe TranslationService::DeepL do let(:plan) { 'advanced' } before do - stub_request(:get, 'https://api.deepl.com/v2/languages?type=source').to_return( - body: '[{"language":"EN","name":"English"},{"language":"UK","name":"Ukrainian"}]' - ) - stub_request(:get, 'https://api.deepl.com/v2/languages?type=target').to_return( - body: '[{"language":"EN-GB","name":"English (British)"},{"language":"ZH","name":"Chinese"}]' - ) + %w(api-free.deepl.com api.deepl.com).each do |host| + stub_request(:get, "https://#{host}/v2/languages?type=source").to_return( + body: '[{"language":"EN","name":"English"},{"language":"UK","name":"Ukrainian"}]' + ) + stub_request(:get, "https://#{host}/v2/languages?type=target").to_return( + body: '[{"language":"EN-GB","name":"English (British)"},{"language":"ZH","name":"Chinese"}]' + ) + end end describe '#translate' do @@ -73,28 +75,25 @@ RSpec.describe TranslationService::DeepL do end end - describe '#request' do + describe 'the paid and free plan api hostnames' do before do - stub_request(:any, //) - # rubocop:disable Lint/EmptyBlock - service.send(:request, :get, '/v2/languages') { |res| } - # rubocop:enable Lint/EmptyBlock + service.languages end - it 'uses paid plan base URL' do - expect(a_request(:get, 'https://api.deepl.com/v2/languages')).to have_been_made.once - end - - context 'with free plan' do - let(:plan) { 'free' } - - it 'uses free plan base URL' do - expect(a_request(:get, 'https://api-free.deepl.com/v2/languages')).to have_been_made.once + context 'without a plan set' do + it 'uses paid plan base URL and sends an API key' do + expect(a_request(:get, 'https://api.deepl.com/v2/languages?type=source').with(headers: { Authorization: 'DeepL-Auth-Key my-api-key' })).to have_been_made.once + expect(a_request(:get, 'https://api.deepl.com/v2/languages?type=target').with(headers: { Authorization: 'DeepL-Auth-Key my-api-key' })).to have_been_made.once end end - it 'sends API key' do - expect(a_request(:get, 'https://api.deepl.com/v2/languages').with(headers: { Authorization: 'DeepL-Auth-Key my-api-key' })).to have_been_made.once + context 'with the free plan' do + let(:plan) { 'free' } + + it 'uses free plan base URL and sends an API key' do + expect(a_request(:get, 'https://api-free.deepl.com/v2/languages?type=source').with(headers: { Authorization: 'DeepL-Auth-Key my-api-key' })).to have_been_made.once + expect(a_request(:get, 'https://api-free.deepl.com/v2/languages?type=target').with(headers: { Authorization: 'DeepL-Auth-Key my-api-key' })).to have_been_made.once + end end end end