diff --git a/Gemfile.lock b/Gemfile.lock index 5757dfcde14d2867f6b5b8b24122cea5d6f64a66..39b3112e3438a0a0c288a57d30564ebcb2f6f2a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,6 +97,7 @@ GEM activesupport (= 3.0.1) activesupport (3.0.1) addressable (2.2.2) + archive-tar-minitar (0.5.2) arel (1.0.1) activesupport (~> 3.0.0) aws (2.3.22) @@ -163,7 +164,8 @@ GEM i18n (0.4.1) json (1.4.6) json_pure (1.4.6) - linecache (0.43) + linecache19 (0.5.11) + ruby_core_source (>= 0.1.4) mail (2.2.7) activesupport (>= 2.3.6) mime-types @@ -225,11 +227,16 @@ GEM rspec-expectations (~> 2.0.1) rspec-rails (2.0.1) rspec (~> 2.0.0) - ruby-debug (0.10.3) - columnize (>= 0.1) - ruby-debug-base (~> 0.10.3.0) - ruby-debug-base (0.10.3) - linecache (>= 0.3) + ruby-debug-base19 (0.11.24) + columnize (>= 0.3.1) + linecache19 (>= 0.5.11) + ruby_core_source (>= 0.1.4) + ruby-debug19 (0.11.6) + columnize (>= 0.3.1) + linecache19 (>= 0.5.11) + ruby-debug-base19 (>= 0.11.19) + ruby_core_source (0.1.4) + archive-tar-minitar (>= 0.5.2) rubyzip (0.9.4) selenium-webdriver (0.0.29) childprocess (>= 0.0.7) @@ -287,7 +294,7 @@ DEPENDENCIES roxml! rspec (>= 2.0.0) rspec-rails (>= 2.0.0) - ruby-debug + ruby-debug19 sprinkle! thin webmock diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index 0acf31f385bcdad42e1dbca412ebf61fa369d6d2..33f7736130abf4d5e12efd9a2729125376dab214 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -22,25 +22,25 @@ user = User.build( :email => "tom@tom.joindiaspora.com", :username => "tom", :password => "evankorth", :password_confirmation => "evankorth", - :person => Person.new( - :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" )) - ) + :person => { + :profile => { :first_name => "Alexander", :last_name => "Hamiltom", + :image_url => "/images/user/tom.jpg"}}) + user.save user.person.save! user.seed_aspects user2 = User.build( :email => "korth@tom.joindiaspora.com", - :username => "korth", :password => "evankorth", :password_confirmation => "evankorth", - :person => Person.new( - :profile => Profile.new( :first_name => "Evan", :last_name => "Korth"))) + :username => "korth", + :person => {:profile => { :first_name => "Evan", :last_name => "Korth", + :image_url => "/images/user/korth.jpg"}}) user2.save user2.person.save! user2.seed_aspects - # friending users aspect = user.aspect(:name => "other dudes") request = user.send_friend_request_to(user2, aspect) diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb index d04a334aae32a3250073078fabbadeb89512402a..f4c453d8194944a5f99bc06a87d5e1c047db65ff 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.rb @@ -24,8 +24,7 @@ user = User.build( :email => "tom@tom.joindiaspora.com", :password_confirmation => "evankorth", :person => { :profile => { :first_name => "Alexander", :last_name => "Hamiltom", - :image_url => "http://tom.joindiaspora.com/images/user/tom.jpg"}} - ) + :image_url => "http://tom.joindiaspora.com/images/user/tom.jpg"}}) user.save! user.seed_aspects user.person.save! @@ -39,7 +38,6 @@ user2 = User.build( :email => "korth@tom.joindiaspora.com", user2.save! user2.seed_aspects user2.person.save! - # friending users aspect = user.aspect(:name => "other dudes") request = user.send_friend_request_to(user2, aspect)