Merge pull request #1349 from travis-ci/release_241211

Release 24 12 11

Author: DominikAlberski

lib/travis/api/v3.rb

@@ -52,6 +52,7 @@ def location(env)
       UnprocessableEntity = ClientError        .create('request unable to be processed due to semantic errors', status: 422)
       WrongCredentials    = ClientError        .create('access denied',  status: 403)
       WrongParams         = ClientError        .create('wrong parameters')
+      TimeoutError        = ServerError        .create("Credit card processing is currently taking longer than expected. Please check back in a few minutes and refresh the screen at that time.<br>We apologize for the inconvenience and appreciate your patience.", status: 504)
     end
   end
 end

lib/travis/api/v3/billing_client.rb

@@ -146,6 +146,8 @@ def create_subscription(subscription_data)
     def create_v2_subscription(subscription_data)
       response = connection.post('/v2/subscriptions', subscription_data)
       handle_v2_subscription_response(response)
+    rescue Faraday::TimeoutError
+      raise Travis::API::V3::TimeoutError
     end
 
     def changetofree_v2_subscription(subscription_id, data)

spec/v3/billing_client_spec.rb

@@ -231,6 +231,16 @@
     let(:subscription_data) {{ 'address' => 'Rigaer' }}
     subject { billing.create_v2_subscription(subscription_data) }
 
+    context 'when the connection times out' do
+      before do
+        allow_any_instance_of(Faraday::Connection).to receive(:post).and_raise(Faraday::TimeoutError)
+      end
+
+      it 'raises a TimeoutError with the correct message and status' do
+        expect { subject }.to raise_error(Travis::API::V3::TimeoutError, /Credit card processing is currently taking longer than expected/)
+      end
+    end
+
     it 'requests the creation and returns the representation' do
       stubbed_request = stub_billing_request(:post, "/v2/subscriptions", auth_key: auth_key, user_id: user_id)
         .with(body: JSON.dump(subscription_data))