Skip to content
Browse files

526 - Did a bundle update(without upgrading rails), and fixed the err…

…ors.
  • Loading branch information...
1 parent aeb234e commit 602011c270bd80e1c4beea0402bfd328a47328cf @paramaw paramaw committed Jun 26, 2012
Showing with 91 additions and 94 deletions.
  1. +86 −87 Gemfile.lock
  2. +2 −2 app/models/invite.rb
  3. +2 −4 test/factories/organizations.rb
  4. +1 −1 test/factories/people.rb
View
173 Gemfile.lock
@@ -1,45 +1,45 @@
GIT
remote: git://github.com/nesquena/query_reviewer.git
- revision: 43b46f92afbc81ae7da8459ff3ae9afa465fe4e8
+ revision: 7422e5cbcf601d8844b97135d4919c5f06c823bf
specs:
query_reviewer (0.1.5)
GEM
remote: http://rubygems.org/
specs:
Ascii85 (1.0.1)
- ZenTest (4.7.0)
+ ZenTest (4.8.1)
abstract (1.0.0)
- actionmailer (3.0.12)
- actionpack (= 3.0.12)
+ actionmailer (3.0.15)
+ actionpack (= 3.0.15)
mail (~> 2.2.19)
- actionpack (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
+ actionpack (3.0.15)
+ activemodel (= 3.0.15)
+ activesupport (= 3.0.15)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.5)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.12)
- activesupport (= 3.0.12)
+ activemodel (3.0.15)
+ activesupport (= 3.0.15)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
+ activerecord (3.0.15)
+ activemodel (= 3.0.15)
+ activesupport (= 3.0.15)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- activesupport (3.0.12)
+ activeresource (3.0.15)
+ activemodel (= 3.0.15)
+ activesupport (= 3.0.15)
+ activesupport (3.0.15)
acts_as_revisionable (1.2.2)
activerecord (>= 2.3.9)
- addressable (2.2.7)
- airbrake (3.0.9)
+ addressable (2.2.8)
+ airbrake (3.1.1)
activesupport
builder
archive-tar-minitar (0.5.2)
@@ -51,9 +51,9 @@ GEM
autotest-growl (0.2.16)
autotest-rails (4.1.2)
ZenTest (~> 4.5)
- awesome_nested_set (2.1.2)
+ awesome_nested_set (2.1.3)
activerecord (>= 3.0.0)
- aws-s3 (0.6.2)
+ aws-s3 (0.6.3)
builder
mime-types
xml-simple
@@ -76,14 +76,14 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
+ coffee-script-source (1.3.3)
columnize (0.3.6)
crack (0.3.1)
daemons (1.1.8)
database_cleaner (0.7.2)
date_validator (0.6.3)
activemodel (~> 3.0)
- delayed_job (3.0.1)
+ delayed_job (3.0.3)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
activerecord (> 2.1.0)
@@ -116,33 +116,31 @@ GEM
erubis (2.6.6)
abstract (>= 1.0.0)
escape (0.0.4)
- excon (0.12.0)
- execjs (1.3.0)
+ excon (0.14.1)
+ execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.1.1)
+ factory_girl (3.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.1.0)
- factory_girl (~> 3.1.0)
+ factory_girl_rails (3.5.0)
+ factory_girl (~> 3.5.0)
railties (>= 3.0.0)
- faraday (0.7.6)
- addressable (~> 2.2)
+ faraday (0.8.1)
multipart-post (~> 1.1)
- rack (~> 1.1)
fattr (2.2.1)
ffi (1.0.11)
fitter-happier (0.0.1)
- fog (1.3.0)
+ fog (1.4.0)
builder
- excon (~> 0.12.0)
+ excon (~> 0.14.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
- formatador (0.2.1)
- friendly_id (4.0.4)
+ formatador (0.2.3)
+ friendly_id (4.0.7)
fuubar (1.0.0)
rspec (~> 2.0)
rspec-instafail (~> 0.2.0)
@@ -156,22 +154,23 @@ GEM
json (> 1.4.0)
json (> 1.4.0)
rdoc
- haml (3.1.4)
+ haml (3.1.6)
hashie (1.2.0)
- highline (1.6.11)
+ highline (1.6.13)
hike (1.2.1)
hominid (3.0.4)
hpricot (0.8.6)
- httparty (0.8.1)
- multi_json
+ httparty (0.8.3)
+ multi_json (~> 1.0)
multi_xml
+ httpauth (0.1)
i18n (0.5.0)
jasmine (1.1.2)
jasmine-core (>= 1.1.0)
rack (>= 1.1)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
- jasmine-core (1.1.0)
+ jasmine-core (1.2.0)
jasmine-headless-webkit (0.8.4)
coffee-script
jasmine-core (~> 1.1)
@@ -181,9 +180,10 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.6)
- json_pure (1.6.6)
- launchy (2.0.3)
+ json (1.7.3)
+ json_pure (1.7.3)
+ launchy (2.1.0)
+ addressable (~> 2.2.6)
libwebsocket (0.1.3)
addressable
linecache19 (0.5.12)
@@ -194,40 +194,41 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.18)
+ mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
- multi_json (1.3.2)
- multi_xml (0.4.2)
+ multi_json (1.3.6)
+ multi_xml (0.5.1)
multipart-post (1.1.5)
mysql2 (0.2.18)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.1.4)
- newrelic_rpm (3.3.4.1)
+ newrelic_rpm (3.4.0)
no_peeping_toms (2.1.2)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
- nokogiri (1.5.2)
+ nokogiri (1.5.5)
oauth (0.4.6)
- oauth2 (0.5.2)
+ oauth2 (0.6.1)
faraday (~> 0.7)
- multi_json (~> 1.0)
+ httpauth (~> 0.1)
+ multi_json (~> 1.3)
omniauth (1.0.1)
hashie (~> 1.2)
rack
- omniauth-facebook (1.2.0)
- omniauth-oauth2 (~> 1.0.0)
- omniauth-oauth2 (1.0.0)
- oauth2 (~> 0.5.0)
+ omniauth-facebook (1.4.0)
+ omniauth-oauth2 (~> 1.0.2)
+ omniauth-oauth2 (1.0.2)
+ oauth2 (~> 0.6.0)
omniauth (~> 1.0)
options (2.3.0)
fattr
orm_adapter (0.0.7)
paperclip (2.3.8)
activerecord
activesupport
- pdf-reader (1.1.0)
+ pdf-reader (1.1.1)
Ascii85 (~> 1.0.0)
ruby-rc4
polyglot (0.3.3)
@@ -248,30 +249,30 @@ GEM
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.12)
- actionmailer (= 3.0.12)
- actionpack (= 3.0.12)
- activerecord (= 3.0.12)
- activeresource (= 3.0.12)
- activesupport (= 3.0.12)
+ rails (3.0.15)
+ actionmailer (= 3.0.15)
+ actionpack (= 3.0.15)
+ activerecord (= 3.0.15)
+ activeresource (= 3.0.15)
+ activesupport (= 3.0.15)
bundler (~> 1.0)
- railties (= 3.0.12)
+ railties (= 3.0.15)
rails3-generators (0.17.4)
railties (>= 3.0.0)
- railties (3.0.12)
- actionpack (= 3.0.12)
- activesupport (= 3.0.12)
+ railties (3.0.15)
+ actionpack (= 3.0.15)
+ activesupport (= 3.0.15)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
- rainbow (1.1.3)
+ rainbow (1.1.4)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
remotipart (1.0.2)
rest-client (1.6.7)
mime-types (>= 1.16)
- rsolr (1.0.7)
+ rsolr (1.0.8)
builder (>= 2.1.2)
rspec (2.9.0)
rspec-core (~> 2.9.0)
@@ -304,45 +305,42 @@ GEM
archive-tar-minitar (>= 0.5.2)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
- rubyzip (0.9.7)
+ rubyzip (0.9.9)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
- selenium-webdriver (2.21.2)
+ selenium-webdriver (2.24.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sexp_processor (3.1.0)
+ sexp_processor (3.2.0)
shoulda (3.0.1)
shoulda-context (~> 1.0.0)
shoulda-matchers (~> 1.0.0)
shoulda-context (1.0.0)
shoulda-matchers (1.0.0)
- simplecov (0.6.2)
- multi_json (~> 1.3)
+ simplecov (0.6.4)
+ multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
- sixarm_ruby_email_address_validation (1.2.4)
- spork (0.9.0)
- sprockets (2.4.0)
+ sixarm_ruby_email_address_validation (2.0.0)
+ spork (0.9.2)
+ sprockets (2.4.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
steak (2.0.0)
capybara (>= 1.0.0)
rspec-rails (>= 2.5.0)
- subexec (0.2.1)
- sunspot (1.3.1)
- escape (~> 0.0.4)
+ subexec (0.2.2)
+ sunspot (1.3.3)
pr_geohash (~> 1.0)
rsolr (~> 1.0.7)
- sunspot_rails (1.3.1)
+ sunspot_rails (1.3.3)
nokogiri
- sunspot (= 1.3.1)
- sunspot_solr (1.3.1)
- escape (~> 0.0.4)
+ sunspot (= 1.3.3)
+ sunspot_solr (1.3.3)
sys-uname (0.9.0)
ffi (>= 1.0.0)
thor (0.14.6)
@@ -352,13 +350,14 @@ GEM
polyglot
polyglot (>= 0.3.1)
ttfunk (1.0.3)
- typhoeus (0.3.3)
- mime-types
+ typhoeus (0.4.2)
+ ffi (~> 1.0)
+ mime-types (~> 1.18)
tzinfo (0.3.33)
- warden (1.1.1)
+ warden (1.2.1)
rack (>= 1.0)
- webmock (1.6.2)
- addressable (>= 2.2.2)
+ webmock (1.6.4)
+ addressable (~> 2.2, > 2.2.5)
crack (>= 0.1.7)
webrat (0.7.3)
nokogiri (>= 1.2.0)
View
4 app/models/invite.rb
@@ -29,7 +29,7 @@ def conversation
# email_formatting validation
def email_formatting
- unless splitted_emails.all?{|email| email =~ EmailAddressValidation::EMAIL_ADDRESS_EXACT_PATTERN }
+ unless splitted_emails.all?{|email| email =~ EmailAddressValidation::PatternExact }
errors.add(:emails, "must be in the correct format, example: abc@test.com")
end
end
@@ -44,7 +44,7 @@ def splitted_emails
# returns an array of emails using Regex
def parsed_emails
- splitted_emails.find_all{|email| email =~ EmailAddressValidation::EMAIL_ADDRESS_EXACT_PATTERN}
+ splitted_emails.find_all{|email| email =~ EmailAddressValidation::PatternExact}
end
def send_invites
View
6 test/factories/organizations.rb
@@ -7,11 +7,9 @@
o.website "http://theciviccommons.com"
o.twitter_username 'theciviccommons'
o.association :organization_detail
- o.after_create do |oo|
- oo.authorized_to_setup_an_account = true
- end
+ o.after(:create) { |oo| oo.authorized_to_setup_an_account = true }
end
factory :newly_confirmed_organization, :parent => :organization do |o|
o.confirmed_at { Time.now }
end
-end
+end
View
2 test/factories/people.rb
@@ -59,7 +59,7 @@
u.email 'johnd@example.com'
end
factory :registered_user_with_facebook_authentication, :parent => :registered_user_with_facebook_email do |u|
- after_create { | u |
+ after(:create) { | u |
u.link_with_facebook(FactoryGirl.create :facebook_authentication, person: u )
}
end

0 comments on commit 602011c

Please sign in to comment.
Something went wrong with that request. Please try again.