Ensure port setting works. Complete test coverage

Author: cbetta

amadeus/client/request.py

@@ -116,11 +116,18 @@ def _encoded_params(self):
 
     # Builds up the full URL based on the scheme, host, path, and params
     def __full_url(self):
-        full_url = '{0}://{1}{2}'.format(self.scheme, self.host, self.path)
+        full_url = '{0}://{1}'.format(self.scheme, self.host)
+        if not self.__port_matches_scheme():
+            full_url = '{0}:{1}'.format(full_url, self.port)
+        full_url = '{0}{1}'.format(full_url, self.path)
         if (self.verb == 'GET'):
             full_url += '?{0}'.format(self._encoded_params())
         return full_url
 
+    def __port_matches_scheme(self):
+        return ((self.ssl and self.port == 443) or
+                (not self.ssl and self.port == 80))
+
     # Adds an extra header if the verb is POST
     def __add_post_data_header(self):
         if (self.verb == 'POST'):

specs/client/request_spec.py

@@ -84,7 +84,26 @@
             })
 
             expect(self.request.http_request).to(be_a(HTTPRequest))
+            expect(self.request.http_request.get_full_url()).to(equal(
+                'https://example.com/foo/bar'))
             expect(self.request.http_request.data).to(equal(b'foo=bar'))
             expect(self.request.http_request.get_header('Content-Type')).to(
-                equal('application/x-www-form-urlencoded')
-            )
+                equal('application/x-www-form-urlencoded'))
+
+        with it('should handle a custom scheme and port'):
+            self.request = Request({
+                'host': self.host,
+                'verb': 'POST',
+                'path': self.path,
+                'params': self.params,
+                'bearer_token': self.bearer_token,
+                'client_version': self.client_version,
+                'language_version': self.lang_version,
+                'app_id': self.app_id,
+                'app_version': self.app_version,
+                'port': 8080,
+                'ssl': False
+            })
+
+            expect(self.request.http_request.get_full_url()).to(equal(
+                'http://example.com:8080/foo/bar'))

specs/mixins/http_spec.py

@@ -50,6 +50,21 @@
                 )
             )
 
+        with it('should use the same access token when cashed'):
+            self.response.result = {'access_token': '123', 'expires_in': 2000}
+            self.client._unauthenticated_request = self.request_method
+            self.client.request('POST', '/foo', foo='bar')
+
+            self.response.result = {'access_token': '234', 'expires_in': 2000}
+            self.client._unauthenticated_request = self.request_method
+            self.client.request('POST', '/foo', foo='bar')
+
+            expect(self.client._unauthenticated_request).not_to(
+                have_been_called_with(
+                    'POST', '/foo', {'foo': 'bar'}, 'Bearer 234'
+                )
+            )
+
     with context('Client._unauthenticated_request'):
         with it('should execute a full request'):
             with Stub() as http_response:

specs/mixins/pagination_spec.py

@@ -76,6 +76,7 @@
 
     with context('Client.last'):
         with it('should create a new request with the page and call it'):
+            self.response.request.params = {'page': {'offset': '0'}}
             self.response.result = {
                 'meta': {'links': {'last': 'http://f.co?page=1'}}
             }