Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update bundle and fix rspec deprecations

  • Loading branch information...
commit 216e61613944f64b6b92833542d2051804306c38 1 parent e98f258
@mloughran mloughran authored
View
54 Gemfile.lock
@@ -9,42 +9,44 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.3.2)
+ addressable (2.3.5)
cookiejar (0.3.0)
- crack (0.3.2)
- diff-lcs (1.1.3)
- em-http-request (1.0.3)
- addressable (>= 2.2.3)
+ crack (0.4.1)
+ safe_yaml (~> 0.9.0)
+ diff-lcs (1.2.4)
+ em-http-request (1.1.0)
+ addressable (>= 2.3.4)
cookiejar
- em-socksify
+ em-socksify (>= 0.3)
+ eventmachine (>= 1.0.3)
+ http_parser.rb (>= 0.6.0.beta.2)
+ em-socksify (0.3.0)
eventmachine (>= 1.0.0.beta.4)
- http_parser.rb (>= 0.5.3)
- em-socksify (0.2.1)
- eventmachine (>= 1.0.0.beta.4)
- eventmachine (1.0.0)
- http_parser.rb (0.5.3)
- httpclient (2.3.3)
- multi_json (1.7.7)
- rack (1.5.1)
- rake (10.0.3)
- rspec (2.12.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
- rspec-core (2.12.2)
- rspec-expectations (2.12.1)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.2)
+ eventmachine (1.0.3)
+ http_parser.rb (0.6.0.beta.2)
+ httpclient (2.3.4.1)
+ multi_json (1.7.8)
+ rack (1.5.2)
+ rake (10.1.0)
+ rspec (2.14.1)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ rspec-core (2.14.4)
+ rspec-expectations (2.14.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.14.2)
+ safe_yaml (0.9.4)
signature (0.1.7)
- webmock (1.9.0)
+ webmock (1.13.0)
addressable (>= 2.2.7)
- crack (>= 0.1.7)
+ crack (>= 0.3.2)
PLATFORMS
ruby
DEPENDENCIES
- em-http-request (~> 1.0.0)
+ em-http-request (~> 1.1.0)
pusher!
rack
rake
View
2  pusher.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "rspec", "~> 2.0"
s.add_development_dependency "webmock"
- s.add_development_dependency "em-http-request", "~> 1.0.0"
+ s.add_development_dependency "em-http-request", "~> 1.1.0"
s.add_development_dependency "rake"
s.add_development_dependency "rack"
View
2  spec/channel_spec.rb
@@ -114,7 +114,7 @@ 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'
+ MultiJson.stub(:encode).with(@custom_data).and_return 'a json string'
response = @channel.authenticate('socketid', @custom_data)
View
2  spec/client_spec.rb
@@ -102,7 +102,7 @@
describe 'logging configuration' do
it "can be configured to use any logger" do
- logger = mock("ALogger")
+ logger = double("ALogger")
logger.should_receive(:debug).with('foo')
Pusher.logger = logger
Pusher.logger.debug('foo')
Please sign in to comment.
Something went wrong with that request. Please try again.