slack-ruby-client 1.0.0 → 2.1.0

data/spec/slack/messages/formatting_spec.rb

@@ -10,30 +10,37 @@ describe Slack::Messages::Formatting do
     it 'plain text' do
       expect(formatting.unescape('plain text')).to eq 'plain text'
     end
+
     it 'decodes an HTML-encoded message' do
       expect(formatting.unescape('Hello &amp; &lt;world&gt;')).to eq 'Hello & <world>'
     end
+
     it 'unescapes a user reference' do
       expect(formatting.unescape('Hey <@U024BE7LH|bob>, did you see my file?')).to(
         eq('Hey @bob, did you see my file?')
       )
     end
+
     it 'unescapes a user reference without a name' do
       expect(formatting.unescape('<@U02BEFY4U> ^^^')).to eq '@U02BEFY4U ^^^'
     end
+
     it 'unescapes a URL without text' do
       expect(formatting.unescape('This message contains a URL <http://foo.com/>')).to(
         eq('This message contains a URL http://foo.com/')
       )
     end
+
     it 'unescapes a URL with text' do
       expect(formatting.unescape('So does this one: <http://www.foo.com|www.foo.com>')).to(
         eq('So does this one: www.foo.com')
       )
     end
+
     it 'removes mailto' do
       expect(formatting.unescape('<mailto:bob@example.com|Bob>')).to eq 'Bob'
     end
+
     it 'unlinkifies references' do
       expect(
         formatting.unescape('Hello <@U123|bob>, say hi to <!everyone> in <#C1234|general>')
@@ -41,12 +48,15 @@ describe Slack::Messages::Formatting do
         eq('Hello @bob, say hi to @everyone in #general')
       )
     end
+
     it 'can handle a lone &gt;' do
       expect(formatting.unescape('Hello <@U123|bob> &gt; file.txt')).to eq 'Hello @bob > file.txt'
     end
+
     it 'unescapes a double smart quote' do
       expect(formatting.unescape('“hello”')).to eq '"hello"'
     end
+
     it 'unescapes a single smart quote' do
       expect(formatting.unescape('‘hello’')).to eq "'hello'"
     end

data/spec/slack/real_time/api/message_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' } do
+RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_connect' } do
   include_context 'connected client'
 
   describe '#message' do

data/spec/slack/real_time/api/ping_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' } do
+RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_connect' } do
   include_context 'connected client'
 
   describe '#ping' do

data/spec/slack/real_time/api/typing_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' } do
+RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_connect' } do
   include_context 'connected client'
 
   describe '#typing' do

data/spec/slack/real_time/client_spec.rb

@@ -25,6 +25,7 @@ RSpec.describe Slack::RealTime::Client do
       expect(client.token).to eq '<SLACK_API_TOKEN>'
       expect(client.web_client.token).to eq '<SLACK_API_TOKEN>'
     end
+
     context 'with real time config' do
       before do
         described_class.configure do |config|
@@ -37,6 +38,7 @@ RSpec.describe Slack::RealTime::Client do
         expect(client.token).to eq 'custom real time token'
         expect(client.web_client.token).to eq 'custom real time token'
       end
+
       it 'overrides token to specific token' do
         client = described_class.new(token: 'local token')
         expect(client.token).to eq 'local token'
@@ -64,7 +66,7 @@ RSpec.describe Slack::RealTime::Client do
   end
 
   context 'client with a full store',
-          vcr: { cassette_name: 'web/rtm_start', allow_playback_repeats: true } do
+          vcr: { cassette_name: 'web/rtm_connect', allow_playback_repeats: true } do
     let(:client) { described_class.new(store_class: Slack::RealTime::Stores::Store) }
     let(:url) { 'wss://cerberus-xxxx.lb.slack-msgs.com/websocket/uid' }
 
@@ -73,7 +75,7 @@ RSpec.describe Slack::RealTime::Client do
 
       before do
         allow(Slack::RealTime::Socket).to(
-          receive(:new).with(url, ping: 30, logger: Slack::Logger.default).and_return(socket)
+          receive(:new).with(url, { ping: 30, logger: Slack::Logger.default }).and_return(socket)
         )
         allow(socket).to receive(:connect!)
         allow(socket).to receive(:start_sync)
@@ -84,35 +86,25 @@ RSpec.describe Slack::RealTime::Client do
         it 'sets url' do
           expect(client.url).to eq url
         end
+
         it 'sets team' do
           expect(client.team.domain).to eq 'dblockdotorg'
         end
+
         it 'sets teams' do
           expect(client.teams.count).to eq 1
           expect(client.teams.values.first).to eq client.team
         end
+
         it 'sets self' do
           expect(client.self.id).to eq 'U0J1GAHN1'
         end
-        it 'sets users' do
-          expect(client.users.count).to eq 35
+
+        it 'sets user' do
+          expect(client.users.count).to eq 1
           expect(client.users.values.first['id']).to eq 'U0J1GAHN1'
         end
-        it 'sets channels' do
-          expect(client.channels.count).to eq 156
-          expect(client.channels.values.first['name']).to eq 'general'
-        end
-        it 'sets ims' do
-          expect(client.ims.count).to eq 10
-          expect(client.ims.values.first['user']).to eq 'U04KB5WQR'
-        end
-        it 'sets bots' do
-          expect(client.bots.count).to eq 83
-          expect(client.bots.values.first['name']).to eq 'bot'
-        end
-        it 'sets groups' do
-          expect(client.groups.count).to eq 1
-        end
+
         it 'includes team name in to_s' do
           expect(client.to_s).to eq(
             "id=#{client.team.id}, name=#{client.team.name}, domain=#{client.team.domain}"
@@ -123,14 +115,17 @@ RSpec.describe Slack::RealTime::Client do
       it 'uses web client to fetch url' do
         expect(client.web_client).to be_a Slack::Web::Client
       end
+
       it 'remembers socket' do
-        expect(client.instance_variable_get('@socket')).to eq socket
+        expect(client.instance_variable_get(:@socket)).to eq socket
       end
+
       it 'cannot be invoked twice' do
         expect do
           client.start!
         end.to raise_error Slack::RealTime::Client::ClientAlreadyStartedError
       end
+
       describe '#stop!' do
         before do
           allow(socket).to receive(:disconnect!)
@@ -138,7 +133,7 @@ RSpec.describe Slack::RealTime::Client do
         end
 
         it 'cannot be invoked twice' do
-          client.instance_variable_set('@socket', nil) # caused by a :close callback
+          client.instance_variable_set(:@socket, nil) # caused by a :close callback
           expect do
             client.stop!
           end.to raise_error Slack::RealTime::Client::ClientNotStartedError
@@ -164,18 +159,18 @@ RSpec.describe Slack::RealTime::Client do
       end
 
       describe '#run_handlers' do
-        describe 'empty events' do
+        context 'when store has no event hooks' do
           before do
-            @e = client.store.class.events
-            client.store.class.events = nil
+            @events = client.store.class.events.dup
+            client.store.class.events.clear
           end
 
           after do
-            client.store.class.events = @e
+            client.store.class.events.merge!(@events)
           end
 
-          it 'returns false when event is nil' do
-            expect(client.send(:run_handlers, 'example', {})).to be nil
+          it 'returns empty array of handlers' do
+            expect(client.send(:run_handlers, 'example', {})).to be_empty
           end
         end
       end
@@ -186,7 +181,7 @@ RSpec.describe Slack::RealTime::Client do
 
       before do
         allow(Slack::RealTime::Socket).to(
-          receive(:new).with(url, ping: 30, logger: Slack::Logger.default).and_return(socket)
+          receive(:new).with(url, { ping: 30, logger: Slack::Logger.default }).and_return(socket)
         )
         allow(socket).to receive(:connect!)
         allow(socket).to receive(:start_async)
@@ -199,6 +194,7 @@ RSpec.describe Slack::RealTime::Client do
           expect(socket).to receive(:send_data).with('{"type":"ping","id":1}')
           client.run_ping!
         end
+
         it 'reconnects the websocket if it has been idle for too long' do
           allow(socket).to receive(:time_since_last_message).and_return(75)
           allow(socket).to receive(:connected?).and_return(true)
@@ -206,6 +202,7 @@ RSpec.describe Slack::RealTime::Client do
           expect(socket).to receive(:restart_async)
           client.run_ping!
         end
+
         [
           EOFError,
           Errno::ECONNRESET,
@@ -255,7 +252,7 @@ RSpec.describe Slack::RealTime::Client do
 
       before do
         allow(Slack::RealTime::Socket).to(
-          receive(:new).with(url, ping: 30, logger: Slack::Logger.default).and_return(socket)
+          receive(:new).with(url, { ping: 30, logger: Slack::Logger.default }).and_return(socket)
         )
         allow(socket).to receive(:connect!)
         allow(socket).to receive(:start_sync)
@@ -266,30 +263,43 @@ RSpec.describe Slack::RealTime::Client do
         it 'sets url' do
           expect(client.url).to eq url
         end
+
         it 'sets team' do
           expect(client.team.domain).to eq 'dblockdotorg'
         end
+
         it 'sets self' do
           expect(client.self.id).to eq 'U0J1GAHN1'
         end
+
+        it 'no teams' do
+          expect(client.teams).to be_nil
+        end
+
         it 'no users' do
           expect(client.users).to be_nil
         end
-        it 'no teams' do
-          expect(client.teams).to be_nil
+
+        it 'no bots' do
+          expect(client.bots).to be_nil
         end
-        it 'no channels' do
-          expect(client.channels).to be_nil
+
+        it 'no public channels' do
+          expect(client.public_channels).to be_nil
         end
+
+        it 'no private channels' do
+          expect(client.private_channels).to be_nil
+        end
+
         it 'no ims' do
           expect(client.ims).to be_nil
         end
-        it 'no bots' do
-          expect(client.bots).to be_nil
-        end
-        it 'no groups' do
-          expect(client.groups).to be_nil
+
+        it 'no mpims' do
+          expect(client.mpims).to be_nil
         end
+
         it 'includes team name in to_s' do
           expect(client.to_s).to eq(
             "id=#{client.team.id}, name=#{client.team.name}, domain=#{client.team.domain}"
@@ -300,14 +310,17 @@ RSpec.describe Slack::RealTime::Client do
       it 'uses web client to fetch url' do
         expect(client.web_client).to be_a Slack::Web::Client
       end
+
       it 'remembers socket' do
-        expect(client.instance_variable_get('@socket')).to eq socket
+        expect(client.instance_variable_get(:@socket)).to eq socket
       end
+
       it 'cannot be invoked twice' do
         expect do
           client.start!
         end.to raise_error Slack::RealTime::Client::ClientAlreadyStartedError
       end
+
       describe '#stop!' do
         before do
           allow(socket).to receive(:disconnect!)
@@ -315,7 +328,7 @@ RSpec.describe Slack::RealTime::Client do
         end
 
         it 'cannot be invoked twice' do
-          client.instance_variable_set('@socket', nil) # caused by a :close callback
+          client.instance_variable_set(:@socket, nil) # caused by a :close callback
           expect do
             client.stop!
           end.to raise_error Slack::RealTime::Client::ClientNotStartedError
@@ -336,8 +349,9 @@ RSpec.describe Slack::RealTime::Client do
     let(:url) { 'wss://mpmulti-w5tz.slack-msgs.com/websocket/uid' }
 
     it 'sets store to nil' do
-      expect(client.store).to be nil
+      expect(client.store).to be_nil
     end
+
     it "doesn't handle events" do
       event = Slack::RealTime::Event.new(
         'type' => 'team_rename',
@@ -346,12 +360,15 @@ RSpec.describe Slack::RealTime::Client do
       expect(client).not_to receive(:run_handlers)
       client.send(:dispatch, event)
     end
+
     it 'self' do
-      expect(client.self).to be nil
+      expect(client.self).to be_nil
     end
+
     it 'team' do
-      expect(client.team).to be nil
+      expect(client.team).to be_nil
     end
+
     describe 'to_s' do
       it 'defaults to class instance' do
         expect(client.to_s).to match(/^#<Slack::RealTime::Client:0x\h+>$/)
@@ -366,15 +383,19 @@ RSpec.describe Slack::RealTime::Client do
       it 'sets ping' do
         expect(client.websocket_ping).to eq 30
       end
+
       it "doesn't set proxy" do
-        expect(client.websocket_proxy).to be nil
+        expect(client.websocket_proxy).to be_nil
       end
+
       it 'defaults logger' do
         expect(client.send(:logger)).to be_a ::Logger
       end
+
       it 'sets default store_class' do
-        expect(client.send(:store_class)).to eq Slack::RealTime::Store
+        expect(client.send(:store_class)).to eq Slack::RealTime::Stores::Starter
       end
+
       (Slack::RealTime::Config::ATTRIBUTES - %i[logger store_class token]).each do |key|
         it "sets #{key}" do
           expect(client.send(key)).to eq Slack::RealTime::Config.send(key)
@@ -387,6 +408,7 @@ RSpec.describe Slack::RealTime::Client do
         client.websocket_ping = 30
         expect(client.run_ping?).to be true
       end
+
       it 'returns false when websocket_ping is less than 1' do
         client.websocket_ping = 0
         expect(client.run_ping?).to be false
@@ -416,6 +438,7 @@ RSpec.describe Slack::RealTime::Client do
       it 'exposes public logger' do
         expect(client.logger).to be_a(::Logger)
       end
+
       it 'exposes public logger=' do
         expect { client.logger = nil }.not_to raise_error(NoMethodError)
       end
@@ -441,12 +464,14 @@ RSpec.describe Slack::RealTime::Client do
         it 'sets ping' do
           expect(client.websocket_ping).to eq 15
         end
-        it 'creates a connection with custom ping', vcr: { cassette_name: 'web/rtm_start' } do
+
+        it 'creates a connection with custom ping', vcr: { cassette_name: 'web/rtm_connect' } do
           expect(Slack::RealTime::Concurrency::Mock::WebSocket).to(
-            receive(:new).with(url, nil, ping: 15).and_return(ws)
+            receive(:new).with(url, nil, { ping: 15 }).and_return(ws)
           )
           client.start!
         end
+
         it 'sets start_options' do
           expect(client.start_options).to eq(request: { timeout: 180 })
         end
@@ -470,14 +495,17 @@ RSpec.describe Slack::RealTime::Client do
             headers: { 'User-Agent' => 'ruby' }
           )
         end
-        it 'creates a connection with custom proxy', vcr: { cassette_name: 'web/rtm_start' } do
+
+        it 'creates a connection with custom proxy', vcr: { cassette_name: 'web/rtm_connect' } do
           expect(Slack::RealTime::Concurrency::Mock::WebSocket).to receive(:new).with(
             url,
             nil,
-            ping: 30,
-            proxy: {
-              origin: 'http://username:password@proxy.example.com',
-              headers: { 'User-Agent' => 'ruby' }
+            {
+              ping: 30,
+              proxy: {
+                origin: 'http://username:password@proxy.example.com',
+                headers: { 'User-Agent' => 'ruby' }
+              }
             }
           ).and_return(ws)
           client.start!
@@ -488,14 +516,15 @@ RSpec.describe Slack::RealTime::Client do
     context 'start_options' do
       before do
         described_class.configure do |config|
-          config.start_options = { simple_latest: true }
+          config.start_options = { presence_sub: true }
         end
       end
 
       describe '#initialize' do
         it 'sets start_options' do
-          expect(client.start_options).to eq(simple_latest: true)
+          expect(client.start_options).to eq(presence_sub: true)
         end
+
         context 'start!' do
           let(:socket) { double(Slack::RealTime::Socket, connected?: true) }
 
@@ -505,9 +534,9 @@ RSpec.describe Slack::RealTime::Client do
             allow(socket).to receive(:start_sync)
           end
 
-          it 'calls rtm_start with start options', vcr: { cassette_name: 'web/rtm_start' } do
+          it 'calls rtm.connect with start options', vcr: { cassette_name: 'web/rtm_connect' } do
             expect(client.web_client).to(
-              receive(:rtm_start).with(simple_latest: true).and_call_original
+              receive(:rtm_connect).with({ presence_sub: true }).and_call_original
             )
             client.start!
           end
@@ -516,7 +545,7 @@ RSpec.describe Slack::RealTime::Client do
     end
 
     context 'store_class' do
-      context 'starter' do
+      context 'when configured with Starter class' do
         before do
           described_class.configure do |config|
             config.store_class = Slack::RealTime::Stores::Starter
@@ -524,13 +553,15 @@ RSpec.describe Slack::RealTime::Client do
         end
 
         describe '#initialize' do
-          it 'can be overriden explicitly' do
-            client = described_class.new(store_class: Slack::RealTime::Store)
-            expect(client.send(:store_class)).to eq Slack::RealTime::Store
+          it 'can override the configured store class' do
+            client = described_class.new(store_class: Slack::RealTime::Stores::Store)
+            expect(client.send(:store_class)).to eq Slack::RealTime::Stores::Store
           end
+
           it 'sets store_class' do
             expect(client.send(:store_class)).to eq(Slack::RealTime::Stores::Starter)
           end
+
           context 'start!' do
             let(:socket) { double(Slack::RealTime::Socket, connected?: true) }
 
@@ -547,73 +578,6 @@ RSpec.describe Slack::RealTime::Client do
           end
         end
       end
-
-      context 'store' do
-        before do
-          described_class.configure do |config|
-            config.store_class = Slack::RealTime::Stores::Store
-          end
-        end
-
-        describe '#initialize' do
-          context 'start!' do
-            let(:socket) { double(Slack::RealTime::Socket, connected?: true) }
-
-            before do
-              allow(Slack::RealTime::Socket).to receive(:new).and_return(socket)
-              allow(socket).to receive(:connect!)
-              allow(socket).to receive(:start_sync)
-            end
-
-            it 'calls rtm_start and not rtm_connect', vcr: { cassette_name: 'web/rtm_start' } do
-              expect(client.web_client).to receive(:rtm_start).and_call_original
-              client.start!
-            end
-          end
-        end
-      end
-    end
-
-    context 'start_method' do
-      describe '#initialize' do
-        it 'can be overriden explicitly' do
-          client = described_class.new(start_method: :overriden)
-          expect(client.send(:start_method)).to eq :overriden
-        end
-        context 'with start_method' do
-          before do
-            described_class.configure do |config|
-              config.start_method = :overriden
-            end
-          end
-
-          it 'sets start_method' do
-            expect(client.send(:start_method)).to eq :overriden
-          end
-          it 'calls the overriden method' do
-            expect(client.web_client).to receive(:overriden).and_raise('overriden')
-            expect do
-              client.start!
-            end.to raise_error RuntimeError, 'overriden'
-          end
-        end
-
-        context 'start!' do
-          let(:socket) { double(Slack::RealTime::Socket, connected?: true) }
-
-          before do
-            allow(Slack::RealTime::Socket).to receive(:new).and_return(socket)
-            allow(socket).to receive(:connect!)
-            allow(socket).to receive(:start_sync)
-          end
-
-          it 'defaults to :rtm_start when using full store',
-             vcr: { cassette_name: 'web/rtm_start' } do
-            expect(client.web_client).to receive(:rtm_start).and_call_original
-            client.start!
-          end
-        end
-      end
     end
   end
 end

data/spec/slack/real_time/event_handlers/bot_spec.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' } do
+RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_connect' } do
   include_context 'connected client'
 
   context 'bot' do
-    it 'sets bot data on rtm.start' do
-      expect(client.bots.count).to eq 83
-    end
     it 'bot_added' do
       expect do
         event = Slack::RealTime::Event.new(
@@ -27,19 +24,24 @@ RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' }
       expect(bot['name']).to eq 'hugbot'
       expect(bot['icons']['image_48']).to eq 'https:\/\/slack.com\/path\/to\/hugbot_48.png'
     end
-    it 'bot_changed' do
-      expect do
-        event = Slack::RealTime::Event.new(
-          'type' => 'bot_changed',
-          'bot' => {
-            'id' => 'B0751JU2H',
-            'name' => 'hugbot'
-          }
-        )
-        client.send(:dispatch, event)
-      end.not_to change(client.bots, :count)
-      bot = client.bots['B0751JU2H']
-      expect(bot['name']).to eq 'hugbot'
+
+    context 'with bot loaded in the store' do
+      include_context 'loaded client'
+
+      it 'bot_changed' do
+        expect do
+          event = Slack::RealTime::Event.new(
+            'type' => 'bot_changed',
+            'bot' => {
+              'id' => 'B0751JU2H',
+              'name' => 'hugbot'
+            }
+          )
+          client.send(:dispatch, event)
+        end.not_to change(client.bots, :count)
+        bot = client.bots['B0751JU2H']
+        expect(bot['name']).to eq 'hugbot'
+      end
     end
   end
 end

data/spec/slack/real_time/event_handlers/event_handlers_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' } do
+RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_connect' } do
   include_context 'connected client'
 
   it 'is not fatal' do