From 952d69c00ae22b22e9eb8f0210d2c61a4ba65b16 2015-06-28 10:00:53
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2015-06-28 10:00:53
Subject: [PATCH] Merged r14380 (#20066).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14385 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/models/group.rb b/app/models/group.rb
index 279e145..8c68330 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -32,7 +32,7 @@ class Group < Principal
 
   before_destroy :remove_references_before_destroy
 
-  scope :sorted, lambda { order(:type => :asc, :lastname => :desc) }
+  scope :sorted, lambda { order(:type => :asc, :lastname => :asc) }
   scope :named, lambda {|arg| where("LOWER(#{table_name}.lastname) = LOWER(?)", arg.to_s.strip)}
   scope :givable, lambda {where(:type => 'Group')}
 
diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb
index 703c423..9383cc7 100644
--- a/test/unit/group_test.rb
+++ b/test/unit/group_test.rb
@@ -158,4 +158,12 @@ class GroupTest < ActiveSupport::TestCase
     end
     assert_equal 0, group.reload.users.count
   end
+
+  def test_sorted_scope_should_sort_groups_alphabetically
+    Group.delete_all
+    b = Group.generate!(:name => 'B')
+    a = Group.generate!(:name => 'A')
+
+    assert_equal %w(A B), Group.sorted.to_a.map(&:name)
+  end
 end