nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3550 from diaspora/update_gems

Browse source 
Update gems
This commit is contained in:
Jonne Haß 2012-09-11 02:40:19 -07:00
commit d479ceea4f
16 changed files with 105 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Gemfile
View file

@ -5,9 +5,9 @@ ruby '1.9.3' if ENV['HEROKU']
gem 'rails', '3.2.8' gem 'rails', '3.2.8'
gem 'foreman', '0.46' gem 'foreman', '0.57'
gem 'thin', '~> 1.3.1', :require => false gem 'thin', '~> 1.4.1', :require => false
gem 'rails_autolink' gem 'rails_autolink'
# cross-origin resource sharing # cross-origin resource sharing
@ -20,7 +20,7 @@ gem 'devise', '1.5.3'
gem 'remotipart', '~> 1.0' gem 'remotipart', '~> 1.0'
gem 'omniauth', '1.0.3' gem 'omniauth', '1.1.1'
gem 'omniauth-facebook' gem 'omniauth-facebook'
gem 'omniauth-tumblr' gem 'omniauth-tumblr'
gem 'omniauth-twitter' gem 'omniauth-twitter'
@ -49,7 +49,7 @@ end
# configuration # configuration
group :heroku do group :heroku do
gem 'pg' gem 'pg', '0.14.1'
gem 'unicorn', '~> 4.3.0', :require => false gem 'unicorn', '~> 4.3.0', :require => false
end end
@ -57,9 +57,9 @@ gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
# database # database
gem "activerecord-import", "~> 0.2.9" gem "activerecord-import", "~> 0.2.9"
gem 'foreigner', '~> 1.1.0' gem 'foreigner', '~> 1.2.1'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading # file uploading
@ -87,13 +87,13 @@ gem 'ruby-oembed', '~> 0.8.7'
# queue # queue
gem 'resque', '1.20.0' gem 'resque', '1.22.0'
gem 'resque-timeout', '1.0.0' gem 'resque-timeout', '1.0.0'
gem 'SystemTimer', '1.2.3', :platforms => :ruby_18 gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
# tags # tags
gem 'acts-as-taggable-on', :git => "https://github.com/mbleigh/acts-as-taggable-on.git" gem 'acts-as-taggable-on', '2.3.3'
# URIs and HTTP # URIs and HTTP
@ -103,12 +103,12 @@ gem 'typhoeus', '~> 0.3.3'
# views # views
gem 'haml', '3.1.6.rc.1' gem 'haml', '3.1.7'
gem 'mobile-fu' gem 'mobile-fu'
gem 'will_paginate' gem 'will_paginate'
gem 'client_side_validations' gem 'client_side_validations'
gem 'gon' gem 'gon', '~> 4.0'
# assets # assets
@ -146,11 +146,11 @@ group :test do
gem 'capybara', '~> 1.1.2' gem 'capybara', '~> 1.1.2'
gem 'cucumber-rails', '1.3.0', :require => false gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.7.1' gem 'database_cleaner', '0.8'
gem 'timecop' gem 'timecop'
gem 'factory_girl_rails', '1.7.0' gem 'factory_girl_rails', '1.7.0'
gem 'fixture_builder', '0.3.3' gem 'fixture_builder', '0.3.4'
gem 'fuubar', '>= 1.0' gem 'fuubar', '>= 1.0'
gem 'rspec-instafail', '>= 0.1.7', :require => false gem 'rspec-instafail', '>= 0.1.7', :require => false
gem 'selenium-webdriver', '~> 2.25' gem 'selenium-webdriver', '~> 2.25'
@ -172,7 +172,7 @@ end
group :development do group :development do
gem 'heroku' gem 'heroku'
gem 'heroku_san', '3.0.2', :platforms => :mri_19 gem 'heroku_san', '3.0.4', :platforms => :mri_19
gem 'capistrano', :require => false gem 'capistrano', :require => false
gem 'capistrano_colors', :require => false gem 'capistrano_colors', :require => false
gem 'capistrano-ext', :require => false gem 'capistrano-ext', :require => false

128
Gemfile.lock
View file

@ -31,13 +31,6 @@ GIT
specs: specs:
settingslogic (2.0.8) settingslogic (2.0.8)
GIT
remote: https://github.com/mbleigh/acts-as-taggable-on.git
revision: d9b66b70e90352605e6f767e7c2b7a8859050655
specs:
acts-as-taggable-on (2.3.1)
rails (~> 3.0)
GIT GIT
remote: https://github.com/pivotal/jasmine-gem.git remote: https://github.com/pivotal/jasmine-gem.git
revision: 1e075fbf5a69812fcc914c453f002ecf5bed38ab revision: 1e075fbf5a69812fcc914c453f002ecf5bed38ab
@ -89,11 +82,13 @@ GEM
activesupport (3.2.8) activesupport (3.2.8)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
acts_as_api (0.4) acts_as_api (0.4)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
rack (>= 1.1.0) rack (>= 1.1.0)
addressable (2.2.8) addressable (2.3.2)
airbrake (3.1.0) airbrake (3.1.0)
activesupport activesupport
builder builder
@ -104,7 +99,7 @@ GEM
bbenezech-nested_form (0.0.6) bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.3.1) bootstrap-sass (2.0.3.1)
builder (3.0.0) builder (3.0.3)
capistrano (2.12.0) capistrano (2.12.0)
highline highline
net-scp (>= 1.0.0) net-scp (>= 1.0.0)
@ -145,13 +140,13 @@ GEM
capybara (>= 1.1.2) capybara (>= 1.1.2)
cucumber (>= 1.1.8) cucumber (>= 1.1.8)
nokogiri (>= 1.5.0) nokogiri (>= 1.5.0)
daemons (1.1.8) daemons (1.1.9)
database_cleaner (0.7.1) database_cleaner (0.8.0)
debugger (1.1.3) debugger (1.2.0)
columnize (>= 0.3.1) columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1) debugger-linecache (~> 1.1.1)
debugger-ruby_core_source (~> 1.1.2) debugger-ruby_core_source (~> 1.1.3)
debugger-linecache (1.1.1) debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1) debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.3) debugger-ruby_core_source (1.1.3)
devise (1.5.3) devise (1.5.3)
@ -161,7 +156,7 @@ GEM
diff-lcs (1.1.3) diff-lcs (1.1.3)
erubis (2.7.0) erubis (2.7.0)
eventmachine (0.12.10) eventmachine (0.12.10)
excon (0.14.2) excon (0.14.3)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (2.6.4) factory_girl (2.6.4)
@ -175,7 +170,7 @@ GEM
faraday (>= 0.7.4, < 0.9) faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.1.5) ffi (1.1.5)
fixture_builder (0.3.3) fixture_builder (0.3.4)
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
fog (1.4.0) fog (1.4.0)
@ -188,18 +183,18 @@ GEM
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
ruby-hmac ruby-hmac
foreigner (1.1.6) foreigner (1.2.1)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
foreman (0.46.0) foreman (0.57.0)
thor (>= 0.13.6) thor (>= 0.13.6)
formatador (0.2.3) formatador (0.2.3)
fuubar (1.0.0) fuubar (1.0.0)
rspec (~> 2.0) rspec (~> 2.0)
rspec-instafail (~> 0.2.0) rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 0.0.10) ruby-progressbar (~> 0.0.10)
gherkin (2.11.0) gherkin (2.11.2)
json (>= 1.4.6) json (>= 1.4.6)
gon (3.0.4) gon (4.0.0)
actionpack (>= 2.3.0) actionpack (>= 2.3.0)
json json
guard (1.1.1) guard (1.1.1)
@ -213,21 +208,21 @@ GEM
guard-spork (0.8.0) guard-spork (0.8.0)
guard (>= 0.10.0) guard (>= 0.10.0)
spork (>= 0.8.4) spork (>= 0.8.4)
haml (3.1.6.rc.1) haml (3.1.7)
handlebars_assets (0.4.4) handlebars_assets (0.4.4)
execjs (>= 1.2.9) execjs (>= 1.2.9)
sprockets (>= 2.0.3) sprockets (>= 2.0.3)
tilt tilt
hashie (1.2.0) hashie (1.2.0)
heroku (2.26.5) heroku (2.28.12)
heroku-api (~> 0.2.4) heroku-api (~> 0.2.8)
launchy (>= 0.3.2) launchy (>= 0.3.2)
netrc (~> 0.7.2) netrc (~> 0.7.5)
rest-client (~> 1.6.1) rest-client (~> 1.6.1)
rubyzip rubyzip
heroku-api (0.2.4) heroku-api (0.2.8)
excon (~> 0.14.0) excon (~> 0.14.3)
heroku_san (3.0.2) heroku_san (3.0.4)
activesupport activesupport
heroku (>= 2) heroku (>= 2)
heroku-api (>= 0.1.2) heroku-api (>= 0.1.2)
@ -259,10 +254,9 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
railties (>= 3.0.0) railties (>= 3.0.0)
kgio (2.7.4) kgio (2.7.4)
launchy (2.1.0) launchy (2.1.2)
addressable (~> 2.2.6) addressable (~> 2.3)
libwebsocket (0.1.5) libwebsocket (0.1.5)
addressable
linecache (0.46) linecache (0.46)
rbx-require-relative (> 0.0.4) rbx-require-relative (> 0.0.4)
listen (0.4.2) listen (0.4.2)
@ -290,7 +284,7 @@ GEM
net-ssh (2.5.2) net-ssh (2.5.2)
net-ssh-gateway (1.1.0) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
netrc (0.7.2) netrc (0.7.7)
newrelic_rpm (3.3.5) newrelic_rpm (3.3.5)
nokogiri (1.5.2) nokogiri (1.5.2)
oauth (0.4.6) oauth (0.4.6)
@ -301,7 +295,7 @@ GEM
oink (0.9.3) oink (0.9.3)
activerecord activerecord
hodel_3000_compliant_logger hodel_3000_compliant_logger
omniauth (1.0.3) omniauth (1.1.1)
hashie (~> 1.2) hashie (~> 1.2)
rack rack
omniauth-facebook (1.3.0) omniauth-facebook (1.3.0)
@ -318,17 +312,17 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
orm_adapter (0.0.7) orm_adapter (0.0.7)
pg (0.13.2) pg (0.14.1)
polyglot (0.3.3) polyglot (0.3.3)
rack (1.4.1) rack (1.4.1)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-cors (0.2.6) rack-cors (0.2.7)
rack rack
rack-google-analytics (0.10.0) rack-google-analytics (0.11.0)
rack-mobile-detect (0.4.0) rack-mobile-detect (0.4.0)
rack rack
rack-piwik (0.1.2) rack-piwik (0.1.3)
rack-pjax (0.5.9) rack-pjax (0.5.9)
hpricot (~> 0.8.6) hpricot (~> 0.8.6)
rack (~> 1.3) rack (~> 1.3)
@ -369,13 +363,13 @@ GEM
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.1.1) redcarpet (2.1.1)
redis (2.2.2) redis (3.0.1)
redis-namespace (1.0.3) redis-namespace (1.2.1)
redis (< 3.0.0) redis (~> 3.0.0)
remotipart (1.0.2) remotipart (1.0.2)
resque (1.20.0) resque (1.22.0)
multi_json (~> 1.0) multi_json (~> 1.0)
redis-namespace (~> 1.0.2) redis-namespace (~> 1.0)
sinatra (>= 0.9.2) sinatra (>= 0.9.2)
vegas (~> 0.1.2) vegas (~> 0.1.2)
resque-timeout (1.0.0) resque-timeout (1.0.0)
@ -385,20 +379,20 @@ GEM
rpm_contrib (2.1.11) rpm_contrib (2.1.11)
newrelic_rpm (>= 3.1.1) newrelic_rpm (>= 3.1.1)
newrelic_rpm (>= 3.1.1) newrelic_rpm (>= 3.1.1)
rspec (2.10.0) rspec (2.11.0)
rspec-core (~> 2.10.0) rspec-core (~> 2.11.0)
rspec-expectations (~> 2.10.0) rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.10.0) rspec-mocks (~> 2.11.0)
rspec-core (2.10.1) rspec-core (2.11.1)
rspec-expectations (2.10.0) rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-instafail (0.2.4) rspec-instafail (0.2.4)
rspec-mocks (2.10.1) rspec-mocks (2.11.2)
rspec-rails (2.10.1) rspec-rails (2.11.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.10.0) rspec (~> 2.11.0)
ruby-debug (0.10.4) ruby-debug (0.10.4)
columnize (>= 0.1) columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0) ruby-debug-base (~> 0.10.4.0)
@ -419,7 +413,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
simple_oauth (0.1.8) simple_oauth (0.1.8)
sinatra (1.3.2) sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6) rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2) rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
@ -429,13 +423,13 @@ GEM
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
subexec (0.2.2) subexec (0.2.2)
thin (1.3.1) thin (1.4.1)
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.16.0) thor (0.16.0)
tilt (1.3.3) tilt (1.3.3)
timecop (0.3.5) timecop (0.4.6)
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
@ -447,9 +441,9 @@ GEM
typhoeus (0.3.3) typhoeus (0.3.3)
mime-types mime-types
tzinfo (0.3.33) tzinfo (0.3.33)
uglifier (1.2.4) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.3.1) unicorn (4.3.1)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
@ -472,7 +466,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
SystemTimer (= 1.2.3) SystemTimer (= 1.2.3)
activerecord-import (~> 0.2.9) activerecord-import (~> 0.2.9)
acts-as-taggable-on! acts-as-taggable-on (= 2.3.3)
acts_as_api acts_as_api
addressable (~> 2.2) addressable (~> 2.2)
airbrake airbrake
@ -486,26 +480,26 @@ DEPENDENCIES
carrierwave (= 0.6.2) carrierwave (= 0.6.2)
client_side_validations client_side_validations
cucumber-rails (= 1.3.0) cucumber-rails (= 1.3.0)
database_cleaner (= 0.7.1) database_cleaner (= 0.8)
debugger debugger
devise (= 1.5.3) devise (= 1.5.3)
factory_girl_rails (= 1.7.0) factory_girl_rails (= 1.7.0)
faraday faraday
faraday_middleware faraday_middleware
fastercsv (= 1.5.5) fastercsv (= 1.5.5)
fixture_builder (= 0.3.3) fixture_builder (= 0.3.4)
fog fog
foreigner (~> 1.1.0) foreigner (~> 1.2.1)
foreman (= 0.46) foreman (= 0.57)
fuubar (>= 1.0) fuubar (>= 1.0)
gon gon (~> 4.0)
guard-cucumber guard-cucumber
guard-rspec guard-rspec
guard-spork guard-spork
haml (= 3.1.6.rc.1) haml (= 3.1.7)
handlebars_assets handlebars_assets
heroku heroku
heroku_san (= 3.0.2) heroku_san (= 3.0.4)
http_accept_language (~> 1.0.2) http_accept_language (~> 1.0.2)
i18n-inflector-rails (~> 1.0) i18n-inflector-rails (~> 1.0)
jasmine! jasmine!
@ -520,11 +514,11 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
nokogiri (= 1.5.2) nokogiri (= 1.5.2)
oink oink
omniauth (= 1.0.3) omniauth (= 1.1.1)
omniauth-facebook omniauth-facebook
omniauth-tumblr omniauth-tumblr
omniauth-twitter omniauth-twitter
pg pg (= 0.14.1)
rack-cors (~> 0.2.4) rack-cors (~> 0.2.4)
rack-google-analytics rack-google-analytics
rack-piwik rack-piwik
@ -536,7 +530,7 @@ DEPENDENCIES
rails_autolink rails_autolink
redcarpet (= 2.1.1) redcarpet (= 2.1.1)
remotipart (~> 1.0) remotipart (~> 1.0)
resque (= 1.20.0) resque (= 1.22.0)
resque-timeout (= 1.0.0) resque-timeout (= 1.0.0)
roxml! roxml!
rpm_contrib (~> 2.1.7) rpm_contrib (~> 2.1.7)
@ -548,7 +542,7 @@ DEPENDENCIES
selenium-webdriver (~> 2.25) selenium-webdriver (~> 2.25)
settingslogic! settingslogic!
spork (~> 1.0rc2) spork (~> 1.0rc2)
thin (~> 1.3.1) thin (~> 1.4.1)
timecop timecop
twitter (= 2.0.2) twitter (= 2.0.2)
typhoeus (~> 0.3.3) typhoeus (~> 0.3.3)

4
spec/controllers/blocks_controller_spec.rb
View file

@ -9,7 +9,7 @@ describe BlocksController do
it "creates a block" do it "creates a block" do
expect { expect {
post :create, :block => {:person_id => eve.person.id} post :create, :block => {:person_id => eve.person.id}
}.should change { alice.blocks.count }.by(1) }.to change { alice.blocks.count }.by(1)
end end
it "redirects back" do it "redirects back" do
@ -43,7 +43,7 @@ describe BlocksController do
it "removes a block" do it "removes a block" do
expect { expect {
delete :destroy, :id => @block.id delete :destroy, :id => @block.id
}.should change { alice.blocks.count }.by(-1) }.to change { alice.blocks.count }.by(-1)
end end
end end

2
spec/controllers/likes_controller_spec.rb
View file

@ -124,7 +124,7 @@ describe LikesController do
like_count = Like.count like_count = Like.count
expect { expect {
delete :destroy, :format => :json, id_field => like2.target_id, :id => like2.id delete :destroy, :format => :json, id_field => like2.target_id, :id => like2.id
}.should raise_error(ActiveRecord::RecordNotFound) }.to raise_error(ActiveRecord::RecordNotFound)
Like.count.should == like_count Like.count.should == like_count

2
spec/controllers/reshares_controller_spec.rb
View file

@ -29,7 +29,7 @@ describe ResharesController do
it 'creates a reshare' do it 'creates a reshare' do
expect{ expect{
post_request! post_request!
}.should change(Reshare, :count).by(1) }.to change(Reshare, :count).by(1)
end end
it 'after save, calls add to streams' do it 'after save, calls add to streams' do

4
spec/controllers/status_messages_controller_spec.rb
View file

@ -226,7 +226,7 @@ describe StatusMessagesController do
alice.save alice.save
expect{ expect{
@controller.remove_getting_started @controller.remove_getting_started
}.should change{ }.to change{
alice.reload.getting_started alice.reload.getting_started
}.from(true).to(false) }.from(true).to(false)
end end
@ -234,7 +234,7 @@ describe StatusMessagesController do
it 'does nothing for returning users' do it 'does nothing for returning users' do
expect{ expect{
@controller.remove_getting_started @controller.remove_getting_started
}.should_not change{ }.to_not change{
alice.reload.getting_started alice.reload.getting_started
} }
end end

2
spec/helpers/notifications_helper_spec.rb
View file

@ -83,7 +83,7 @@ describe NotificationsHelper do
context 'when post is deleted' do context 'when post is deleted' do
it 'works' do it 'works' do
@post.destroy @post.destroy
expect{ object_link(@notification, notification_people_link(@notification))}.should_not raise_error expect{ object_link(@notification, notification_people_link(@notification))}.to_not raise_error
end end
it 'displays that the post was deleted' do it 'displays that the post was deleted' do

20
spec/integration/attack_vectors_spec.rb
View file

@ -88,7 +88,7 @@ describe "attack vectors" do
expect_error /Contact required/ do expect_error /Contact required/ do
zord.perform! zord.perform!
end end
}.should_not change(Post, :count) }.to_not change(Post, :count)
user_should_not_see_guid(bob, bad_post_guid) user_should_not_see_guid(bob, bad_post_guid)
end end
@ -128,7 +128,7 @@ describe "attack vectors" do
expect_error /Author does not match XML author/ do expect_error /Author does not match XML author/ do
receive(profile, :from => alice, :by => bob) receive(profile, :from => alice, :by => bob)
end end
}.should_not change(eve.profile, :first_name) }.to_not change(eve.profile, :first_name)
end end
end end
@ -154,7 +154,7 @@ describe "attack vectors" do
expect{ expect{
receive(malicious_message, :from => alice, :by => bob) receive(malicious_message, :from => alice, :by => bob)
}.should_not change(original_message, :author_id) }.to_not change(original_message, :author_id)
end end
it 'does not save a message over an old message with the same author' do it 'does not save a message over an old message with the same author' do
@ -167,7 +167,7 @@ describe "attack vectors" do
expect { expect {
receive(malicious_message, :from => eve, :by => bob) receive(malicious_message, :from => eve, :by => bob)
}.should_not change(original_message, :text) }.to_not change(original_message, :text)
end end
end end
@ -183,7 +183,7 @@ describe "attack vectors" do
expect { expect {
receive(ret, :from => alice, :by => bob) receive(ret, :from => alice, :by => bob)
}.should_not change(StatusMessage, :count) }.to_not change(StatusMessage, :count)
end end
it "silently disregards retractions for non-existent posts(that are from someone other than the post's author)" do it "silently disregards retractions for non-existent posts(that are from someone other than the post's author)" do
@ -196,7 +196,7 @@ describe "attack vectors" do
end end
expect{ expect{
receive(bogus_retraction, :from => alice, :by => bob) receive(bogus_retraction, :from => alice, :by => bob)
}.should_not raise_error }.to_not raise_error
end end
it 'should not receive retractions where the retractor and the salmon author do not match' do it 'should not receive retractions where the retractor and the salmon author do not match' do
@ -212,7 +212,7 @@ describe "attack vectors" do
expect_error /Author does not match XML author/ do expect_error /Author does not match XML author/ do
receive(retraction, :from => alice, :by => bob) receive(retraction, :from => alice, :by => bob)
end end
}.should_not change(bob.visible_shareables(Post), :count) }.to_not change(bob.visible_shareables(Post), :count)
end end
@ -228,7 +228,7 @@ describe "attack vectors" do
expect{ expect{
receive(retraction, :from => alice, :by => bob) receive(retraction, :from => alice, :by => bob)
}.should_not change{bob.reload.contacts.count} }.to_not change{bob.reload.contacts.count}
end end
it 'it should not allow you to send retractions with xml and salmon handle mismatch' do it 'it should not allow you to send retractions with xml and salmon handle mismatch' do
@ -242,7 +242,7 @@ describe "attack vectors" do
expect_error /Author does not match XML author/ do expect_error /Author does not match XML author/ do
receive(retraction, :from => alice, :by => bob) receive(retraction, :from => alice, :by => bob)
end end
}.should_not change(bob.contacts, :count) }.to_not change(bob.contacts, :count)
end end
it 'does not let another user update other persons post' do it 'does not let another user update other persons post' do
@ -256,7 +256,7 @@ describe "attack vectors" do
expect{ expect{
receive(new_message, :from => alice, :by => bob) receive(new_message, :from => alice, :by => bob)
}.should_not change(original_message, :text) }.to_not change(original_message, :text)
end end
end end
end end

4
spec/lib/i18n_interpolation_fallbacks_spec.rb
View file

@ -23,7 +23,7 @@ describe "i18n interpolation fallbacks" do
I18n.t('ago').should == "%{time} ago" I18n.t('ago').should == "%{time} ago"
end end
it "raises a MissingInterpolationArgument when arguments are wrong" do it "raises a MissingInterpolationArgument when arguments are wrong" do
expect { I18n.t('ago', :not_time => "2 months") }.should raise_exception(I18n::MissingInterpolationArgument) expect { I18n.t('ago', :not_time => "2 months") }.to raise_exception(I18n::MissingInterpolationArgument)
end end
end end
context "current locale falls back to English" do context "current locale falls back to English" do
@ -55,7 +55,7 @@ describe "i18n interpolation fallbacks" do
describe "when the English translation does not work" do describe "when the English translation does not work" do
it "raises a MissingInterpolationArgument" do it "raises a MissingInterpolationArgument" do
I18n.backend.store_translations('en', {"nonexistant_key" => "%{random_key} also required, so this will fail"}) I18n.backend.store_translations('en', {"nonexistant_key" => "%{random_key} also required, so this will fail"})
expect { I18n.t('nonexistant_key', :hey => "what") }.should raise_exception(I18n::MissingInterpolationArgument) expect { I18n.t('nonexistant_key', :hey => "what") }.to raise_exception(I18n::MissingInterpolationArgument)
end end
end end
end end

2
spec/lib/postzord/dispatcher_spec.rb
View file

@ -42,7 +42,7 @@ describe Postzord::Dispatcher do
it 'raises and gives you a helpful message if the object can not federate' do it 'raises and gives you a helpful message if the object can not federate' do
expect { expect {
Postzord::Dispatcher.build(alice, []) Postzord::Dispatcher.build(alice, [])
}.should raise_error /Diaspora::Federated::Base/ }.to raise_error /Diaspora::Federated::Base/
end end
end end

2
spec/lib/salmon/slap_spec.rb
View file

@ -51,7 +51,7 @@ describe Salmon::Slap do
parsed_salmon.author_id = 'tom@tom.joindiaspora.com' parsed_salmon.author_id = 'tom@tom.joindiaspora.com'
expect { expect {
parsed_salmon.author.public_key parsed_salmon.author.public_key
}.should raise_error "did you remember to async webfinger?" }.to raise_error "did you remember to async webfinger?"
end end
end end

8
spec/models/app_config_spec.rb
View file

@ -32,7 +32,7 @@ describe AppConfig do
it "prints an error message and exits" do it "prints an error message and exits" do
expect { expect {
AppConfig.load! AppConfig.load!
}.should raise_error SystemExit }.to raise_error SystemExit
$stderr.rewind $stderr.rewind
$stderr.string.chomp.should_not be_blank $stderr.string.chomp.should_not be_blank
@ -57,7 +57,7 @@ describe AppConfig do
expect { expect {
AppConfig.load! AppConfig.load!
}.should raise_error SystemExit }.to raise_error SystemExit
$stderr.rewind $stderr.rewind
$stderr.string.should include("haven't set up") $stderr.string.should include("haven't set up")
@ -69,7 +69,7 @@ describe AppConfig do
expect { expect {
AppConfig.load! AppConfig.load!
}.should raise_error SystemExit }.to raise_error SystemExit
$stderr.rewind $stderr.rewind
$stderr.string.should include("file format has changed") $stderr.string.should include("file format has changed")
@ -82,7 +82,7 @@ describe AppConfig do
expect { expect {
AppConfig.load! AppConfig.load!
}.should raise_error SystemExit }.to raise_error SystemExit
$stderr.rewind $stderr.rewind
$stderr.string.should include("file format has changed") $stderr.string.should include("file format has changed")

6
spec/models/photo_spec.rb
View file

@ -246,13 +246,13 @@ describe Photo do
it 'is deleted with parent status message' do it 'is deleted with parent status message' do
expect { expect {
@status_message.destroy @status_message.destroy
}.should change(Photo, :count).by(-1) }.to change(Photo, :count).by(-1)
end end
it 'will delete parent status message if message is otherwise empty' do it 'will delete parent status message if message is otherwise empty' do
expect { expect {
@photo2.destroy @photo2.destroy
}.should change(StatusMessage, :count).by(-1) }.to change(StatusMessage, :count).by(-1)
end end
it 'will not delete parent status message if message had other content' do it 'will not delete parent status message if message had other content' do
@ -263,7 +263,7 @@ describe Photo do
expect { expect {
@photo2.status_message.reload @photo2.status_message.reload
@photo2.destroy @photo2.destroy
}.should_not change(StatusMessage, :count) }.to_not change(StatusMessage, :count)
end end
end end
end end

2
spec/models/reshare_spec.rb
View file

@ -139,7 +139,7 @@ describe Reshare do
expect{ expect{
reshare.destroy reshare.destroy
}.should_not raise_error }.to_not raise_error
end end
end end

2
spec/models/status_message_spec.rb
View file

@ -205,7 +205,7 @@ STR
expect{ expect{
@sm.create_mentions @sm.create_mentions
}.should_not raise_error }.to_not raise_error
end end
end end
describe '#mentioned_people' do describe '#mentioned_people' do

2
spec/models/user_spec.rb
View file

@ -18,7 +18,7 @@ describe User do
expect{ expect{
user.reload.encryption_key user.reload.encryption_key
}.should_not raise_error }.to_not raise_error
end end
end end