ActionItem153: adding needed relationships to Environment

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1274 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem153: adding needed relationships to Environment
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1274 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 5a6724e7
Showing 3 changed files with 10 additions and 7 deletions Show diff stats
app/models/environment.rb
test/test_helper.rb
test/unit/enterprise_test.rb
@@ -39,6 +39,8 @@ class Environment &lt; ActiveRecord::Base
   has_many :profiles
   has_many :organizations
+  has_many :enterprises
+  has_many :people
   has_many :categories
   has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
@@ -63,11 +63,14 @@ class Test::Unit::TestCase
     env
   end
-  def create_user(name)
-    User.create!(:login => name, 
-                 :email => name + '@noosfero.org', 
-                 :password => name.underscore, 
-                 :password_confirmation => name.underscore)
+  def create_user(name, options = {})
+    data = {
+      :login => name, 
+      :email => name + '@noosfero.org', 
+      :password => name.underscore, 
+      :password_confirmation => name.underscore
+    }.merge(options)
+    User.create!(data)
   end
   def create_user_with_permission(name, permission, target= nil)
@@ -54,8 +54,6 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     assert_difference Product, :count, -2 do
       e.destroy
     end
-
-
   end
 end
	@@ -39,6 +39,8 @@ class Environment < ActiveRecord::Base		@@ -39,6 +39,8 @@ class Environment < ActiveRecord::Base
39	has_many :profiles	39	has_many :profiles
40		40
41	has_many :organizations	41	has_many :organizations
		42	+ has_many :enterprises
		43	+ has_many :people
42		44
43	has_many :categories	45	has_many :categories
44	has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'	46	has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'