Extract Organisation#not_closed scope

app/helpers/role_organisations_helper.rb

@@ -1,6 +1,6 @@
 module RoleOrganisationsHelper
   def options_for_your_organisation_select(current_user)
-    organisations = Pundit.policy_scope(current_user, Organisation).where(closed: false).order(:name)
+    organisations = Pundit.policy_scope(current_user, Organisation).not_closed.order(:name)
 
     organisations.map do |organisation|
       { text: organisation.name_with_abbreviation,

app/models/organisation.rb

@@ -12,6 +12,8 @@ class Organisation < ApplicationRecord
 
   before_save :strip_whitespace_from_name
 
+  scope :not_closed, -> { where(closed: false) }
+
   def name_with_abbreviation
     return_value = if abbreviation.present? && abbreviation != name
                      "#{name} – #{abbreviation}"

test/models/organisation_test.rb

@@ -23,6 +23,12 @@ def setup
     assert_equal "An organisation", organisation.name
   end
 
+  test "#not_closed" do
+    create(:organisation, closed: true)
+
+    assert_equal [@organisation], Organisation.not_closed.to_a
+  end
+
   context "displaying name with abbreviation" do
     should "use abbreviation when it is not the same as name" do
       organisation = build(:organisation, name: "An Organisation", abbreviation: "ABBR")