jro_apps/redmine Commit - r9922:65524cc1cc63

Don't repeat revision on annotate view....

Jean-Philippe Lang -

r9922:65524cc1cc63

parent child

Context file:

r9922:65524cc1cc63

Collapse all files

app/views/repositories/annotate.html.erb +4 -4

             <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
             <div class="contextual">
               <%= render :partial => 'navigation' %>
             </div>
             <h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
             <%= render :partial => 'link_to_functions' %>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <div class="autoscroll">
             <table class="filecontent annotate syntaxhl">
               <tbody>
-                <% line_num = 1 %>
+                <% line_num = 1; previous_revision = nil %>
                 <% syntax_highlight_lines(@path, Redmine::CodesetUtil.to_utf8_by_setting(@annotate.content)).each do |line| %>
                   <% revision = @annotate.revisions[line_num - 1] %>
                   <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
                     <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
                     <td class="revision">
-                    <%= (revision.identifier ? link_to_revision(revision, @repository) : format_revision(revision)) if revision %></td>
+                    <%= (revision.identifier ? link_to_revision(revision, @repository) : format_revision(revision)) if revision && revision != previous_revision %></td>
-                    <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
+                    <td class="author"><%= h(revision.author.to_s.split('<').first) if revision && revision != previous_revision %></td>
                     <td class="line-code"><pre><%= line.html_safe %></pre></td>
                   </tr>
-                  <% line_num += 1 %>
+                  <% line_num += 1; previous_revision = revision %>
                 <% end %>
               </tbody>
             </table>
             </div>
             <% html_title(l(:button_annotate)) -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag 'scm' %>
             <% end %>

lib/redmine/scm/adapters/abstract_adapter.rb +12 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class CommandFailed < StandardError #:nodoc:
                   end
                   class AbstractAdapter #:nodoc:
                     # raised if scm command exited with error, e.g. unknown revision.
                     class ScmCommandAborted < CommandFailed; end
                     class << self
                       def client_command
                         ""
                       end
                       def shell_quote_command
                         if Redmine::Platform.mswin? && RUBY_PLATFORM == 'java'
                           client_command
                         else
                           shell_quote(client_command)
                         end
                       end
                       # Returns the version of the scm client
                       # Eg: [1, 5, 0] or [] if unknown
                       def client_version
                         []
                       end
                       # Returns the version string of the scm client
                       # Eg: '1.5.0' or 'Unknown version' if unknown
                       def client_version_string
                         v = client_version || 'Unknown version'
                         v.is_a?(Array) ? v.join('.') : v.to_s
                       end
                       # Returns true if the current client version is above
                       # or equals the given one
                       # If option is :unknown is set to true, it will return
                       # true if the client version is unknown
                       def client_version_above?(v, options={})
                         ((client_version <=> v) >= 0) || (client_version.empty? && options[:unknown])
                       end
                       def client_available
                         true
                       end
                       def shell_quote(str)
                         if Redmine::Platform.mswin?
                           '"' + str.gsub(/"/, '\\"') + '"'
                         else
                           "'" + str.gsub(/'/, "'\"'\"'") + "'"
                         end
                       end
                     end
                     def initialize(url, root_url=nil, login=nil, password=nil,
                                    path_encoding=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       @root_url = root_url.blank? ? retrieve_root_url : root_url
                     end
                     def adapter_name
                       'Abstract'
                     end
                     def supports_cat?
                       true
                     end
                     def supports_annotate?
                       respond_to?('annotate')
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     def path_encoding
                       nil
                     end
                     # get info about the svn repository
                     def info
                       return nil
                     end
                     # Returns the entry identified by path and revision identifier
                     # or nil if entry doesn't exist in the repository
                     def entry(path=nil, identifier=nil)
                       parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
                       search_path = parts[0..-2].join('/')
                       search_name = parts[-1]
                       if search_path.blank? && search_name.blank?
                         # Root entry
                         Entry.new(:path => '', :kind => 'dir')
                       else
                         # Search for the entry in the parent directory
                         es = entries(search_path, identifier)
                         es ? es.detect {|e| e.name == search_name} : nil
                       end
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil, options={})
                       return nil
                     end
                     def branches
                       return nil
                     end
                     def tags
                       return nil
                     end
                     def default_branch
                       return nil
                     end
                     def properties(path, identifier=nil)
                       return nil
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       return nil
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       return nil
                     end
                     def cat(path, identifier=nil)
                       return nil
                     end
                     def with_leading_slash(path)
                       path ||= ''
                       (path[0,1]!="/") ? "/#{path}" : path
                     end
                     def with_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path : "#{path}/"
                     end
                     def without_leading_slash(path)
                       path ||= ''
                       path.gsub(%r{^/+}, '')
                     end
                     def without_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path[0..-2] : path
                      end
                     def shell_quote(str)
                       self.class.shell_quote(str)
                     end
                   private
                     def retrieve_root_url
                       info = self.info
                       info ? info.root_url : nil
                     end
                     def target(path, sq=true)
                       path ||= ''
                       base = path.match(/^\//) ? root_url : url
                       str = "#{base}/#{path}".gsub(/[?<>\*]/, '')
                       if sq
                         str = shell_quote(str)
                       end
                       str
                     end
                     def logger
                       self.class.logger
                     end
                     def shellout(cmd, options = {}, &block)
                       self.class.shellout(cmd, options, &block)
                     end
                     def self.logger
                       Rails.logger
                     end
                     def self.shellout(cmd, options = {}, &block)
                       if logger && logger.debug?
                         logger.debug "Shelling out: #{strip_credential(cmd)}"
                       end
                       if Rails.env == 'development'
                         # Capture stderr when running in dev environment
                         cmd = "#{cmd} 2>>#{shell_quote(Rails.root.join('log/scm.stderr.log').to_s)}"
                       end
                       begin
                         mode = "r+"
                         IO.popen(cmd, mode) do |io|
                           io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding)
                           io.close_write unless options[:write_stdin]
                           block.call(io) if block_given?
                         end
                       ## If scm command does not exist,
                       ## Linux JRuby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException
                       ## in production environment.
                       # rescue Errno::ENOENT => e
                       rescue Exception => e
                         msg = strip_credential(e.message)
                         # The command failed, log it and re-raise
                         logmsg = "SCM command failed, "
                         logmsg += "make sure that your SCM command (e.g. svn) is "
                         logmsg += "in PATH (#{ENV['PATH']})\n"
                         logmsg += "You can configure your scm commands in config/configuration.yml.\n"
                         logmsg += "#{strip_credential(cmd)}\n"
                         logmsg += "with: #{msg}"
                         logger.error(logmsg)
                         raise CommandFailed.new(msg)
                       end
                     end
                     # Hides username/password in a given command
                     def self.strip_credential(cmd)
                       q = (Redmine::Platform.mswin? ? '"' : "'")
                       cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
                     end
                     def strip_credential(cmd)
                       self.class.strip_credential(cmd)
                     end
                     def scm_iconv(to, from, str)
                       return nil if str.nil?
                       return str if to == from
                       begin
                         Iconv.conv(to, from, str)
                       rescue Iconv::Failure => err
                         logger.error("failed to convert from #{from} to #{to}. #{err}")
                         nil
                       end
                     end
                     def parse_xml(xml)
                       if RUBY_PLATFORM == 'java'
                         xml = xml.sub(%r{<\?xml[^>]*\?>}, '')
                       end
                       ActiveSupport::XmlMini.parse(xml)
                     end
                   end
                   class Entries < Array
                     def sort_by_name
                       dup.sort! {|x,y|
                         if x.kind == y.kind
                           x.name.to_s <=> y.name.to_s
                         else
                           x.kind <=> y.kind
                         end
                       }
                     end
                     def revisions
                       revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
                     end
                   end
                   class Info
                     attr_accessor :root_url, :lastrev
                     def initialize(attributes={})
                       self.root_url = attributes[:root_url] if attributes[:root_url]
                       self.lastrev = attributes[:lastrev]
                     end
                   end
                   class Entry
                     attr_accessor :name, :path, :kind, :size, :lastrev, :changeset
                     def initialize(attributes={})
                       self.name = attributes[:name] if attributes[:name]
                       self.path = attributes[:path] if attributes[:path]
                       self.kind = attributes[:kind] if attributes[:kind]
                       self.size = attributes[:size].to_i if attributes[:size]
                       self.lastrev = attributes[:lastrev]
                     end
                     def is_file?
                       'file' == self.kind
                     end
                     def is_dir?
                       'dir' == self.kind
                     end
                     def is_text?
                       Redmine::MimeType.is_type?('text', name)
                     end
                     def author
                       if changeset
                         changeset.author.to_s
                       elsif lastrev
                         Redmine::CodesetUtil.replace_invalid_utf8(lastrev.author.to_s.split('<').first)
                       end
                     end
                   end
                   class Revisions < Array
                     def latest
                       sort {|x,y|
                         unless x.time.nil? or y.time.nil?
                           x.time <=> y.time
                         else
                         end
                       }.last
                     end
                   end
                   class Revision
                     attr_accessor :scmid, :name, :author, :time, :message,
                                   :paths, :revision, :branch, :identifier,
                                   :parents
                     def initialize(attributes={})
                       self.identifier = attributes[:identifier]
                       self.scmid      = attributes[:scmid]
                       self.name       = attributes[:name] || self.identifier
                       self.author     = attributes[:author]
                       self.time       = attributes[:time]
                       self.message    = attributes[:message] || ""
                       self.paths      = attributes[:paths]
                       self.revision   = attributes[:revision]
                       self.branch     = attributes[:branch]
                       self.parents    = attributes[:parents]
                     end
                     # Returns the readable identifier.
                     def format_identifier
                       self.identifier.to_s
                     end
+                    def ==(other)
+                      if other.nil?
+                        false
+                      elsif scmid.present?
+                        scmid == other.scmid
+                      elsif identifier.present?
+                        identifier == other.identifier
+                      elsif revision.present?
+                        revision == other.revision
+                      end
+                    end
                   end
                   class Annotate
                     attr_reader :lines, :revisions
                     def initialize
                       @lines = []
                       @revisions = []
                     end
                     def add_line(line, revision)
                       @lines << line
                       @revisions << revision
                     end
                     def content
                       content = lines.join("\n")
                     end
                     def empty?
                       lines.empty?
                     end
                   end
                   class Branch < String
                     attr_accessor :revision, :scmid
                   end
                 end
               end
             end

test/functional/repositories_cvs_controller_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  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__)
             class RepositoriesCvsControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               # CVS module
               MODULE_NAME = 'test'
               PRJ_ID = 3
               NUM_REV = 7
               def setup
                 Setting.default_language = 'en'
                 User.current = nil
                 @project = Project.find(PRJ_ID)
                 @repository  = Repository::Cvs.create(:project      => Project.find(PRJ_ID),
                                                       :root_url     => REPOSITORY_PATH,
                                                       :url          => MODULE_NAME,
                                                       :log_encoding => 'UTF-8')
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Cvs'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Cvs, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_browse_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 3, assigns(:entries).size
                   entry = assigns(:entries).detect {|e| e.name == 'images'}
                   assert_equal 'dir', entry.kind
                   entry = assigns(:entries).detect {|e| e.name == 'README'}
                   assert_equal 'file', entry.kind
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['add.png', '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_browse_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
                       :rev => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                 end
                 def test_entry
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'entry'
                   assert_no_tag :tag => 'td',
                                 :attributes => { :class => /line-code/},
                                 :content => /before_filter/
                 end
                 def test_entry_at_given_revision
                   # changesets must be loaded
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :rev => 2
                   assert_response :success
                   assert_template 'entry'
                   # this line was removed in r3
                   assert_tag :tag => 'td',
                              :attributes => { :class => /line-code/},
                              :content => /before_filter/
                 end
                 def test_entry_not_found
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'zzz.c'])[:param]
                   assert_tag :tag => 'p',
                              :attributes => { :id => /errorExplanation/ },
                              :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :format => 'raw'
                   assert_response :success
                 end
                 def test_directory_entry
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 3, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_out' },
                                              :content => /before_filter :require_login/
                     assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
                                              :content => /with one change/
                   end
                 end
                 def test_diff_new_files
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 1, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
                                              :content => /watched.remove_watcher/
                     assert_tag :tag => 'th', :attributes => { :class => 'filename' },
                                              :content => /test\/README/
                     assert_tag :tag => 'th', :attributes => { :class => 'filename' },
                                              :content => /test\/images\/delete.png	/
                     assert_tag :tag => 'th', :attributes => { :class => 'filename' },
                                              :content => /test\/images\/edit.png/
                     assert_tag :tag => 'th', :attributes => { :class => 'filename' },
                                              :content => /test\/sources\/watchers_controller.rb/
                   end
                 end
                 def test_annotate
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   # 1.1 line
                   assert_tag :tag => 'th',
                              :attributes => { :class => 'line-num' },
-                             :content => '18',
+                             :content => '21',
                              :sibling => {
                                :tag => 'td',
                                :attributes => { :class => 'revision' },
                                :content => /1.1/,
                                :sibling => {
                                   :tag => 'td',
                                   :attributes => { :class => 'author' },
                                   :content => /LANG/
                                     }
                                }
                   # 1.2 line
                   assert_tag :tag => 'th',
                              :attributes => { :class => 'line-num' },
                              :content => '32',
                              :sibling => {
                                  :tag => 'td',
                                  :attributes => { :class => 'revision' },
                                  :content => /1.2/,
                                  :sibling => {
                                     :tag => 'td',
                                     :attributes => { :class => 'author' },
                                     :content => /LANG/
                                     }
                                }
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository  = Repository::Cvs.create!(
                                           :project      => Project.find(PRJ_ID),
                                           :root_url     => "/invalid",
                                           :url          => MODULE_NAME,
                                           :log_encoding => 'UTF-8'
                                           )
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "CVS test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_git_controller_test.rb +6 -6

             # Redmine - project management software
             # Copyright (C) 2006-2012  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__)
             class RepositoriesGitControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               PRJ_ID     = 3
               CHAR_1_HEX = "\xc3\x9c"
               NUM_REV = 28
               ## Git, Mercurial and CVS path encodings are binary.
               ## Subversion supports URL encoding for path.
               ## Redmine Mercurial adapter and extension use URL encoding.
               ## Git accepts only binary path in command line parameter.
               ## So, there is no way to use binary command line parameter in JRuby.
               JRUBY_SKIP     = (RUBY_PLATFORM == 'java')
               JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
               def setup
                 @ruby19_non_utf8_pass =
                   (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                 @repository = Repository::Git.create(
                                   :project       => @project,
                                   :url           => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @char_1        = CHAR_1_HEX.dup
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                 end
                 Setting.default_language = 'en'
               end
               def test_create_and_update
                 @request.session[:user_id] = 1
                 assert_difference 'Repository.count' do
                   post :create, :project_id => 'subproject1',
                                 :repository_scm => 'Git',
                                 :repository => {
                                    :url => '/test',
                                    :is_default => '0',
                                    :identifier => 'test-create',
                                    :extra_report_last_commit => '1',
                                  }
                 end
                 assert_response 302
                 repository = Repository.first(:order => 'id DESC')
                 assert_kind_of Repository::Git, repository
                 assert_equal '/test', repository.url
                 assert_equal true, repository.extra_report_last_commit
                 put :update, :id => repository.id,
                              :repository => {
                                  :extra_report_last_commit => '0'
                              }
                 assert_response 302
                 repo2 = Repository.find(repository.id)
                 assert_equal false, repo2.extra_report_last_commit
               end
               if File.directory?(REPOSITORY_PATH)
                 ## Ruby uses ANSI api to fork a process on Windows.
                 ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
                 ## and these are incompatible with ASCII.
                 ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
                 ## http://code.google.com/p/msysgit/issues/detail?id=80
                 ## So, Latin-1 path tests fail on Japanese Windows
                 WINDOWS_PASS = (Redmine::Platform.mswin? &&
                                      Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
                 WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Git'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Git, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_browse_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   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'}
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_branch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :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'}
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_tag
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                     "tag00.lightweight",
                     "tag01.annotated",
                    ].each do |t1|
                     get :show, :id => PRJ_ID, :rev => t1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_browse_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
                   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
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
                       :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   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_show_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
                   elsif WINDOWS_PASS
                     puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                       ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
                         get :entry, :id => PRJ_ID,
                             :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                             :rev => r1
                         assert_response :success
                         assert_template 'entry'
                         assert_tag :tag => 'th',
                                :content => '1',
                                :attributes => { :class => 'line-num' },
                                :sibling => { :tag => 'td',
                                              :content => /test-#{@char_1}.txt/ }
                       end
                     end
                   end
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Full diff of changeset 2f9c0091
                   ['inline', 'sbs'].each do |dt|
                     get :diff,
                         :id   => PRJ_ID,
                         :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                         :type => dt
                     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
                 end
                 def test_diff_truncated
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   with_settings :diff_max_lines_displayed => 5 do
                     # Truncated diff of changeset 2f9c0091
                     with_cache do
                       get :diff, :id   => PRJ_ID, :type => 'inline',
                           :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                       assert_response :success
                       assert @response.body.include?("... This diff was truncated")
                       Setting.default_language = 'fr'
                       get :diff, :id   => PRJ_ID, :type => 'inline',
                           :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                       assert_response :success
                       assert ! @response.body.include?("... This diff was truncated")
                       assert @response.body.include?("... Ce diff")
                     end
                   end
                 end
                 def test_diff_two_revs
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff,
                         :id     => PRJ_ID,
                         :rev    => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                         :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                         :type   => dt
                     assert_response :success
                     assert_template 'diff'
                     diff = assigns(:diff)
                     assert_not_nil diff
                     assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
                   end
                 end
                 def test_diff_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
                   else
                     with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                       ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
                         ['inline', 'sbs'].each do |dt|
                           get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                           assert_response :success
                           assert_template 'diff'
                           assert_tag :tag => 'thead',
                                      :descendant => {
                                        :tag => 'th',
                                        :attributes => { :class => 'filename' } ,
                                        :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
                                       },
                                      :sibling => {
                                        :tag => 'tbody',
                                        :descendant => {
                                           :tag => 'td',
                                           :attributes => { :class => /diff_in/ },
                                           :content => /test-#{@char_1}.txt/
                                        }
                                      }
                         end
                       end
                     end
                   end
                 end
                 def test_save_diff_type
                   @request.session[:user_id] = 1 # admin
                   user = User.find(1)
                   get :diff,
                       :id   => PRJ_ID,
                       :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   user.reload
                   assert_equal "inline", user.pref[:diff_type]
                   get :diff,
                       :id   => PRJ_ID,
                       :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                       :type => 'sbs'
                   assert_response :success
                   assert_template 'diff'
                   user.reload
                   assert_equal "sbs", user.pref[:diff_type]
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
-                  # Line 24, changeset 2f9c0091
+                  # Line 23, changeset 2f9c0091
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :tag => 'a',
                                    :content => /2f9c0091/
                                    }
                                 }
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
                              :sibling => { :tag => 'td', :content => /jsmith/ }
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :tag => 'a',
                                    :content => /2f9c0091/
                                    }
                                 }
-                  assert_tag :tag => 'th', :content => '24',
+                  assert_tag :tag => 'th', :content => '23',
-                             :sibling => { :tag => 'td', :content => /watcher =/ }
+                             :sibling => { :tag => 'td', :content => /remove_watcher/ }
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID, :rev => 'deff7',
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_tag :tag => 'h2', :content => /@ deff712f/
                 end
                 def test_annotate_binary_file
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response 500
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                           :content => /cannot be annotated/
                 end
                 def test_annotate_error_when_too_big
                   with_settings :file_max_size_displayed => 1 do
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                         :rev => 'deff712f'
                     assert_response 500
                     assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /exceeds the maximum text file size/
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['README'])[:param],
                         :rev => '7234cb2'
                     assert_response :success
                     assert_template 'annotate'
                   end
                 end
                 def test_annotate_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
                   elsif WINDOWS_PASS
                     puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                       ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
                         get :annotate, :id => PRJ_ID,
                             :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                             :rev => r1
                         assert_tag :tag => 'th',
                                    :content => '1',
                                    :attributes => { :class => 'line-num' },
                                    :sibling => { :tag => 'td',
                                                  :content => /test-#{@char_1}.txt/ }
                       end
                     end
                   end
                 end
                 def test_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response :success
                     assert_template 'revision'
                   end
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Git.create!(
                                   :project       => @project,
                                   :url           => "/invalid",
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 private
                 def puts_ruby19_non_utf8_pass
                   puts "TODO: This test fails in Ruby 1.9 " +
                        "and Encoding.default_external is not UTF-8. " +
                        "Current value is '#{Encoding.default_external.to_s}'"
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
               private
               def with_cache(&block)
                 before = ActionController::Base.perform_caching
                 ActionController::Base.perform_caching = true
                 block.call
                 ActionController::Base.perform_caching = before
               end
             end

test/functional/repositories_mercurial_controller_test.rb +5 -5

             # Redmine - project management software
             # Copyright (C) 2006-2012  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__)
             class RepositoriesMercurialControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               CHAR_1_HEX = "\xc3\x9c"
               PRJ_ID     = 3
               NUM_REV    = 32
               ruby19_non_utf8_pass =
                  (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
               def setup
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                 @repository = Repository::Mercurial.create(
                                   :project => @project,
                                   :url     => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @diff_c_support = true
                 @char_1        = CHAR_1_HEX.dup
                 @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
                 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
                 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                   @tag_char_1.force_encoding('UTF-8')
                   @branch_char_0.force_encoding('UTF-8')
                   @branch_char_1.force_encoding('UTF-8')
                 end
               end
               if ruby19_non_utf8_pass
                 puts "TODO: Mercurial functional test fails in Ruby 1.9 " +
                      "and Encoding.default_external is not UTF-8. " +
                      "Current value is '#{Encoding.default_external.to_s}'"
                 def test_fake; assert true end
               elsif File.directory?(REPOSITORY_PATH)
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Mercurial'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Mercurial, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_show_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   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_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
                   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
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [0, '0', '0885933ad4f6'].each do |r1|
                     get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [13, '13', '3a330eb32958'].each do |r1|
                     get :show, :id => PRJ_ID,
                         :path => repository_path_hash(['sql_escape', 'percent%dir'])[:param],
                         :rev => r1
                     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)
                     assert_not_nil changesets
                     assert assigns(:changesets).size > 0
                     assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_show_directory_latin_1_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [21, '21', 'adf805632193'].each do |r1|
                     get :show, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ["make-latin-1-file.rb",
                                   "test-#{@char_1}-1.txt",
                                   "test-#{@char_1}-2.txt",
                                   "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
                     assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
                   end
                 end
                 def show_should_show_branch_selection_form
                   @repository.fetch_changesets
                   @project.reload
                   get :show, :id => PRJ_ID
                   assert_tag 'form', :attributes => {:id => 'revision_selector', :action => '/projects/subproject1/repository/show'}
                   assert_tag 'select', :attributes => {:name => 'branch'},
                     :child => {:tag => 'option', :attributes => {:value => 'test-branch-01'}},
                     :parent => {:tag => 'form', :attributes => {:id => 'revision_selector'}}
                 end
                 def test_show_branch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                       'default',
                       @branch_char_1,
                       'branch (1)[2]&,%.-3_4',
                       @branch_char_0,
                       'test_branch.latin-1',
                       'test-branch-00',
                   ].each do |bra|
                     get :show, :id => PRJ_ID, :rev => bra
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_tag
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                     @tag_char_1,
                     'tag_test.00',
                     'tag-init-revision'
                   ].each do |tag|
                     get :show, :id => PRJ_ID, :rev => tag
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   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_show_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'entry'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_entry_show_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '27', '7bbf4c738e71'].each do |r1|
                       get :entry, :id => PRJ_ID,
                           :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                           :rev => r1
                       assert_response :success
                       assert_template 'entry'
                       assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /test-#{@char_1}.txt/ }
                     end
                   end
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_entry_binary_force_download
                   get :entry, :id => PRJ_ID, :rev => 1,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_equal 'image/png', @response.content_type
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [4, '4', 'def6d2f1254a'].each do |r1|
                     # Full diff of changeset 4
                     ['inline', 'sbs'].each do |dt|
                       get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                       assert_response :success
                       assert_template 'diff'
                       if @diff_c_support
                         # Line 22 removed
                         assert_tag :tag => 'th',
                                    :content => '22',
                                    :sibling => { :tag => 'td',
                                                  :attributes => { :class => /diff_out/ },
                                                  :content => /def remove/ }
                         assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
                       end
                     end
                   end
                 end
                 def test_diff_two_revs
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     [4, 'def6d2f1254a'].each do |r2|
                       ['inline', 'sbs'].each do |dt|
                         get :diff,
                             :id     => PRJ_ID,
                             :rev    => r1,
                             :rev_to => r2,
                             :type => dt
                         assert_response :success
                         assert_template 'diff'
                         diff = assigns(:diff)
                         assert_not_nil diff
                         assert_tag :tag => 'h2',
                                    :content => /4:def6d2f1254a 2:400bb8672109/
                       end
                     end
                   end
                 end
                 def test_diff_latin_1_path
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [21, 'adf805632193'].each do |r1|
                       ['inline', 'sbs'].each do |dt|
                         get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                         assert_response :success
                         assert_template 'diff'
                         assert_tag :tag => 'thead',
                                    :descendant => {
                                      :tag => 'th',
                                      :attributes => { :class => 'filename' } ,
                                      :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
                                     },
                                    :sibling => {
                                      :tag => 'tbody',
                                      :descendant => {
                                         :tag => 'td',
                                         :attributes => { :class => /diff_in/ },
                                         :content => /It is written in Python/
                                      }
                                    }
                       end
                     end
                   end
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
-                  # Line 23, revision 4:def6d2f1254a
+                  # Line 22, revision 4:def6d2f1254a
                   assert_tag :tag => 'th',
-                             :content => '23',
+                             :content => '22',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '4:def6d2f1254a' }
                                    }
                   assert_tag :tag => 'th',
-                             :content => '23',
+                             :content => '22',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                   assert_tag :tag => 'th',
-                             :content => '23',
+                             :content => '22',
                              :attributes => { :class => 'line-num' },
-                             :sibling => { :tag => 'td', :content => /watcher =/ }
+                             :sibling => { :tag => 'td', :content => /remove_watcher/ }
                 end
                 def test_annotate_not_in_tip
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'welcome_controller.rb'])[:param]
                   assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     get :annotate, :id => PRJ_ID, :rev => r1,
                         :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
                   end
                 end
                 def test_annotate_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '20:709858aafd1b' }
                                    }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_annotate_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '7bbf4c738e71'].each do |r1|
                       get :annotate, :id => PRJ_ID,
                           :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                           :rev => r1
                       assert_tag :tag => 'th',
                                  :content => '1',
                                  :attributes => { :class => 'line-num' },
                                  :sibling => { :tag => 'td',
                                                :content => /test-#{@char_1}.txt/ }
                     end
                   end
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Mercurial.create!(
                                   :project => Project.find(PRJ_ID),
                                   :url     => "/invalid",
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   @repository.fetch_changesets
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "Mercurial 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