Merge pull request #54 from ba-st/use_asAbsoluteUrl

Avoid DNU when using an API client with a relative URL
ba-st · Jun 16, 2022 · a11caa6 · a11caa6
2 parents 7f64b21 + 733fc9f
commit a11caa6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/source/Superluminal-Model-Tests/CompositeHttpRequestCommandTest.class.st b/source/Superluminal-Model-Tests/CompositeHttpRequestCommandTest.class.st
@@ -10,15 +10,13 @@ CompositeHttpRequestCommandTest >> testApplyOn [
 	| httpClient command |
 
 	httpClient := ZnClient new.
-	command := CompositeHttpRequestCommand
-		ofAll:
-			(Array
-				with: (AddQueryStringFieldCommand named: 'fist_name' pairedTo: 'fran')
-				with: (AddQueryStringFieldCommand named: 'last_name' pairedTo: 'fox')).
+	command := CompositeHttpRequestCommand ofAll: ( Array
+			             with: ( AddQueryStringFieldCommand named: 'first_name' pairedTo: 'fran' )
+			             with: ( AddQueryStringFieldCommand named: 'last_name' pairedTo: 'fox' ) ).
 
 	command applyOn: httpClient.
 
-	self assert: httpClient request uri equals: '/?last_name=fox&fist_name=fran' asUrl
+	self assertUrl: httpClient request uri equals: '/?last_name=fox&first_name=fran'
 ]
 
 { #category : #tests }
@@ -27,10 +25,10 @@ CompositeHttpRequestCommandTest >> testShortcutCreation [
 	| httpClient command |
 
 	httpClient := ZnClient new.
-	command := (AddQueryStringFieldCommand named: 'fist_name' pairedTo: 'fran')
-		+ (AddQueryStringFieldCommand named: 'last_name' pairedTo: 'fox').
+	command := ( AddQueryStringFieldCommand named: 'first_name' pairedTo: 'fran' )
+	           + ( AddQueryStringFieldCommand named: 'last_name' pairedTo: 'fox' ).
 
 	command applyOn: httpClient.
 
-	self assert: httpClient request uri equals: '/?last_name=fox&fist_name=fran' asUrl
+	self assertUrl: httpClient request uri equals: '/?last_name=fox&first_name=fran'
 ]
diff --git a/source/Superluminal-RESTfulAPI-Tests/RESTfulAPIClientIntegrationTest.class.st b/source/Superluminal-RESTfulAPI-Tests/RESTfulAPIClientIntegrationTest.class.st
@@ -25,7 +25,7 @@ RESTfulAPIClientIntegrationTest >> httpbinCacheLocation [
 { #category : #private }
 RESTfulAPIClientIntegrationTest >> httpbinLocation [
 
-	^ 'http://localhost' asUrl
+	^ 'http://localhost' asAbsoluteUrl
 ]
 
 { #category : #private }

diff --git a/source/Superluminal-RESTfulAPI-Tests/RESTfulAPIClientTest.class.st b/source/Superluminal-RESTfulAPI-Tests/RESTfulAPIClientTest.class.st
@@ -29,7 +29,7 @@ RESTfulAPIClientTest >> jsonOkResponse [
 { #category : #private }
 RESTfulAPIClientTest >> location [
 
-	^ 'http://localhost' asUrl + resourceIdentifier
+	^ 'http://localhost' asAbsoluteUrl + resourceIdentifier
 ]
 
 { #category : #tests }

diff --git a/source/Superluminal-RESTfulAPI/RESTfulAPIClient.class.st b/source/Superluminal-RESTfulAPI/RESTfulAPIClient.class.st
@@ -50,7 +50,7 @@ RESTfulAPIClient >> clientErrorMessageFrom: response [
 RESTfulAPIClient >> clientPoolFor: aLocation [
 
 	^ httpClientPoolByAuthority
-		at: aLocation asUrl authorityWithPort
+		at: aLocation asAbsoluteUrl authorityWithPort
 		ifAbsentPut: [ OPBasicPool new
 				creator: httpClientProvider;
 				destroyer: #close;

diff --git a/.../Superluminal-Service-Discovery-Tests/ConsulAgentHttpAPIBasedDiscoveryClientTest.class.st b/.../Superluminal-Service-Discovery-Tests/ConsulAgentHttpAPIBasedDiscoveryClientTest.class.st
@@ -12,9 +12,9 @@ Class {
 }
 
 { #category : #accessing }
-ConsulAgentHttpAPIBasedDiscoveryClientTest >> consulAgentLocation [ 
+ConsulAgentHttpAPIBasedDiscoveryClientTest >> consulAgentLocation [
 
-	^ 'http://localhost' asUrl port: port
+	^ 'http://localhost' asAbsoluteUrl port: port
 ]
 
 { #category : #running }