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

fix typo, update webdriver

Browse source
This commit is contained in:
Maxwell Salzberg 2011-09-29 14:48:47 -07:00
parent 772f69de2d
commit 5c96705069
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -124,7 +124,7 @@ group :test do
gem 'rspec-core', '2.6.0' gem 'rspec-core', '2.6.0'
gem 'rspec-instafail', '>= 0.1.7', :require => false gem 'rspec-instafail', '>= 0.1.7', :require => false
gem 'rspec-rails', '>= 2.0.0' gem 'rspec-rails', '>= 2.0.0'
gem 'selenium-webdriver', '2.4' gem "selenium-webdriver", "~> 2.7.0"
gem 'webmock', :require => false gem 'webmock', :require => false
end end

41
Gemfile.lock
View file

@ -31,9 +31,9 @@ GIT
GIT GIT
remote: git://github.com/diaspora/diaspora-client.git remote: git://github.com/diaspora/diaspora-client.git
revision: dcc944e9bacd8fcc8a746c2bd21924a2a1213971 revision: a1b6c480fa3caa8ce24912dda471579de842aa51
specs: specs:
diaspora-client (0.1.0) diaspora-client (0.1.1)
activerecord activerecord
faraday faraday
jwt (>= 0.1.3) jwt (>= 0.1.3)
@ -104,7 +104,7 @@ GEM
xml-simple xml-simple
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
builder (2.1.2) builder (2.1.2)
bunny (0.7.4) bunny (0.7.6)
capistrano (2.5.19) capistrano (2.5.19)
highline highline
net-scp (>= 1.0.0) net-scp (>= 1.0.0)
@ -143,13 +143,13 @@ GEM
cloudfiles (1.4.10) cloudfiles (1.4.10)
mime-types (>= 1.16) mime-types (>= 1.16)
columnize (0.3.4) columnize (0.3.4)
crack (0.1.8) crack (0.3.1)
cucumber (1.0.2) cucumber (1.1.0)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.2)
gherkin (~> 2.4.5) gherkin (~> 2.5.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.5) term-ansicolor (>= 1.0.6)
cucumber-rails (0.3.2) cucumber-rails (0.3.2)
cucumber (>= 0.8.0) cucumber (>= 0.8.0)
culerity (0.2.15) culerity (0.2.15)
@ -170,7 +170,8 @@ GEM
eventmachine (0.12.10) eventmachine (0.12.10)
excon (0.2.4) excon (0.2.4)
extlib (0.9.15) extlib (0.9.15)
factory_girl (2.1.0) factory_girl (2.1.2)
activesupport
factory_girl_rails (1.2.0) factory_girl_rails (1.2.0)
factory_girl (~> 2.1.0) factory_girl (~> 2.1.0)
railties (>= 3.0.0) railties (>= 3.0.0)
@ -198,7 +199,7 @@ GEM
nokogiri (~> 1.4.3.1) nokogiri (~> 1.4.3.1)
ruby-hmac ruby-hmac
foreigner (0.9.1) foreigner (0.9.1)
foreman (0.20.0) foreman (0.22.0)
term-ansicolor (~> 1.0.5) term-ansicolor (~> 1.0.5)
thor (>= 0.13.6) thor (>= 0.13.6)
formatador (0.2.1) formatador (0.2.1)
@ -207,7 +208,7 @@ GEM
rspec-instafail (~> 0.1.8) rspec-instafail (~> 0.1.8)
ruby-progressbar (~> 0.0.10) ruby-progressbar (~> 0.0.10)
gem_plugin (0.2.3) gem_plugin (0.2.3)
gherkin (2.4.18) gherkin (2.5.1)
json (>= 1.4.6) json (>= 1.4.6)
haml (3.1.2) haml (3.1.2)
hashie (1.0.0) hashie (1.0.0)
@ -231,10 +232,9 @@ GEM
rack (>= 1.1) rack (>= 1.1)
rspec (>= 1.3.1) rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3) selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0.rc4) jasmine-core (1.2.0.rc1)
json (1.4.6) json (1.4.6)
json_pure (1.5.4) json_pure (1.6.1)
spruz (~> 0.2.8)
jwt (0.1.3) jwt (0.1.3)
json (>= 1.2.4) json (>= 1.2.4)
kaminari (0.12.4) kaminari (0.12.4)
@ -252,7 +252,7 @@ GEM
subexec (~> 0.0.4) subexec (~> 0.0.4)
mixlib-authentication (1.1.4) mixlib-authentication (1.1.4)
mixlib-log mixlib-log
mixlib-cli (1.2.0) mixlib-cli (1.2.2)
mixlib-config (1.1.2) mixlib-config (1.1.2)
mixlib-log (1.3.0) mixlib-log (1.3.0)
mobile-fu (0.2.1) mobile-fu (0.2.1)
@ -276,7 +276,7 @@ GEM
net-ssh (2.0.24) net-ssh (2.0.24)
net-ssh-gateway (1.1.0) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
newrelic_rpm (3.1.1) newrelic_rpm (3.1.2)
nokogiri (1.4.3.1) nokogiri (1.4.3.1)
oa-basic (0.2.6) oa-basic (0.2.6)
oa-core (= 0.2.6) oa-core (= 0.2.6)
@ -328,11 +328,11 @@ GEM
open4 (1.1.0) open4 (1.1.0)
orm_adapter (0.0.5) orm_adapter (0.0.5)
parallel (0.5.9) parallel (0.5.9)
parallel_tests (0.6.1) parallel_tests (0.6.4)
parallel parallel
polyglot (0.3.2) polyglot (0.3.2)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
rack (1.2.3) rack (1.2.4)
rack-mobile-detect (0.3.0) rack-mobile-detect (0.3.0)
rack rack
rack-mount (0.6.14) rack-mount (0.6.14)
@ -415,7 +415,7 @@ GEM
rubyntlm (0.1.1) rubyntlm (0.1.1)
rubyzip (0.9.4) rubyzip (0.9.4)
sass (3.1.4) sass (3.1.4)
selenium-webdriver (2.4.0) selenium-webdriver (2.7.0)
childprocess (>= 0.2.1) childprocess (>= 0.2.1)
ffi (>= 1.0.7) ffi (>= 1.0.7)
json_pure json_pure
@ -425,9 +425,8 @@ GEM
sinatra (1.2.6) sinatra (1.2.6)
rack (~> 1.1) rack (~> 1.1)
tilt (< 2.0, >= 1.2.2) tilt (< 2.0, >= 1.2.2)
spruz (0.2.13)
subexec (0.0.4) subexec (0.0.4)
systemu (2.3.0) systemu (2.4.0)
term-ansicolor (1.0.6) term-ansicolor (1.0.6)
thin (1.2.11) thin (1.2.11)
daemons (>= 1.0.9) daemons (>= 1.0.9)
@ -532,7 +531,7 @@ DEPENDENCIES
ruby-debug ruby-debug
ruby-debug19 ruby-debug19
sass (= 3.1.4) sass (= 3.1.4)
selenium-webdriver (= 2.4) selenium-webdriver (~> 2.7.0)
settingslogic (= 2.0.6) settingslogic (= 2.0.6)
sod! sod!
thin (= 1.2.11) thin (= 1.2.11)

2
app/models/post_visibility.rb
View file

@ -14,7 +14,7 @@ class PostVisibility < ActiveRecord::Base
# @return [void] # @return [void]
def self.batch_import(contact_ids, post) def self.batch_import(contact_ids, post)
if postgres? if postgres?
contacs_ids.each do |contact_id| contact_ids.each do |contact_id|
PostVisibility.find_or_create_by_contact_id_and_post_id(contact_id, post.id) PostVisibility.find_or_create_by_contact_id_and_post_id(contact_id, post.id)
end end
else else