##// END OF EJS Templates
jro_apps » redmine
RSS
route: scm: fix diff of two revisions...
Toshi MARUYAMA -
r9445:6bcbdd44fce3
parent child
Show More
Side by Side Unified
Context file:
r9445:6bcbdd44fce3 Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,33
1 require File.expand_path('../../test_helper', __FILE__)
2
3 class RepositoriesGitTest < ActionController::IntegrationTest
4 fixtures :projects, :users, :roles, :members, :member_roles,
5 :repositories, :enabled_modules
6
7 REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
8 REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
9 PRJ_ID = 3
10
11 def setup
12 User.current = nil
13 @project = Project.find(PRJ_ID)
14 @repository = Repository::Git.create(
15 :project => @project,
16 :url => REPOSITORY_PATH,
17 :path_encoding => 'ISO-8859-1'
18 )
19 assert @repository
20 end
21
22 if File.directory?(REPOSITORY_PATH)
23 def test_index
24 get '/projects/subproject1/repository/'
25 assert_response :success
26 end
27
28 def test_diff_two_revs
29 get '/projects/subproject1/repository/diff?rev=61b685fbe&rev_to=2f9c0091'
30 assert_response :success
31 end
32 end
33 end
Show file before | Show file after | Hide comments
@@ -1,334 +1,334
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 RedmineApp::Application.routes.draw do
19 19 root :to => 'welcome#index', :as => 'home'
20 20
21 21 match 'login', :to => 'account#login', :as => 'signin'
22 22 match 'logout', :to => 'account#logout', :as => 'signout'
23 23 match 'account/register', :to => 'account#register', :via => [:get, :post]
24 24 match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post]
25 25 match 'account/activate', :to => 'account#activate', :via => :get
26 26
27 27 match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news'
28 28 match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue'
29 29 match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue'
30 30 match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue'
31 31
32 32 match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
33 33 match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
34 34
35 35 match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post]
36 36 get 'boards/:board_id/topics/:id', :to => 'messages#show'
37 37 match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
38 38 get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
39 39
40 40 post 'boards/:board_id/topics/preview', :to => 'messages#preview'
41 41 post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
42 42 post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
43 43 post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
44 44
45 45 # Misc issue routes. TODO: move into resources
46 46 match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
47 47 match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu'
48 48 match '/issues/changes', :to => 'journals#index', :as => 'issue_changes'
49 49 match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
50 50
51 51 match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
52 52 match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
53 53
54 54 match '/projects/:project_id/issues/gantt', :to => 'gantts#show'
55 55 match '/issues/gantt', :to => 'gantts#show'
56 56
57 57 match '/projects/:project_id/issues/calendar', :to => 'calendars#show'
58 58 match '/issues/calendar', :to => 'calendars#show'
59 59
60 60 match 'projects/:id/issues/report', :to => 'reports#issue_report', :via => :get
61 61 match 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :via => :get
62 62
63 63 match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
64 64 match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
65 65 match 'my/page', :controller => 'my', :action => 'page', :via => :get
66 66 match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
67 67 match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
68 68 match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
69 69 match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
70 70 match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
71 71 match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
72 72 match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
73 73 match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
74 74
75 75 resources :users
76 76 match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
77 77 match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
78 78 match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
79 79
80 80 match 'watchers/new', :controller=> 'watchers', :action => 'new', :via => :get
81 81 match 'watchers', :controller=> 'watchers', :action => 'create', :via => :post
82 82 match 'watchers/append', :controller=> 'watchers', :action => 'append', :via => :post
83 83 match 'watchers/destroy', :controller=> 'watchers', :action => 'destroy', :via => :post
84 84 match 'watchers/watch', :controller=> 'watchers', :action => 'watch', :via => :post
85 85 match 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch', :via => :post
86 86 match 'watchers/autocomplete_for_user', :controller=> 'watchers', :action => 'autocomplete_for_user', :via => :get
87 87
88 88 match 'projects/:id/settings/:tab', :to => "projects#settings"
89 89
90 90 resources :projects do
91 91 member do
92 92 get 'settings'
93 93 post 'modules'
94 94 post 'archive'
95 95 post 'unarchive'
96 96 match 'copy', :via => [:get, :post]
97 97 end
98 98
99 99 resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :create, :update, :destroy] do
100 100 collection do
101 101 get 'autocomplete'
102 102 end
103 103 end
104 104
105 105 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
106 106
107 107 match 'issues/:copy_from/copy', :to => 'issues#new'
108 108 resources :issues, :only => [:index, :new, :create] do
109 109 resources :time_entries, :controller => 'timelog' do
110 110 collection do
111 111 get 'report'
112 112 end
113 113 end
114 114 end
115 115 # issue form update
116 116 match 'issues/new', :controller => 'issues', :action => 'new', :via => [:put, :post], :as => 'issue_form'
117 117
118 118 resources :files, :only => [:index, :new, :create]
119 119
120 120 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
121 121 collection do
122 122 put 'close_completed'
123 123 end
124 124 end
125 125 match 'versions.:format', :to => 'versions#index'
126 126 match 'roadmap', :to => 'versions#index', :format => false
127 127 match 'versions', :to => 'versions#index'
128 128
129 129 resources :news, :except => [:show, :edit, :update, :destroy]
130 130 resources :time_entries, :controller => 'timelog' do
131 131 get 'report', :on => :collection
132 132 end
133 133 resources :queries, :only => [:new, :create]
134 134 resources :issue_categories, :shallow => true
135 135 resources :documents, :except => [:show, :edit, :update, :destroy]
136 136 resources :boards
137 137 resources :repositories, :shallow => true, :except => [:index, :show] do
138 138 member do
139 139 match 'committers', :via => [:get, :post]
140 140 end
141 141 end
142 142
143 143 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
144 144 match 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
145 145 match 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff'
146 146 resources :wiki, :except => [:index, :new, :create] do
147 147 member do
148 148 get 'rename'
149 149 post 'rename'
150 150 get 'history'
151 151 get 'diff'
152 152 match 'preview', :via => [:post, :put]
153 153 post 'protect'
154 154 post 'add_attachment'
155 155 end
156 156 collection do
157 157 get 'export'
158 158 get 'date_index'
159 159 end
160 160 end
161 161 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
162 162 match 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
163 163 end
164 164
165 165 resources :issues do
166 166 collection do
167 167 match 'bulk_edit', :via => [:get, :post]
168 168 post 'bulk_update'
169 169 end
170 170 resources :time_entries, :controller => 'timelog' do
171 171 collection do
172 172 get 'report'
173 173 end
174 174 end
175 175 resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
176 176 end
177 177 match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
178 178
179 179 resources :queries, :except => [:show]
180 180
181 181 resources :news, :only => [:index, :show, :edit, :update, :destroy]
182 182 match '/news/:id/comments', :to => 'comments#create', :via => :post
183 183 match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
184 184
185 185 resources :versions, :only => [:show, :edit, :update, :destroy] do
186 186 post 'status_by', :on => :member
187 187 end
188 188
189 189 resources :documents, :only => [:show, :edit, :update, :destroy] do
190 190 post 'add_attachment', :on => :member
191 191 end
192 192
193 193 match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu
194 194
195 195 resources :time_entries, :controller => 'timelog', :except => :destroy do
196 196 collection do
197 197 get 'report'
198 198 get 'bulk_edit'
199 199 post 'bulk_update'
200 200 end
201 201 end
202 202 match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
203 203 # TODO: delete /time_entries for bulk deletion
204 204 match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
205 205
206 206 # TODO: port to be part of the resources route(s)
207 207 match 'projects/:id/settings/:tab', :to => 'projects#settings', :via => :get
208 208
209 209 get 'projects/:id/activity', :to => 'activities#index'
210 210 get 'projects/:id/activity.:format', :to => 'activities#index'
211 211 get 'activity', :to => 'activities#index'
212 212
213 213 # repositories routes
214 214 get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
215 215 get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
216 216
217 217 get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
218 218 :to => 'repositories#changes'
219 219
220 220 get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
221 221 get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
222 222 post 'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
223 223 delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
224 224 get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
225 225 get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
226 226 :controller => 'repositories',
227 227 :constraints => {
228 228 :action => /(browse|show|entry|raw|annotate|diff)/,
229 229 :rev => /[a-z0-9\.\-_]+/
230 230 }
231 231
232 232 get 'projects/:id/repository/statistics', :to => 'repositories#stats'
233 233 get 'projects/:id/repository/graph', :to => 'repositories#graph'
234 234
235 235 get 'projects/:id/repository/changes(/*path(.:ext))',
236 236 :to => 'repositories#changes'
237 237
238 238 get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
239 239 get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
240 240 get 'projects/:id/repository/revision', :to => 'repositories#revision'
241 241 post 'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
242 242 delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
243 243 get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
244 244 :controller => 'repositories',
245 245 :constraints => {
246 246 :action => /(browse|show|entry|raw|annotate|diff)/,
247 247 :rev => /[a-z0-9\.\-_]+/
248 248 }
249 249 get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
250 250 :controller => 'repositories',
251 251 :action => /(browse|show|entry|raw|changes|annotate|diff)/
252 get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
253
254 252 get 'projects/:id/repository/:action(/*path(.:ext))',
255 253 :controller => 'repositories',
256 254 :action => /(browse|show|entry|raw|changes|annotate|diff)/
255
256 get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
257 257 get 'projects/:id/repository', :to => 'repositories#show', :path => nil
258 258
259 259 # additional routes for having the file name at the end of url
260 260 match 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/, :via => :get
261 261 match 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/, :via => :get
262 262 match 'attachments/download/:id', :controller => 'attachments', :action => 'download', :id => /\d+/, :via => :get
263 263 resources :attachments, :only => [:show, :destroy]
264 264
265 265 resources :groups do
266 266 member do
267 267 get 'autocomplete_for_user'
268 268 end
269 269 end
270 270
271 271 match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
272 272 match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
273 273 match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
274 274 match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
275 275
276 276 resources :trackers, :except => :show
277 277 resources :issue_statuses, :except => :show do
278 278 collection do
279 279 post 'update_issue_done_ratio'
280 280 end
281 281 end
282 282 resources :custom_fields, :except => :show
283 283 resources :roles, :except => :show do
284 284 collection do
285 285 match 'permissions', :via => [:get, :post]
286 286 end
287 287 end
288 288 resources :enumerations, :except => :show
289 289
290 290 get 'projects/:id/search', :controller => 'search', :action => 'index'
291 291 get 'search', :controller => 'search', :action => 'index'
292 292
293 293 match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
294 294
295 295 match 'admin', :controller => 'admin', :action => 'index', :via => :get
296 296 match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
297 297 match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
298 298 match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
299 299 match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
300 300 match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
301 301
302 302 resources :auth_sources do
303 303 member do
304 304 get 'test_connection'
305 305 end
306 306 end
307 307
308 308 match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
309 309 match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
310 310 match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
311 311 match 'settings', :controller => 'settings', :action => 'index', :via => :get
312 312 match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
313 313 match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post]
314 314
315 315 match 'sys/projects', :to => 'sys#projects', :via => :get
316 316 match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
317 317 match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
318 318
319 319 match 'uploads', :to => 'attachments#upload', :via => :post
320 320
321 321 get 'robots.txt', :to => 'welcome#robots'
322 322
323 323 Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
324 324 file = File.join(plugin_dir, "config/routes.rb")
325 325 if File.exists?(file)
326 326 begin
327 327 instance_eval File.read(file)
328 328 rescue Exception => e
329 329 puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
330 330 exit 1
331 331 end
332 332 end
333 333 end
334 334 end
General Comments 0
You need to be logged in to leave comments. Login now