Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 68 insertions, 0 deletions

diff --git a/spec/models/public_body_heading_spec.rb b/spec/models/public_body_heading_spec.rb
new file mode 100644
index 000000000..add2cac60
--- /dev/null
+++ b/spec/models/public_body_heading_spec.rb
@@ -0,0 +1,68 @@
+# == Schema Information
+#
+# Table name: public_body_headings
+#
+#  id            :integer        not null, primary key
+#  locale        :string
+#  name          :text           not null
+#  display_order :integer
+#
+
+require 'spec_helper'
+
+describe PublicBodyHeading do
+
+    context 'when loading the data' do
+
+        before do
+            PublicBodyCategory.add(:en, [
+                  "Local and regional",
+                      [ "local_council", "Local councils", "a local council" ],
+                  "Miscellaneous",
+                      [ "other", "Miscellaneous", "miscellaneous" ],])
+        end
+
+        it 'should use the display_order field to preserve the original data order' do
+            headings = PublicBodyHeading.all
+            headings[0].name.should eq 'Local and regional'
+            headings[0].display_order.should eq 0
+            headings[1].name.should eq 'Miscellaneous'
+            headings[1].display_order.should eq 1
+        end
+
+    end
+
+    context 'when validating' do
+
+        it 'should require a name' do
+            heading = PublicBodyHeading.new
+            heading.should_not be_valid
+            heading.errors[:name].should == ["Name can't be blank"]
+        end
+
+        it 'should require a unique name' do
+            heading = FactoryGirl.create(:public_body_heading)
+            new_heading = PublicBodyHeading.new(:name => heading.name)
+            new_heading.should_not be_valid
+            new_heading.errors[:name].should == ["Name is already taken"]
+        end
+
+        it 'should set a default display order based on the next available display order' do
+            heading = PublicBodyHeading.new
+            heading.valid?
+            heading.display_order.should == PublicBodyHeading.next_display_order
+        end
+    end
+
+    context 'when setting a display order' do
+
+        it 'should return 0 if there are no public body headings' do
+            PublicBodyHeading.next_display_order.should == 0
+        end
+
+        it 'should return one more than the highest display order if there are public body headings' do
+            heading = FactoryGirl.create(:public_body_heading)
+            PublicBodyHeading.next_display_order.should == 1
+        end
+    end
+end