jro_apps/redmine Commit - r4596:6188b9eddba7

Merged r4710 and r4714 from trunk....

Toshi MARUYAMA -

r4596:6188b9eddba7

parent child

Context file:

r4596:6188b9eddba7

Collapse all files

app/controllers/repositories_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2009  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 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
               menu_item :repository
               menu_item :settings, :only => :edit
               default_search_scope :changesets
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project if @repository
                 end
                 if request.post? && @repository
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) do |page|
                   page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'
                   if @repository && !@project.repository
                     @project.reload #needed to reload association
                     page.replace_html "main-menu", render_main_menu(@project)
                   end
                 end
               end
               def committers
                 @committers = @repository.committers
                 @users = @project.users
                 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
                 @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
                 @users.compact!
                 @users.sort!
                 if request.post? && params[:committers].is_a?(Hash)
                   # Build a hash with repository usernames as keys and corresponding user ids as values
                   @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'committers', :id => @project
                 end
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   (show_error_not_found; return) unless @entries
                   @changesets = @repository.latest_changesets(@path, @rev)
                   @properties = @repository.properties(@path, @rev)
                   render :action => 'show'
                 end
               end
               alias_method :browse, :show
               def changes
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
                 @properties = @repository.properties(@path, @rev)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
             								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset,
                         :include => [:user, :repository])
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 # If the entry is a dir, show the browser
                 (show; return) if @entry.is_dir?
                 @content = @repository.cat(@path, @rev)
                 (show_error_not_found; return) unless @content
                 if 'raw' == params[:format] || @content.is_binary_data? || (@entry.size && @entry.size > Setting.file_max_size_displayed.to_i.kilobyte)
                   # Force the download
                   send_data @content, :filename => @path.split('/').last
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   @content.gsub!("\r\n", "\n")
                end
               end
               def annotate
                 @entry = @repository.entry(@path, @rev)
                 (show_error_not_found; return) unless @entry
                 @annotate = @repository.scm.annotate(@path, @rev)
                 (render_error l(:error_scm_annotate); return) if @annotate.nil? || @annotate.empty?
               end
               def revision
                 raise ChangesetNotFound if @rev.nil? || @rev.empty?
                 @changeset = @repository.find_changeset_by_name(@rev)
                 raise ChangesetNotFound unless @changeset
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               rescue ChangesetNotFound
                 show_error_not_found
               end
               def diff
                 if params[:format] == 'diff'
                   @diff = @repository.diff(@path, @rev, @rev_to)
                   (show_error_not_found; return) unless @diff
                   filename = "changeset_r#{@rev}"
                   filename << "_r#{@rev_to}" if @rev_to
                   send_data @diff.join, :filename => "#{filename}.diff",
                                         :type => 'text/x-patch',
                                         :disposition => 'attachment'
                 else
                   @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                   @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                   # Save diff type as user preference
                   if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                     User.current.pref[:diff_type] = @diff_type
                     User.current.preference.save
                   end
                   @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                   unless read_fragment(@cache_key)
                     @diff = @repository.diff(@path, @rev, @rev_to)
                     show_error_not_found unless @diff
                   end
                   @changeset = @repository.find_changeset_by_name(@rev)
                   @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
                 end
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
               private
               REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 (render_404; return false) unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
                 @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].strip
                 @rev_to = params[:rev_to]
                 unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
                   if @repository.branches.blank?
                     raise InvalidRevisionParam
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue InvalidRevisionParam
                 show_error_not_found
               end
               def show_error_not_found
-                render_error l(:error_scm_not_found)
+                render_error :message => l(:error_scm_not_found), :status => 404
               end
               # Handler for Redmine::Scm::Adapters::CommandFailed exception
               def show_error_command_failed(exception)
                 render_error l(:error_scm_command_failed, exception.message)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
 .times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 800,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 # Remove email adress in usernames
                 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 400,
                   :width => 800,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

test/functional/repositories_git_controller_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  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 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesGitControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @repository = Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 9, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'}
                 end
                 def test_browse_branch
                   get :show, :id => 3, :rev => 'test_branch'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :show, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :show, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /11/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => 3, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   @repository.fetch_changesets
                   @repository.reload
                   # Full diff of changeset 2f9c0091
                   get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => /22/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /def remove/ }
                   assert_tag :tag => 'h2', :content => /2f9c0091/
                 end
                 def test_diff_two_revs
                   @repository.fetch_changesets
                   @repository.reload
                   get :diff, :id => 3, :rev    => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                                        :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   diff = assigns(:diff)
                   assert_not_nil diff
                   assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, changeset 2f9c0091
                   assert_tag :tag => 'th', :content => /24/,
                              :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
                 def test_annotate_binary_file
                   get :annotate, :id => 3, :path => ['images', 'edit.png']
                   assert_response 500
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /can not be annotated/
                 end
                 def test_revision
                   @repository.fetch_changesets
                   @repository.reload
                   ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
                     get :revision, :id => 3, :rev => r
                     assert_response :success
                     assert_template 'revision'
                   end
                 end
                 def test_empty_revision
                   @repository.fetch_changesets
                   @repository.reload
                   ['', ' ', nil].each do |r|
                     get :revision, :id => 1, :rev => r
-                    assert_response 500
+                    assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_mercurial_controller_test.rb +13 -2

             # redMine - project management software
             # Copyright (C) 2006-2008  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 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesMercurialControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
-                Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_show_root
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images'  && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README'  && e.kind == 'file'}
                 end
                 def test_show_directory
                   get :show, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_show_at_given_revision
                   get :show, :id => 3, :path => ['images'], :rev => 0
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                 end
                 def test_show_directory_sql_escape_percent
                   get :show, :id => 3, :path => ['sql_escape', 'percent%dir'], :rev => 13
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['percent%file1.txt', 'percentfile1.txt'], assigns(:entries).collect(&:name)
                   changesets = assigns(:changesets)
                   ## This is not yet implemented.
                   # assert_not_nil changesets
                   # assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 10
                   assert_tag :tag => 'th',
                              :content => '10',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => 3, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   # Full diff of changeset 4
                   get :diff, :id => 3, :rev => 4
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => '22',
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /def remove/ }
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, revision 4:def6d2f1254a
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '4' }
                                      # :child => { :tag => 'a', :content => /4:def6d2f1/ }
                                    }
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
+                def test_empty_revision
+                  @repository.fetch_changesets
+                  @repository.reload
+                  ['', ' ', nil].each do |r|
+                    get :revision, :id => 3, :rev => r
+                    assert_response 404
+                    assert_error_tag :content => /was not found/
+                  end
+                end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_subversion_controller_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2008  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 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesSubversionControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.default_language = 'en'
                 User.current = nil
               end
               if repository_configured?('subversion')
                 def test_show
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_equal 'dir', entry.kind
                 end
                 def test_browse_directory
                   get :show, :id => 1, :path => ['subversion_test']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['[folder_with_brackets]', 'folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
                   assert_equal 'file', entry.kind
                   assert_equal 'subversion_test/helloworld.c', entry.path
                   assert_tag :a, :content => 'helloworld.c', :attributes => { :class => /text\-x\-c/ }
                 end
                 def test_browse_at_given_revision
                   get :show, :id => 1, :path => ['subversion_test'], :rev => 4
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                 end
                 def test_file_changes
                   get :changes, :id => 1, :path => ['subversion_test', 'folder', 'helloworld.rb' ]
                   assert_response :success
                   assert_template 'changes'
                   changesets = assigns(:changesets)
                   assert_not_nil changesets
                   assert_equal %w(6 3 2), changesets.collect(&:revision)
                   # svn properties displayed with svn >= 1.5 only
                   if Redmine::Scm::Adapters::SubversionAdapter.client_version_above?([1, 5, 0])
                     assert_not_nil assigns(:properties)
                     assert_equal 'native', assigns(:properties)['svn:eol-style']
                     assert_tag :ul,
                                :child => { :tag => 'li',
                                            :child => { :tag => 'b', :content => 'svn:eol-style' },
                                            :child => { :tag => 'span', :content => 'native' } }
                   end
                 end
                 def test_directory_changes
                   get :changes, :id => 1, :path => ['subversion_test', 'folder' ]
                   assert_response :success
                   assert_template 'changes'
                   changesets = assigns(:changesets)
                   assert_not_nil changesets
                   assert_equal %w(10 9 7 6 5 2), changesets.collect(&:revision)
                 end
                 def test_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_should_send_if_too_big
                   # no files in the test repo is larger than 1KB...
                   with_settings :file_max_size_displayed => 0 do
                     get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                     assert_response :success
                     assert_template ''
                     assert_equal 'attachment; filename="helloworld.c"', @response.headers['Content-Disposition']
                   end
                 end
                 def test_entry_at_given_revision
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.rb'], :rev => 2
                   assert_response :success
                   assert_template 'entry'
                   # this line was removed in r3 and file was moved in r6
                   assert_tag :tag => 'td', :attributes => { :class => /line-code/},
                                            :content => /Here's the code/
                 end
                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'
                   assert_response :success
                   assert_template ''
                   assert_equal 'attachment; filename="helloworld.c"', @response.headers['Content-Disposition']
                 end
                 def test_directory_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'folder']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'folder', assigns(:entry).name
                 end
                 def test_revision
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
                                                      :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/test/some/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
                                                                     :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/test/some/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_invalid_revision
                   get :revision, :id => 1, :rev => 'something_weird'
-                  assert_response 500
+                  assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_empty_revision
                   ['', ' ', nil].each do |r|
                     get :revision, :id => 1, :rev => r
-                    assert_response 500
+                    assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 def test_revision_with_repository_pointing_to_a_subdirectory
                   r = Project.find(1).repository
                   # Changes repository url to a subdirectory
                   r.update_attribute :url, (r.url + '/test/some')
                   get :revision, :id => 1, :rev => 2
                   assert_response :success
                   assert_template 'revision'
                   assert_tag :tag => 'ul',
                              :child => { :tag => 'li',
                                          # link to the entry at rev 2
                                          :child => { :tag => 'a',
                                                      :attributes => {:href => '/projects/ecookbook/repository/revisions/2/entry/path/in/the/repo'},
                                                      :content => 'repo',
                                                      # link to partial diff
                                                      :sibling =>  { :tag => 'a',
                                                                     :attributes => { :href => '/projects/ecookbook/repository/revisions/2/diff/path/in/the/repo' }
                                                                    }
                                                     }
                                         }
                 end
                 def test_revision_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                   assert_tag :tag => 'h2', :content => /3/
                 end
                 def test_directory_diff
                   get :diff, :id => 1, :rev => 6, :rev_to => 2, :path => ['subversion_test', 'folder']
                   assert_response :success
                   assert_template 'diff'
                   diff = assigns(:diff)
                   assert_not_nil diff
                   # 2 files modified
                   assert_equal 2, Redmine::UnifiedDiff.new(diff).size
                   assert_tag :tag => 'h2', :content => /2:6/
                 end
                 def test_annotate
                   get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'annotate'
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true 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