Download as
Browse Code »

Commit f265ef22366c224c307fa2d4743ce0aa3e823375

Authored by Rafael Martins
1 parent ebc5cf24
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Product validates the presence of Enterprise

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
app/models/product.rb
  Diff comments   View file @f265ef2
1 1 class Product < ActiveRecord::Base
2 2 belongs_to :enterprise
3 3 has_one :region, :through => :enterprise
  4 + validates_presence_of :enterprise
4 5  
5 6 belongs_to :product_category
6 7  
... ...
test/unit/product_test.rb
  Diff comments   View file @f265ef2
... ... @@ -200,7 +200,7 @@ class ProductTest &lt; ActiveSupport::TestCase
200 200 end
201 201  
202 202 should 'use name of category when has no name yet' do
203   - product = Product.new(:product_category => @product_category)
  203 + product = Product.new(:product_category => @product_category, :enterprise_id => @profile.id)
204 204 assert product.valid?
205 205 assert_equal product.name, @product_category.name
206 206 end
... ... @@ -331,7 +331,7 @@ class ProductTest &lt; ActiveSupport::TestCase
331 331 p1 = Product.create!(:name => 'some thing', :product_category => @product_category, :enterprise_id => @profile.id)
332 332 assert_equal Product.find_by_contents('thing')[:results], [p1]
333 333 uses_postgresql 'schema_two'
334   - p2 = Product.create!(:name => 'another thing', :product_category => @product_category)
  334 + p2 = Product.create!(:name => 'another thing', :product_category => @product_category, :enterprise_id => @profile.id)
335 335 assert_not_includes Product.find_by_contents('thing')[:results], p1
336 336 assert_includes Product.find_by_contents('thing')[:results], p2
337 337 uses_postgresql 'schema_one'
... ...