Download as
Browse Code »

Commit acf45dc90a81e3da6a7e6cbf244ccdcab2bc88d9

Authored by AntonioTerceiro
1 parent 2bc9351d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem102: adding relationship with regions to environment 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@661 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 13 additions and 0 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @acf45dc
@@ -25,6 +25,8 @@ class Environment < ActiveRecord::Base @@ -25,6 +25,8 @@ class Environment < ActiveRecord::Base
25 has_many :categories 25 has_many :categories
26 has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color' 26 has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
27 27
  28 + has_many :regions
  29 +
28 has_many :role_assignments, :as => 'resource' 30 has_many :role_assignments, :as => 'resource'
29 def superior_intances 31 def superior_intances
30 [self, nil] 32 [self, nil]
test/unit/environment_test.rb
  Diff comments   View file @acf45dc
@@ -121,6 +121,17 @@ class EnvironmentTest < Test::Unit::TestCase @@ -121,6 +121,17 @@ class EnvironmentTest < Test::Unit::TestCase
121 assert !env.display_categories.include?(cat2) 121 assert !env.display_categories.include?(cat2)
122 end 122 end
123 123
  124 + should 'have regions' do
  125 + env = Environment.create!(:name => 'a test environment')
  126 + assert_kind_of Array, env.regions
  127 + assert_raise ActiveRecord::AssociationTypeMismatch do
  128 + env.regions << 1
  129 + end
  130 + assert_nothing_raised do
  131 + env.regions << Region.new
  132 + end
  133 + end
  134 +
124 should 'have a contact email' do 135 should 'have a contact email' do
125 env = Environment.new 136 env = Environment.new
126 assert_nil env.contact_email 137 assert_nil env.contact_email