Merge pull request #73 from markburns/master

Update to latest RSpec and expect syntax

Author: zimbatm

pusher.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "httpclient", "~> 2.5"
   s.add_dependency "jruby-openssl" if defined?(JRUBY_VERSION)
 
-  s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "webmock"
   s.add_development_dependency "em-http-request", "~> 1.1.0"
   s.add_development_dependency "rake"

spec/channel_spec.rb

@@ -28,7 +28,7 @@ def stub_post_to_raise(e)
 
   describe '#trigger!' do
     it "should use @client.trigger internally" do
-      @client.should_receive(:trigger)
+      expect(@client).to receive(:trigger)
       @channel.trigger('new_event', 'Some data')
     end
   end
@@ -37,47 +37,47 @@ def stub_post_to_raise(e)
     it "should log failure if error raised in http call" do
       stub_post_to_raise(HTTPClient::BadResponseError)
 
-      Pusher.logger.should_receive(:error).with("Exception from WebMock (HTTPClient::BadResponseError) (Pusher::HTTPError)")
-      Pusher.logger.should_receive(:debug) #backtrace
+      expect(Pusher.logger).to receive(:error).with("Exception from WebMock (HTTPClient::BadResponseError) (Pusher::HTTPError)")
+      expect(Pusher.logger).to receive(:debug) #backtrace
       channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
       channel.trigger('new_event', 'Some data')
     end
 
     it "should log failure if Pusher returns an error response" do
       stub_post 401, "some signature info"
-      Pusher.logger.should_receive(:error).with("some signature info (Pusher::AuthenticationError)")
-      Pusher.logger.should_receive(:debug) #backtrace
+      expect(Pusher.logger).to receive(:error).with("some signature info (Pusher::AuthenticationError)")
+      expect(Pusher.logger).to receive(:debug) #backtrace
       channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
       channel.trigger('new_event', 'Some data')
     end
   end
 
   describe "#initialization" do
     it "should not be too long" do
-      lambda { @client['b'*201] }.should raise_error(Pusher::Error)
+      expect { @client['b'*201] }.to raise_error(Pusher::Error)
     end
 
     it "should not use bad characters" do
-      lambda { @client['*^!±`/""'] }.should raise_error(Pusher::Error)
+      expect { @client['*^!±`/""'] }.to raise_error(Pusher::Error)
     end
   end
 
   describe "#trigger_async" do
     it "should use @client.trigger_async internally" do
-      @client.should_receive(:trigger_async)
+      expect(@client).to receive(:trigger_async)
       @channel.trigger_async('new_event', 'Some data')
     end
   end
 
   describe '#info' do
     it "should call the Client#channel_info" do
-      @client.should_receive(:get).with("/channels/mychannel", anything)
+      expect(@client).to receive(:get).with("/channels/mychannel", anything)
       @channel = @client['mychannel']
       @channel.info
     end
 
     it "should assemble the requested attributes into the info option" do
-      @client.should_receive(:get).with(anything, {
+      expect(@client).to receive(:get).with(anything, {
         :info => "user_count,connection_count"
       })
       @channel = @client['presence-foo']
@@ -87,7 +87,7 @@ def stub_post_to_raise(e)
 
   describe '#users' do
     it "should call the Client#channel_users" do
-      @client.should_receive(:get).with("/channels/presence-mychannel/users").and_return({:users => {'id' => '4'}})
+      expect(@client).to receive(:get).with("/channels/presence-mychannel/users").and_return({:users => {'id' => '4'}})
       @channel = @client['presence-mychannel']
       @channel.users
     end
@@ -101,28 +101,28 @@ def authentication_string(*data)
     it "should return an authentication string given a socket id" do
       auth = @channel.authentication_string('1.1')
 
-      auth.should == '12345678900000001:02259dff9a2a3f71ea8ab29ac0c0c0ef7996c8f3fd3702be5533f30da7d7fed4'
+      expect(auth).to eq('12345678900000001:02259dff9a2a3f71ea8ab29ac0c0c0ef7996c8f3fd3702be5533f30da7d7fed4')
     end
 
     it "should raise error if authentication is invalid" do
       [nil, ''].each do |invalid|
-        authentication_string(invalid).should raise_error Pusher::Error
+        expect(authentication_string(invalid)).to raise_error Pusher::Error
       end
     end
 
     describe 'with extra string argument' do
       it 'should be a string or nil' do
-        authentication_string('1.1', 123).should raise_error Pusher::Error
-        authentication_string('1.1', {}).should raise_error Pusher::Error
+        expect(authentication_string('1.1', 123)).to raise_error Pusher::Error
+        expect(authentication_string('1.1', {})).to raise_error Pusher::Error
 
-        authentication_string('1.1', 'boom').should_not raise_error
-        authentication_string('1.1', nil).should_not raise_error
+        expect(authentication_string('1.1', 'boom')).not_to raise_error
+        expect(authentication_string('1.1', nil)).not_to raise_error
       end
 
       it "should return an authentication string given a socket id and custom args" do
         auth = @channel.authentication_string('1.1', 'foobar')
 
-        auth.should == "12345678900000001:#{hmac(@client.secret, "1.1:test_channel:foobar")}"
+        expect(auth).to eq("12345678900000001:#{hmac(@client.secret, "1.1:test_channel:foobar")}")
       end
     end
   end
@@ -133,36 +133,36 @@ def authentication_string(*data)
     end
 
     it 'should return a hash with signature including custom data and data as json string' do
-      MultiJson.stub(:encode).with(@custom_data).and_return 'a json string'
+      allow(MultiJson).to receive(:encode).with(@custom_data).and_return 'a json string'
 
       response = @channel.authenticate('1.1', @custom_data)
 
-      response.should == {
+      expect(response).to eq({
         :auth => "12345678900000001:#{hmac(@client.secret, "1.1:test_channel:a json string")}",
         :channel_data => 'a json string'
-      }
+      })
     end
 
     it 'should fail on invalid socket_ids' do
-      lambda {
+      expect {
         @channel.authenticate('1.1:')
-      }.should raise_error Pusher::Error
+      }.to raise_error Pusher::Error
 
-      lambda {
+      expect {
         @channel.authenticate('1.1foo', 'channel')
-      }.should raise_error Pusher::Error
+      }.to raise_error Pusher::Error
 
-      lambda {
+      expect {
         @channel.authenticate(':1.1')
-      }.should raise_error Pusher::Error
+      }.to raise_error Pusher::Error
 
-      lambda {
+      expect {
         @channel.authenticate('foo1.1', 'channel')
-      }.should raise_error Pusher::Error
+      }.to raise_error Pusher::Error
 
-      lambda {
+      expect {
         @channel.authenticate('foo', 'channel')
-      }.should raise_error Pusher::Error
+      }.to raise_error Pusher::Error
     end
   end
 end