jro_apps/redmine Commit - r8881:cf9154f924ff

Can not use Project#find on scopes with Rails 3.1....

Jean-Philippe Lang -

r8881:cf9154f924ff

parent child

Context file:

r8881:cf9154f924ff

Collapse all files

app/controllers/sys_controller.rb +10 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  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
               before_filter :check_enabled
               def projects
                 p = Project.active.has_module(:repository).find(
                                :all,
                                :include => :repository,
                                :order => "#{Project.table_name}.identifier"
                              )
                 # extra_info attribute from repository breaks activeresource client
                 render :xml => p.to_xml(
                                    :only => [:id, :identifier, :name, :is_public, :status],
                                    :include => {:repository => {:only => [:id, :url]}}
                                  )
               end
               def create_project_repository
                 project = Project.find(params[:id])
                 if project.repository
                   render :nothing => true, :status => 409
                 else
                   logger.info "Repository for #{project.name} was reported to be created by #{request.remote_ip}."
                   project.repository = Repository.factory(params[:vendor], params[:repository])
                   if project.repository && project.repository.save
                     render :xml => {project.repository.class.name.underscore.gsub('/', '-') => {:id => project.repository.id, :url => project.repository.url}}, :status => 201
                   else
                     render :nothing => true, :status => 422
                   end
                 end
               end
               def fetch_changesets
                 projects = []
+                scope = Project.active.has_module(:repository)
                 if params[:id]
-                  projects << Project.active.has_module(:repository).find(params[:id])
+                  project = nil
+                  if params[:id].to_s =~ /^\d*$/
+                    project = scope.find(params[:id])
+                  else
+                    project = scope.find_by_identifier(params[:id])
+                  end
+                  raise ActiveRecord::RecordNotFound unless project
+                  projects << project
                 else
-                  projects = Project.active.has_module(:repository).all
+                  projects = scope.all
                 end
                 projects.each do |project|
                   project.repositories.each do |repository|
                     repository.fetch_changesets
                   end
                 end
                 render :nothing => true, :status => 200
               rescue ActiveRecord::RecordNotFound
                 render :nothing => true, :status => 404
               end
               protected
               def check_enabled
                 User.current = nil
                 unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
                   render :text => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
                   return false
                 end
               end
             end

test/functional/sys_controller_test.rb +7 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             require File.expand_path('../../test_helper', __FILE__)
             require 'sys_controller'
             require 'mocha'
             # Re-raise errors caught by the controller.
             class SysController; def rescue_action(e) raise e end; end
             class SysControllerTest < ActionController::TestCase
               fixtures :projects, :repositories, :enabled_modules
               def setup
                 @controller = SysController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.sys_api_enabled = '1'
                 Setting.enabled_scm = %w(Subversion Git)
               end
               def test_projects_with_repository_enabled
                 get :projects
                 assert_response :success
                 assert_equal 'application/xml', @response.content_type
                 with_options :tag => 'projects' do |test|
                   test.assert_tag :children => { :count  => Project.active.has_module(:repository).count }
                   test.assert_tag 'project', :child => {:tag => 'identifier', :sibling => {:tag => 'is-public'}}
                 end
                 assert_no_tag 'extra-info'
                 assert_no_tag 'extra_info'
               end
               def test_create_project_repository
                 assert_nil Project.find(4).repository
                 post :create_project_repository, :id => 4,
                                                  :vendor => 'Subversion',
                                                  :repository => { :url => 'file:///create/project/repository/subproject2'}
                 assert_response :created
                 assert_equal 'application/xml', @response.content_type
                 r = Project.find(4).repository
                 assert r.is_a?(Repository::Subversion)
                 assert_equal 'file:///create/project/repository/subproject2', r.url
                 assert_tag 'repository-subversion',
                   :child => {
                     :tag => 'id', :content => r.id.to_s,
                     :sibling => {:tag => 'url', :content => r.url}
                   }
                 assert_no_tag 'extra-info'
                 assert_no_tag 'extra_info'
               end
               def test_create_already_existing
                 post :create_project_repository, :id => 1,
                   :vendor => 'Subversion',
                   :repository => { :url => 'file:///create/project/repository/subproject2'}
                 assert_response :conflict
               end
               def test_create_with_failure
                 post :create_project_repository, :id => 4,
                   :vendor => 'Subversion',
                   :repository => { :url => 'invalid url'}
                 assert_response :unprocessable_entity
               end
               def test_fetch_changesets
                 Repository::Subversion.any_instance.expects(:fetch_changesets).twice.returns(true)
                 get :fetch_changesets
                 assert_response :success
               end
-              def test_fetch_changesets_one_project
+              def test_fetch_changesets_one_project_by_identifier
                 Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
                 get :fetch_changesets, :id => 'ecookbook'
                 assert_response :success
               end
+              def test_fetch_changesets_one_project_by_id
+                Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
+                get :fetch_changesets, :id => '1'
+                assert_response :success
+              end
               def test_fetch_changesets_unknown_project
                 get :fetch_changesets, :id => 'unknown'
                 assert_response 404
               end
               def test_disabled_ws_should_respond_with_403_error
                 with_settings :sys_api_enabled => '0' do
                   get :projects
                   assert_response 403
                 end
               end
               def test_api_key
                 with_settings :sys_api_key => 'my_secret_key' do
                   get :projects, :key => 'my_secret_key'
                   assert_response :success
                 end
               end
               def test_wrong_key_should_respond_with_403_error
                 with_settings :sys_api_enabled => 'my_secret_key' do
                   get :projects, :key => 'wrong_key'
                   assert_response 403
                 end
               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