aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/public_body_category_link.rb2
-rw-r--r--spec/factories/public_body_category_links.rb5
-rw-r--r--spec/models/public_body_category_link_spec.rb12
3 files changed, 18 insertions, 1 deletions
diff --git a/app/models/public_body_category_link.rb b/app/models/public_body_category_link.rb
index d1ea5bdbb..eb233b56f 100644
--- a/app/models/public_body_category_link.rb
+++ b/app/models/public_body_category_link.rb
@@ -12,6 +12,8 @@ class PublicBodyCategoryLink < ActiveRecord::Base
belongs_to :public_body_category
belongs_to :public_body_heading
+ validates_presence_of :public_body_category
+ validates_presence_of :public_body_heading
validates :category_display_order, :numericality => { :only_integer => true,
:message => N_('Display order must be a number') }
diff --git a/spec/factories/public_body_category_links.rb b/spec/factories/public_body_category_links.rb
index 0b71376be..7663b1f52 100644
--- a/spec/factories/public_body_category_links.rb
+++ b/spec/factories/public_body_category_links.rb
@@ -1,3 +1,6 @@
FactoryGirl.define do
- factory :public_body_category_link
+ factory :public_body_category_link do
+ association :public_body_category
+ association :public_body_heading
+ end
end
diff --git a/spec/models/public_body_category_link_spec.rb b/spec/models/public_body_category_link_spec.rb
index 5964a164e..8d91f02d5 100644
--- a/spec/models/public_body_category_link_spec.rb
+++ b/spec/models/public_body_category_link_spec.rb
@@ -20,6 +20,18 @@ describe PublicBodyHeading, 'when validating' do
category_link.category_display_order.should == PublicBodyCategoryLink.next_display_order(heading)
end
+ it 'should be invalid without a category' do
+ category_link = PublicBodyCategoryLink.new
+ category_link.should_not be_valid
+ category_link.errors[:public_body_category].should == ["can't be blank"]
+ end
+
+ it 'should be invalid without a heading' do
+ category_link = PublicBodyCategoryLink.new
+ category_link.should_not be_valid
+ category_link.errors[:public_body_heading].should == ["can't be blank"]
+ end
+
end
describe PublicBodyCategoryLink, 'when setting a category display order' do