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