diff --git a/db/seeds.rb b/db/seeds.rb index 2307e70d8..55f8c0f8f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -10,5 +10,5 @@ # cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }]) # Mayor.create(:name => 'Daley', :city => citie -require File.join(File.dirname(__FILE__), "..", "..", "config", "environment") +require File.join(File.dirname(__FILE__), "..", "config", "environment") diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index 0c9d4bbae..e9d3215f9 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -5,7 +5,6 @@ require File.join(File.dirname(__FILE__), "..", "..", "config", "environment") require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods") - def set_app_config username current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example'))) current_config[Rails.env.to_s] ||= {} @@ -21,6 +20,15 @@ set_app_config username unless File.exists?(Rails.root.join('config', 'app_confi require Rails.root.join('config', "initializers", "_load_app_config.rb") include HelperMethods +module Resque + def enqueue(klass, *args) + if $process_queue + klass.send(:perform, *args) + else + true + end + end +end # Create seed user user = User.build( :email => "tom@tom.joindiaspora.com", :username => "tom", @@ -29,8 +37,8 @@ user = User.build( :email => "tom@tom.joindiaspora.com", :person => { :profile => { :first_name => "Alexander", :last_name => "Hamiltom", :image_url => "/images/user/tom.jpg"}}) - -user.save + +user.save! user.person.save! user.seed_aspects @@ -42,12 +50,9 @@ user2 = User.build( :email => "korth@tom.joindiaspora.com", :image_url => "/images/user/korth.jpg"}}) -user2.save +user2.save! user2.person.save! user2.seed_aspects # connecting users -aspect = user.aspects.create(:name => "other dudes") -aspect2 = user2.aspects.create(:name => "presidents") -connect_users(user, aspect, user2, aspect2) -user.aspects.create(:name => "Presidents") +connect_users(user, user.aspects.first, user2, user2.aspects.first)