Merge pull request #1983 from opf/fix/13133_version_filter_sorting

Sort target versions in work package query filter

app/assets/javascripts/angular/services/version-service.js

@@ -46,7 +46,7 @@ angular.module('openproject.services')
     doQuery: function(url, params) {
       return $http.get(url, { params: params })
         .then(function(response){
-          return response.data.versions;
+          return _.sortBy(response.data.versions, 'name');
         });
     }
   };

karma.conf.js

@@ -21,6 +21,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       "vendor/assets/components/jquery/dist/jquery.js",
+      "vendor/assets/components/lodash/dist/lodash.js",
       "vendor/assets/components/angular/angular.js",
       "vendor/assets/components/angular-mocks/angular-mocks.js",
       "vendor/assets/components/angular-ui-router/release/angular-ui-router.js",

karma/tests/services/version-service-test.js

@@ -0,0 +1,72 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+/*jshint expr: true*/
+
+describe('VersionService', function() {
+
+  var VersionService, $httpBackend;
+  beforeEach(module('openproject.services'));
+
+  beforeEach(inject(function(_$httpBackend_, _VersionService_){
+    $httpBackend   = _$httpBackend_;
+    VersionService = _VersionService_;
+  }));
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+
+  describe('getVersions', function() {
+
+    var versions = [
+      {id: 1, name: 'b version'},
+      {id: 2, name: 'a version'}
+    ];
+
+    beforeEach(function() {
+      $httpBackend.when('GET', '/api/experimental/projects/aProject/versions')
+        .respond({ versions: versions });
+    });
+
+    it('loads the versions sorted by their name', function() {
+      $httpBackend.expectGET('/api/experimental/projects/aProject/versions');
+
+      var callback = sinon.spy(),
+          requested_versions = VersionService.getVersions('aProject').then(callback);
+
+      $httpBackend.flush();
+      expect(callback).to.have.been.calledWith(sinon.match([
+        {id: 2, name: 'a version'},
+        {id: 1, name: 'b version'}
+      ]));
+    });
+
+  });
+});