switest 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d12432ffab240a974d72b3dd40c644881db795afdf01f0907837bf6a07f749
-  data.tar.gz: 599397a725f50b57b243a42a451b8dea72497fbc86fd8dd2908096627a22e097
+  metadata.gz: 056e2a1dd0271f490fdfb77978cdb272b8ac79f592aa18818642956d12f7c1a8
+  data.tar.gz: 28ec935b623017b29b5bd2f6899d82b85a84b6ac7a452977f4f9cb25f6445b9d
 SHA512:
-  metadata.gz: a409ab5e4948ac6bd38518f3a5bcbbaac61e8154ce6e162916f0ae0fa66ab819b68f0f3cf073127703ebb38741d616c8437f3a1a3cebad376d6d240b188eb6cd
-  data.tar.gz: eda147e356709c794896b2e274b2bf7e74f15dc42c422e5898255ec8c62c112deb5f8249cded86b056257a91befc1f65a498ff76eb680dfa6584b0631a871e01
+  metadata.gz: 7dcffb0b3476237f826d7480251f00e70046197737d9886ea48a16dc886b463d1dfc83223858008fce51d14ab791e7d374252c43adf931a06ee95d114300d204
+  data.tar.gz: bded19bd55e5f76a7e2b93fa67f757e924f5f1bfe3b4089ab7c0c31ee8f74a4c97db7f9ce8437f2f6daf6da7790440ca941529a548f6e9905fc9699c668c3da4

data/README.md

@@ -168,14 +168,24 @@ agent.end_reason  # e.g. "NORMAL_CLEARING"
 `Switest::Scenario` provides these assertions:
 
 ```ruby
-assert_call(agent, timeout: 5)         # Agent receives a call
-assert_no_call(agent, timeout: 2)      # Agent does NOT receive a call
-assert_hungup(agent, timeout: 5)       # Call has ended
-assert_not_hungup(agent, timeout: 2)   # Call is still active
-assert_dtmf(agent, "123", timeout: 5)              # Agent receives expected DTMF digits
+assert_call(agent, timeout: 5)                       # Agent receives a call
+assert_no_call(agent, timeout: 2)                    # Agent does NOT receive a call
+assert_answered(agent, timeout: 5)                   # Call has been answered
+assert_bridged(agent, timeout: 5)                    # Call has been bridged (see note below)
+assert_hungup(agent, timeout: 5)                     # Call has ended
+assert_not_hungup(agent, timeout: 2)                 # Call is still active
+assert_dtmf(agent, "123", timeout: 5)                # Agent receives expected DTMF digits
 assert_dtmf(agent, "123") { other.send_dtmf("123") } # With block: flushes stale DTMF first
 ```
 
+**Note on `assert_bridged`:** This assertion only works when a CHANNEL_BRIDGE
+event fires on a channel Switest tracks. It works when the FreeSWITCH dialplan
+runs the `bridge` application on an inbound channel picked up via
+`listen_for_call`. It does **not** work for agent-to-agent calls routed through
+SIP gateways — the bridge happens on internal gateway legs whose UUIDs Switest
+doesn't track. For gateway scenarios, use `assert_answered` on both agents
+instead to confirm the call is connected.
+
 The `hangup_all` helper ends all active calls (useful before CDR assertions):
 
 ```ruby

data/lib/switest/esl/client.rb

@@ -39,16 +39,24 @@ module Switest
 
       # Hangup all active calls individually and wait for them to end.
       # This ensures proper hangup_cause is set for each call (important for CDRs).
+      # Sends all hangups first, then waits with a shared deadline to avoid
+      # O(n * timeout) delays with many calls.
       def hangup_all(cause: "NORMAL_CLEARING", timeout: 5)
         return unless @connection&.connected?
 
-        @calls.each_value do |call|
-          next if call.ended?
-          begin
-            call.hangup(cause, wait: timeout)
-          rescue
-            # Ignore errors during cleanup
-          end
+        active = @calls.values.reject(&:ended?)
+
+        # Send all hangups without waiting
+        active.each do |call|
+          call.hangup(cause, wait: false) rescue nil
+        end
+
+        # Wait for all to end with a single shared deadline
+        deadline = Time.now + timeout
+        active.each do |call|
+          remaining = deadline - Time.now
+          break if remaining <= 0
+          call.wait_for_end(timeout: remaining) unless call.ended?
         end
       end
 

data/lib/switest/esl/connection.rb

@@ -110,8 +110,11 @@ module Switest
 
       def subscribe_events
         events = %w[
-          CHANNEL_CREATE CHANNEL_ANSWER CHANNEL_BRIDGE CHANNEL_HANGUP
-          CHANNEL_HANGUP_COMPLETE CHANNEL_EXECUTE_COMPLETE DTMF CHANNEL_STATE
+          CHANNEL_CREATE           # Detect new inbound calls
+          CHANNEL_ANSWER           # Track when calls are answered
+          CHANNEL_BRIDGE           # Track when calls are bridged
+          CHANNEL_HANGUP_COMPLETE  # Track call end with final headers
+          DTMF                     # Receive DTMF digits per call
         ].join(" ")
 
         @socket.write("event plain #{events}\n\n")

data/lib/switest/scenario.rb

@@ -49,6 +49,18 @@ module Switest
       refute agent.call?, "Expected agent to not have received a call"
     end
 
+    def assert_answered(agent, timeout: 5)
+      assert agent.call?, "Agent has no call"
+      success = agent.wait_for_answer(timeout: timeout)
+      assert success, "Expected call to be answered within #{timeout} seconds"
+    end
+
+    def assert_bridged(agent, timeout: 5)
+      assert agent.call?, "Agent has no call"
+      success = agent.wait_for_bridge(timeout: timeout)
+      assert success, "Expected call to be bridged within #{timeout} seconds"
+    end
+
     def assert_hungup(agent, timeout: 5)
       assert agent.call?, "Agent has no call"
       success = agent.wait_for_end(timeout: timeout)
@@ -66,9 +78,8 @@ module Switest
 
       if block
         agent.flush_dtmf
-        task = Concurrent::ScheduledTask.execute(after) { block.call }
-        received = agent.receive_dtmf(count: expected_dtmf.length, timeout: timeout)
-        task.wait
+        Concurrent::ScheduledTask.execute(after) { block.call }
+        received = agent.receive_dtmf(count: expected_dtmf.length, timeout: timeout + after)
       else
         received = agent.receive_dtmf(count: expected_dtmf.length, timeout: timeout)
       end

data/lib/switest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switest
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Relatel A/S