fix: fixed tests

Author: javierdfm

lib/stream-chat/channel_batch_updater.rb

@@ -33,9 +33,9 @@ def add_members(filter, members)
 
     # removeMembers - Remove members from channels matching the filter
     # @param filter [StringKeyHash] Filter to select channels
-    # @param members [T::Array[String]] Member IDs to remove
+    # @param members [T::Array[StringKeyHash]] Members to remove (each with user_id key)
     # @return [StreamChat::StreamResponse] The server response
-    sig { params(filter: StringKeyHash, members: T::Array[String]).returns(StreamChat::StreamResponse) }
+    sig { params(filter: StringKeyHash, members: T::Array[StringKeyHash]).returns(StreamChat::StreamResponse) }
     def remove_members(filter, members)
       @client.update_channels_batch(
         {
@@ -136,9 +136,9 @@ def show(filter)
 
     # archive - Archive channels matching the filter for specified members
     # @param filter [StringKeyHash] Filter to select channels
-    # @param members [T::Array[String]] Member IDs to archive the channels for
+    # @param members [T::Array[StringKeyHash]] Members to archive channels for (each with user_id key)
     # @return [StreamChat::StreamResponse] The server response
-    sig { params(filter: StringKeyHash, members: T::Array[String]).returns(StreamChat::StreamResponse) }
+    sig { params(filter: StringKeyHash, members: T::Array[StringKeyHash]).returns(StreamChat::StreamResponse) }
     def archive(filter, members)
       @client.update_channels_batch(
         {
@@ -151,9 +151,9 @@ def archive(filter, members)
 
     # unarchive - Unarchive channels matching the filter for specified members
     # @param filter [StringKeyHash] Filter to select channels
-    # @param members [T::Array[String]] Member IDs to unarchive the channels for
+    # @param members [T::Array[StringKeyHash]] Members to unarchive channels for (each with user_id key)
     # @return [StreamChat::StreamResponse] The server response
-    sig { params(filter: StringKeyHash, members: T::Array[String]).returns(StreamChat::StreamResponse) }
+    sig { params(filter: StringKeyHash, members: T::Array[StringKeyHash]).returns(StreamChat::StreamResponse) }
     def unarchive(filter, members)
       @client.update_channels_batch(
         {

spec/channel_batch_updater_spec.rb

@@ -18,19 +18,31 @@ def loop_times(times)
     end
   end
 
+  def rate_limit_error?(task)
+    result = task['result']
+    return false unless result.is_a?(Hash)
+
+    description = result['description']
+    return false unless description.is_a?(String)
+
+    description.downcase.include?('rate limit')
+  end
+
+  def fetch_task_with_retry(task_id, attempt)
+    @client.get_task(task_id)
+  rescue StandardError => e
+    raise e if attempt >= 10
+
+    sleep(1)
+    nil
+  end
+
   def wait_for_task(task_id, timeout_seconds: 120)
     sleep(2) # Initial delay
 
     timeout_seconds.times do |i|
-      begin
-        task = @client.get_task(task_id)
-      rescue StandardError => e
-        if i < 10
-          sleep(1)
-          next
-        end
-        raise e
-      end
+      task = fetch_task_with_retry(task_id, i)
+      next if task.nil?
 
       expect(task['id']).to eq(task_id)
 
@@ -40,11 +52,9 @@ def wait_for_task(task_id, timeout_seconds: 120)
       when 'completed'
         return task
       when 'failed'
-        if task['result']&.dig('description')&.downcase&.include?('rate limit')
-          sleep(2)
-          next
-        end
-        raise "Task failed with result: #{task['result']}"
+        raise "Task failed with result: #{task['result']}" unless rate_limit_error?(task)
+
+        sleep(2)
       end
     end
 
@@ -108,7 +118,7 @@ def wait_for_task(task_id, timeout_seconds: 120)
         {
           operation: 'addMembers',
           filter: { cid: { '$in' => [@channel1.cid, @channel2.cid] } },
-          members: [@random_users[0][:id]]
+          members: [{ 'user_id' => @random_users[0][:id] }]
         }
       )
 
@@ -120,7 +130,8 @@ def wait_for_task(task_id, timeout_seconds: 120)
     it 'adds members to channels matching filter' do
       updater = @client.channel_batch_updater
 
-      members = @random_users.map { |u| u[:id] }
+      member_ids = @random_users.map { |u| u[:id] }
+      members = member_ids.map { |id| { 'user_id' => id } }
       response = updater.add_members(
         { cid: { '$in' => [@channel1.cid, @channel2.cid] } },
         members
@@ -136,7 +147,7 @@ def wait_for_task(task_id, timeout_seconds: 120)
         ch1_state = @channel1.query
         ch1_member_ids = ch1_state['members'].map { |m| m['user_id'] }
 
-        members.each do |member_id|
+        member_ids.each do |member_id|
           expect(ch1_member_ids).to include(member_id)
         end
       end
@@ -174,7 +185,7 @@ def wait_for_task(task_id, timeout_seconds: 120)
 
       response = updater.remove_members(
         { cid: { '$in' => [@channel1.cid, @channel2.cid] } },
-        [member_to_remove]
+        [{ 'user_id' => member_to_remove }]
       )
 
       expect(response['task_id']).not_to be_empty
@@ -211,7 +222,7 @@ def wait_for_task(task_id, timeout_seconds: 120)
 
       response = updater.archive(
         { cid: { '$in' => [@channel1.cid, @channel2.cid] } },
-        [member_to_archive]
+        [{ 'user_id' => member_to_archive }]
       )
 
       expect(response['task_id']).not_to be_empty