##// END OF EJS Templates
Can not use Project#find on scopes with Rails 3.1....
Jean-Philippe Lang -
r8881:cf9154f924ff
parent child
Show More
@@ -48,10 +48,18 class SysController < ActionController::Base
48
48
49 def fetch_changesets
49 def fetch_changesets
50 projects = []
50 projects = []
51 scope = Project.active.has_module(:repository)
51 if params[:id]
52 if params[:id]
52 projects << Project.active.has_module(:repository).find(params[:id])
53 project = nil
54 if params[:id].to_s =~ /^\d*$/
55 project = scope.find(params[:id])
56 else
57 project = scope.find_by_identifier(params[:id])
58 end
59 raise ActiveRecord::RecordNotFound unless project
60 projects << project
53 else
61 else
54 projects = Project.active.has_module(:repository).all
62 projects = scope.all
55 end
63 end
56 projects.each do |project|
64 projects.each do |project|
57 project.repositories.each do |repository|
65 project.repositories.each do |repository|
@@ -89,12 +89,18 class SysControllerTest < ActionController::TestCase
89 assert_response :success
89 assert_response :success
90 end
90 end
91
91
92 def test_fetch_changesets_one_project
92 def test_fetch_changesets_one_project_by_identifier
93 Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
93 Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
94 get :fetch_changesets, :id => 'ecookbook'
94 get :fetch_changesets, :id => 'ecookbook'
95 assert_response :success
95 assert_response :success
96 end
96 end
97
97
98 def test_fetch_changesets_one_project_by_id
99 Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
100 get :fetch_changesets, :id => '1'
101 assert_response :success
102 end
103
98 def test_fetch_changesets_unknown_project
104 def test_fetch_changesets_unknown_project
99 get :fetch_changesets, :id => 'unknown'
105 get :fetch_changesets, :id => 'unknown'
100 assert_response 404
106 assert_response 404
General Comments 0
You need to be logged in to leave comments. Login now