Properly implement the top minsterial role.

We can use whether or not they attempt cabinet to measure their 'seniority'.
leereilly · Feb 2, 2012 · 10e6760 · 10e6760
1 parent 1d98495
commit 10e6760
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
@@ -72,7 +72,7 @@ def search_link
   end
 
   def top_ministerial_role
-    ministerial_roles.first
+    ministerial_roles.order(MinisterialRole.arel_table[:cabinet_member].desc).first
   end
 
   private

diff --git a/test/unit/organisation_test.rb b/test/unit/organisation_test.rb
@@ -58,9 +58,16 @@ class OrganisationTest < ActiveSupport::TestCase
     assert_equal [], organisation.ministerial_roles
   end
 
-  test "#top_ministerial_role returns a ministerial role" do
+  test "#top_ministerial_role returns a ministerial role which attends cabinet" do
     minister = create(:ministerial_role)
-    other_minister = create(:ministerial_role)
+    other_minister = create(:ministerial_role, cabinet_member: true)
+    organisation = create(:organisation, roles:  [minister, other_minister])
+    assert_equal other_minister, organisation.top_ministerial_role
+  end
+
+  test "#top_ministerial_role returns first ministerial role if none attends cabinet" do
+    minister = create(:ministerial_role, cabinet_member: false)
+    other_minister = create(:ministerial_role, cabinet_member: false)
     organisation = create(:organisation, roles:  [minister, other_minister])
     assert_equal minister, organisation.top_ministerial_role
   end