Merge pull request #1640 from dlondero/issue-1640

Sort `CM_Paging_Language_Enabled` by name
cargomedia · Feb 16, 2015 · f272e7d · f272e7d
2 parents 96bd652 + 82730c7
commit f272e7d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/library/CM/Paging/Language/Enabled.php b/library/CM/Paging/Language/Enabled.php
@@ -3,7 +3,7 @@
 class CM_Paging_Language_Enabled extends CM_Paging_Language_Abstract {
 
     public function __construct() {
-        $source = new CM_PagingSource_Sql('id, abbreviation', 'cm_model_language', 'enabled = 1');
+        $source = new CM_PagingSource_Sql('id, abbreviation', 'cm_model_language', 'enabled = 1', 'name ASC');
         $source->enableCacheLocal();
         parent::__construct($source);
     }

diff --git a/tests/library/CM/Paging/Language/EnabledTest.php b/tests/library/CM/Paging/Language/EnabledTest.php
@@ -0,0 +1,20 @@
+<?php
+
+class CM_Paging_Language_EnabledTest extends CMTest_TestCase {
+
+    public function tearDown() {
+        CMTest_TH::clearEnv();
+    }
+
+    public function testEnabled() {
+        $english = CM_Model_Language::create('English', 'en', true);
+        $italian = CM_Model_Language::create('Italian', 'it', true);
+        $german = CM_Model_Language::create('German', 'de', true);
+        $french = CM_Model_Language::create('French', 'fr', true);
+        $svenska = CM_Model_Language::create('Svenska', 'sv', false);
+
+        $paging = new CM_Paging_Language_Enabled();
+        $this->assertEquals([$english, $french, $german, $italian], $paging->getItems());
+        $this->assertNotContains($svenska, $paging->getItems());
+    }
+}