More test de-duplication + acquire_token timeout => nil.

Author: samuel-williams-shopify

fixtures/async/limiter/a_limiter.rb

@@ -59,6 +59,20 @@ module Limiter
 				result = limiter.acquire(timeout: 0.01)
 				expect(result).to be_truthy
 			end
+
+			with "#acquire_token" do
+				it "supports acquire_token with resources" do
+					token = limiter.acquire_token
+					
+					expect(token.released?).to be == false
+					
+					token.release
+					expect(token.released?).to be == true
+					
+					# Resource returned to queue:
+					expect(limiter).not.to be(:limited?)
+				end
+			end
 
 			with "concurrency" do
 				include Sus::Fixtures::Async::SchedulerContext

fixtures/async/limiter/a_semaphore.rb

@@ -30,6 +30,18 @@ module Limiter
 				limiter.release
 				expect(limiter).not.to be(:limited?)
 			end
+
+			with "#acquire_token" do
+				it "returns nil when timeout is reached" do
+					# Fill the semaphore to capacity:
+					limiter.acquire
+
+					token = limiter.acquire_token(timeout: 0)
+					
+					# Should get nil token due to timeout (no resources available)
+					expect(token).to be == nil
+				end
+			end
 		end
 	end
 end

lib/async/limiter/generic.rb

@@ -126,6 +126,8 @@ def acquire(timeout: nil, cost: 1, **options)
 			# @asynchronous
 			def acquire_token(**options)
 				resource = acquire(**options)
+				return nil unless resource
+				
 				token = Token.new(self, resource, **options)
 
 				return token unless block_given?

test/async/limiter/queued.rb

@@ -101,32 +101,5 @@
 			# Should be empty again
 			expect(semaphore).to be(:limited?)
 		end
-		
-		with "#acquire_token" do
-			it "supports acquire_token with resources" do
-				semaphore.release("token_resource")
-				
-				token = semaphore.acquire_token
-				
-				expect(token).to be_a(Async::Limiter::Token)
-				expect(token.resource).to be == "token_resource"  # Actual resource from queue
-				expect(token.released?).to be == false
-				
-				token.release
-				expect(token.released?).to be == true
-				
-				# Resource returned to queue:
-				expect(semaphore).not.to be(:limited?)
-			end
-			
-			it "supports token with timeout" do
-				# Empty queue:
-				token = semaphore.acquire_token(timeout: 0)
-				
-				# Should get nil resource due to timeout
-				expect(token.resource).to be == nil
-				expect(token.released?).to be == true
-			end
-		end
 	end
 end