jro_apps/redmine Commit - r1802:c77d9712ca9e

Fixes functional tests....

Jean-Philippe Lang -

r1802:c77d9712ca9e

parent child

Context file:

r1802:c77d9712ca9e

Collapse all files

app/controllers/sys_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # 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.
             class SysController < ActionController::Base
               wsdl_service_name 'Sys'
               web_service_api SysApi
               web_service_scaffold :invoke
               before_invocation :check_enabled
               # Returns the projects list, with their repositories
               def projects_with_repository_enabled
-                Project.repository_enabled(:all, :include => :repository)
+                Project.repository_enabled(:all, :include => :repository, :order => 'identifier')
               end
               # Registers a repository for the given project identifier
               # (Subversion specific)
               def repository_created(identifier, url)
                 project = Project.find_by_identifier(identifier)
                 # Do not create the repository if the project has already one
                 return 0 unless project && project.repository.nil?
                 logger.debug "Repository for #{project.name} was created"
                 repository = Repository.factory('Subversion', :project => project, :url => url)
                 repository.save
                 repository.id || 0
               end
             protected
               def check_enabled(name, args)
                 Setting.sys_api_enabled?
               end
             end

test/functional/sys_api_test.rb +22 -5

             require File.dirname(__FILE__) + '/../test_helper'
             require 'sys_controller'
             # Re-raise errors caught by the controller.
             class SysController; def rescue_action(e) raise e end; end
             class SysControllerTest < Test::Unit::TestCase
-              fixtures :projects, :repositories
+              fixtures :projects, :enabled_modules, :repositories
               def setup
                 @controller = SysController.new
                 @request = ActionController::TestRequest.new
                 @response = ActionController::TestResponse.new
                 # Enable WS
                 Setting.sys_api_enabled = 1
               end
-              def test_projects
+              def test_projects_with_repository_enabled
-                result = invoke :projects
+                result = invoke :projects_with_repository_enabled
-                assert_equal Project.count, result.size
+                assert_equal EnabledModule.count(:all, :conditions => {:name => 'repository'}), result.size
-                assert result.first.is_a?(Project)
+                project = result.first
+                assert project.is_a?(AWSProjectWithRepository)
+                assert project.respond_to?(:id)
+                assert_equal 1, project.id
+                assert project.respond_to?(:identifier)
+                assert_equal 'ecookbook', project.identifier
+                assert project.respond_to?(:name)
+                assert_equal 'eCookbook', project.name
+                assert project.respond_to?(:is_public)
+                assert project.is_public
+                assert project.respond_to?(:repository)
+                assert project.repository.is_a?(Repository)
               end
               def test_repository_created
                 project = Project.find(3)
                 assert_nil project.repository
                 assert invoke(:repository_created, project.identifier, 'http://localhost/svn')
                 project.reload
                 assert_not_nil project.repository
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages