Fix: integration tests.

Author: dblock

README.md

@@ -374,11 +374,11 @@ See a fully working example in [examples/hi_real_time](examples/hi_real_time/hi.
 ##### `websocket_ping`
 This setting determines how long the socket can be idle before sending a ping message to confirm it's still connected.
 
-It's important to note that if a ping message was sent and no response was received within the amount of time specified in `websocket_ping`; the client will attempt to reestablish it's connection to the message server.
+It's important to note that if a ping message was sent and no response was received within the amount of time specified in `websocket_ping` the client will attempt to reestablish it's connection to the message server.
 
-Note that the ping may take between `websocket_ping` and `websocket_ping * 3/2` seconds to actually trigger when there is no activity on the socket. This is because the timer that checks whether to ping is triggered at every `websocket_ping / 2` interval (see [#289](https://github.com/slack-ruby/slack-ruby-client/pull/289) for further explanation).
+Note that the ping may take between `websocket_ping` and `websocket_ping * 3/2` seconds to actually trigger when there is no activity on the socket. This is because the timer that checks whether to ping is triggered at every `websocket_ping / 2` interval.
 
-To disable this feature; set `websocket_ping` to 0.
+To disable this feature set `websocket_ping` to 0.
 
 ### Connection Methods
 

lib/slack/real_time/client.rb

@@ -139,6 +139,10 @@ def run_ping?
         !websocket_ping.nil? && websocket_ping > 0
       end
 
+      def websocket_ping_timer
+        websocket_ping / 2
+      end
+
       def to_s
         if store && store.team
           "id=#{store.team.id}, name=#{store.team.name}, domain=#{store.team.domain}"

lib/slack/real_time/config.rb

@@ -33,10 +33,6 @@ def concurrency
         (val = @concurrency).respond_to?(:call) ? val.call : val
       end
 
-      def websocket_ping_timer
-        websocket_ping / 2
-      end
-
       private
 
       def detect_concurrency

spec/integration/integration_spec.rb

@@ -123,7 +123,7 @@ def wait_for_server
 
   context 'with websocket_ping set' do
     before do
-      client.websocket_ping = 1
+      client.websocket_ping = 5
     end
 
     it 'sends pings' do
@@ -136,7 +136,7 @@ def wait_for_server
 
       start_server
 
-      queue.pop_with_timeout(5)
+      queue.pop_with_timeout(10)
       expect(@reply_to).to be 1
     end
 

spec/slack/real_time/client_spec.rb

@@ -42,6 +42,20 @@
       end
     end
   end
+  context 'websocket_ping_timer' do
+    context 'with defaults' do
+      let(:client) { Slack::RealTime::Client.new }
+      it 'defaults to websocket_ping / 2' do
+        expect(client.websocket_ping_timer).to eq 15
+      end
+    end
+    context 'with websocket_ping value changed' do
+      let(:client) { Slack::RealTime::Client.new(websocket_ping: 22) }
+      it 'defaults to websocket_ping / 2' do
+        expect(client.websocket_ping_timer).to eq 11
+      end
+    end
+  end
   context 'client with a full store', vcr: { cassette_name: 'web/rtm_start', allow_playback_repeats: true } do
     let(:client) { Slack::RealTime::Client.new(store_class: Slack::RealTime::Stores::Store) }
     let(:url) { 'wss://ms173.slack-msgs.com/websocket/lqcUiAvrKTP-uuid=' }