jro_apps/redmine Commit - r13100:2d1866d966d9

Merged rails-4.1 branch (#14534)....

Jean-Philippe Lang -

r13100:2d1866d966d9

parent child

Context file:

r13100:2d1866d966d9

Expand all files

The requested changes are too big and content was truncated. Show full diff

.travis.run-test.sh created 644 +3 0

@@ -0,0 +1,3
	1	#! /bin/sh
	2
	3	JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}

bin/about created 755 +6 0

@@ -0,0 +1,6
	1	#!/usr/bin/env ruby
	2
	3	ENV["RAILS_ENV"] \|\|= "production"
	4	require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
	5	puts
	6	puts Redmine::Info.environment

bin/bundle created 644 +3 0

@@ -0,0 +1,3
	1	#!/usr/bin/env ruby.exe
	2	ENV['BUNDLE_GEMFILE'] \|\|= File.expand_path('../../Gemfile', __FILE__)
	3	load Gem.bin_path('bundler', 'bundle')

bin/rails created 644 +4 0

@@ -0,0 +1,4
	1	#!/usr/bin/env ruby.exe
	2	APP_PATH = File.expand_path('../../config/application', __FILE__)
	3	require_relative '../config/boot'
	4	require 'rails/commands'

bin/rake created 644 +4 0

@@ -0,0 +1,4
	1	#!/usr/bin/env ruby.exe
	2	require_relative '../config/boot'
	3	require 'rake'
	4	Rake.application.run

.travis.yml +2 -3

             # You can also run tests on your environment.
             language: ruby
             rvm:
-              - 1.8.7
-              - 1.9.2
               - 1.9.3
               - 2.0
               - 2.1
               - "bundle install"
               - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
               - "bundle install"
-              - "JRUBY_OPTS=-J-Xmx1024m bundle exec rake ci"
+              - "bundle exec rake ci:setup"
+              - "sh .travis.run-test.sh"
             notifications:
               email: false

Gemfile +15 -19

             source 'https://rubygems.org'
-            gem "rails", "3.2.19"
+            gem "rails", "4.1.6"
             gem "jquery-rails", "~> 3.1.1"
             gem "coderay", "~> 1.1.0"
-            gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
             gem "builder", ">= 3.0.4"
             gem "request_store", "1.0.5"
             gem "mime-types"
+            gem "awesome_nested_set", "3.0.0"
+            gem "protected_attributes"
+            gem "actionpack-action_caching"
+            # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+            gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
             gem "rbpdf", "~> 1.18.1"
             # Optional gem for LDAP authentication
             platforms :mri, :mingw do
               # Optional gem for exporting the gantt to a PNG file, not supported with jruby
               group :rmagick do
-                # RMagick 2 supports ruby 1.9
-                # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-                # different requirements for the same gem on different platforms
                 gem "rmagick", ">= 2.0.0"
               end
               # Optional Markdown support, not for JRuby
               group :markdown do
-                # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
+                gem "redcarpet", "~> 3.1.2"
-                gem "redcarpet", "~> 2.3.0"
               end
             end
                     gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
                     gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
                   when 'mysql'
-                    gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
                     gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
                   when /postgresql/
                     gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
             end
             group :test do
-              gem "shoulda", "~> 3.3.2"
+              gem "minitest"
-              gem "shoulda-matchers", "1.4.1"
+              gem "shoulda-context"
               gem "mocha", "~> 1.0.0", :require => 'mocha/api'
-              if RUBY_VERSION >= '1.9.3'
+              # For running UI tests
-                gem "capybara", "~> 2.1.0"
+              gem "capybara", "~> 2.1.0"
-                gem "selenium-webdriver"
+              gem "selenium-webdriver"
-              end
             end
             local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
             if File.exists?(local_gemfile)
-              puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
+              eval_gemfile local_gemfile
-              instance_eval File.read(local_gemfile)
             end
             # Load plugins' Gemfiles
             Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
-              puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+              eval_gemfile file
-              #TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4)
-              instance_eval File.read(file), file
             end

app/controllers/admin_controller.rb +1 -1

                 scope = Project.status(@status).order('lft')
                 scope = scope.like(params[:name]) if params[:name].present?
-                @projects = scope.all
+                @projects = scope.to_a
                 render :action => "projects", :layout => false if request.xhr?
               end

app/controllers/application_controller.rb +1 -1

               end
               def render_feed(items, options={})
-                @items = items || []
+                @items = (items || []).to_a
                 @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                 @items = @items.slice(0, Setting.feeds_limit.to_i)
                 @title = options[:title] || Setting.app_title

app/controllers/auto_completes_controller.rb +1 -1

                   if q.match(/\A#?(\d+)\z/)
                     @issues << scope.find_by_id($1.to_i)
                   end
-                  @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE LOWER(?)", "%#{q}%").order("#{Issue.table_name}.id DESC").limit(10).all
+                  @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE LOWER(?)", "%#{q}%").order("#{Issue.table_name}.id DESC").limit(10).to_a
                   @issues.compact!
                 end
                 render :layout => false

app/controllers/boards_controller.rb +5 -4

               helper :watchers
               def index
-                @boards = @project.boards.includes(:project, :last_message => :author).all
+                @boards = @project.boards.preload(:project, :last_message => :author).to_a
                 # show the board if there is only one
                 if @boards.size == 1
                   @board = @boards.first
                     @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
                     @topics =  @board.topics.
                       reorder("#{Message.table_name}.sticky DESC").
-                      includes(:last_reply).
+                      joins("LEFT OUTER JOIN #{Message.table_name} last_replies_messages ON last_replies_messages.id = #{Message.table_name}.last_reply_id").
+                      references(:last_reply).
                       limit(@topic_pages.per_page).
                       offset(@topic_pages.offset).
                       order(sort_clause).
                       preload(:author, {:last_reply => :author}).
-                      all
+                      to_a
                     @message = Message.new(:board => @board)
                     render :action => 'show', :layout => !request.xhr?
                   }
                       reorder('created_on DESC').
                       includes(:author, :board).
                       limit(Setting.feeds_limit.to_i).
-                      all
+                      to_a
                     render_feed(@messages, :title => "#{@project}: #{@board}")
                   }
                 end

app/controllers/documents_controller.rb +3 -3

               def index
                 @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
-                documents = @project.documents.includes(:attachments, :category).all
+                documents = @project.documents.includes(:attachments, :category).to_a
                 case @sort_by
                 when 'date'
                   @grouped = documents.group_by {|d| d.updated_on.to_date }
               end
               def show
-                @attachments = @document.attachments.all
+                @attachments = @document.attachments.to_a
               end
               def new
               def update
                 @document.safe_attributes = params[:document]
-                if request.put? and @document.save
+                if @document.save
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to document_path(@document)
                 else

app/controllers/enumerations_controller.rb +3 -3

                   format.api {
                     @klass = Enumeration.get_subclass(params[:type])
                     if @klass
-                      @enumerations = @klass.shared.sorted.all
+                      @enumerations = @klass.shared.sorted.to_a
                     else
                       render_404
                     end
               end
               def update
-                if request.put? && @enumeration.update_attributes(params[:enumeration])
+                if @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to enumerations_path
                 else
                   redirect_to enumerations_path
                   return
                 end
-                @enumerations = @enumeration.class.system.all - [@enumeration]
+                @enumerations = @enumeration.class.system.to_a - [@enumeration]
               end
               private

app/controllers/files_controller.rb +4 -2

                             'size' => "#{Attachment.table_name}.filesize",
                             'downloads' => "#{Attachment.table_name}.downloads"
-                @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)]
+                @containers = [Project.includes(:attachments).
-                @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse
+                                 references(:attachments).reorder(sort_clause).find(@project.id)]
+                @containers += @project.versions.includes(:attachments).
+                                references(:attachments).reorder(sort_clause).to_a.sort.reverse
                 render :layout => !request.xhr?
               end

app/controllers/groups_controller.rb +3 -3

               def index
                 respond_to do |format|
                   format.html {
-                    @groups = Group.sorted.all
+                    @groups = Group.sorted.to_a
                     @user_count_by_group_id = user_count_by_group_id
                   }
                   format.api {
                     scope = Group.sorted
                     scope = scope.givable unless params[:builtin] == '1'
-                    @groups = scope.all
+                    @groups = scope.to_a
                   }
                 end
               end
               end
               def add_users
-                @users = User.where(:id => (params[:user_id] || params[:user_ids])).all
+                @users = User.where(:id => (params[:user_id] || params[:user_ids])).to_a
                 @group.users << @users if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }

app/controllers/issue_categories_controller.rb +1 -1

               def index
                 respond_to do |format|
                   format.html { redirect_to_settings_in_projects }
-                  format.api { @categories = @project.issue_categories.all }
+                  format.api { @categories = @project.issue_categories.to_a }
                 end
               end

app/controllers/issue_statuses_controller.rb +1 -1

                     render :action => "index", :layout => false if request.xhr?
                   }
                   format.api {
-                    @issue_statuses = IssueStatus.order('position').all
+                    @issue_statuses = IssueStatus.order('position').to_a
                   }
                 end
               end

app/controllers/issues_controller.rb +13 -8

               end
               def show
-                @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
+                @journals = @issue.journals.includes(:user, :details).
+                                references(:user, :details).
+                                reorder("#{Journal.table_name}.id ASC").to_a
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
                 Journal.preload_journals_details_custom_fields(@journals)
-                # TODO: use #select! when ruby1.8 support is dropped
+                @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
-                @journals.reject! {|journal| !journal.notes? && journal.visible_details.empty?}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
-                @changesets = @issue.changesets.visible.all
+                @changesets = @issue.changesets.visible.to_a
                 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                 rescue ActiveRecord::StaleObjectError
                   @conflict = true
                   if params[:last_journal_id]
-                    @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
+                    @conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a
                     @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
                   end
                 end
                 else
                   @saved_issues = @issues
                   @unsaved_issues = unsaved_issues
-                  @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).all
+                  @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a
                   bulk_edit
                   render :action => 'bulk_edit'
                 end
               def update_issue_from_params
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
-                @time_entry.attributes = params[:time_entry]
+                if params[:time_entry]
+                  @time_entry.attributes = params[:time_entry]
+                end
                 @issue.init_journal(User.current)
                 @issue.project = @project
                 @issue.author ||= User.current
                 # Tracker must be set before custom field values
-                @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
+                tracker_id = (params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id]
+                tracker = tracker_id.present? ? @project.trackers.find(tracker_id) : @project.trackers.first
+                @issue.tracker ||= tracker
                 if @issue.tracker.nil?
                   render_error l(:error_no_tracker_in_project)
                   return false

app/controllers/journals_controller.rb 0 -1

                 retrieve_query
                 sort_init 'id', 'desc'
                 sort_update(@query.sortable_columns)
                 if @query.valid?
                   @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
                                               :limit => 25)

app/controllers/members_controller.rb +5 -2

                                 order("#{Member.table_name}.id").
                                 limit(@limit).
                                 offset(@offset).
-                                all
+                                to_a
                 respond_to do |format|
                   format.html { head 406 }
                   format.api
                 respond_to do |format|
                   format.html { redirect_to_settings_in_projects }
-                  format.js { @members = members }
+                  format.js {
+                    @members = members
+                    @member = Member.new
+                  }
                   format.api {
                     @member = members.first
                     if @member.valid?

app/controllers/messages_controller.rb +2 -2

                 @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
                 @replies =  @topic.children.
                   includes(:author, :attachments, {:board => :project}).
-                  reorder("#{Message.table_name}.created_on ASC").
+                  reorder("#{Message.table_name}.created_on ASC, #{Message.table_name}.id ASC").
                   limit(@reply_pages.per_page).
                   offset(@reply_pages.offset).
-                  all
+                  to_a
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?

app/controllers/my_controller.rb +2 -2

                 @user = User.current
                 @pref = @user.pref
                 if request.post?
-                  @user.safe_attributes = params[:user]
+                  @user.safe_attributes = params[:user] if params[:user]
-                  @user.pref.attributes = params[:pref]
+                  @user.pref.attributes = params[:pref] if params[:pref]
                   if @user.save
                     @user.pref.save
                     set_language_if_valid @user.language

app/controllers/news_controller.rb +1 -1

                                   order("#{News.table_name}.created_on DESC").
                                   limit(@limit).
                                   offset(@offset).
-                                  all
+                                  to_a
                 respond_to do |format|
                   format.html {
                     @news = News.new # for adding news inline

app/controllers/project_enumerations_controller.rb +1 -1

               before_filter :authorize
               def update
-                if request.put? && params[:enumerations]
+                if params[:enumerations]
                   Project.transaction do
                     params[:enumerations].each do |id, activity|
                       @project.update_or_create_time_entry_activity(id, activity)

app/controllers/projects_controller.rb +13 -13

                     unless params[:closed]
                       scope = scope.active
                     end
-                    @projects = scope.visible.order('lft').all
+                    @projects = scope.visible.order('lft').to_a
                   }
                   format.api  {
                     @offset, @limit = api_offset_and_limit
                     @project_count = Project.visible.count
-                    @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
+                    @projects = Project.visible.offset(@offset).limit(@limit).order('lft').to_a
                   }
                   format.atom {
-                    projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
+                    projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).to_a
                     render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               def new
-                @issue_custom_fields = IssueCustomField.sorted.all
+                @issue_custom_fields = IssueCustomField.sorted.to_a
-                @trackers = Tracker.sorted.all
+                @trackers = Tracker.sorted.to_a
                 @project = Project.new
                 @project.safe_attributes = params[:project]
               end
               def create
-                @issue_custom_fields = IssueCustomField.sorted.all
+                @issue_custom_fields = IssueCustomField.sorted.to_a
-                @trackers = Tracker.sorted.all
+                @trackers = Tracker.sorted.to_a
                 @project = Project.new
                 @project.safe_attributes = params[:project]
               end
               def copy
-                @issue_custom_fields = IssueCustomField.sorted.all
+                @issue_custom_fields = IssueCustomField.sorted.to_a
-                @trackers = Tracker.sorted.all
+                @trackers = Tracker.sorted.to_a
                 @source_project = Project.find(params[:id])
                 if request.get?
                   @project = Project.copy_from(@source_project)
                 end
                 @users_by_role = @project.users_by_role
-                @subprojects = @project.children.visible.all
+                @subprojects = @project.children.visible.to_a
-                @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all
+                @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").to_a
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
               end
               def settings
-                @issue_custom_fields = IssueCustomField.sorted.all
+                @issue_custom_fields = IssueCustomField.sorted.to_a
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
-                @trackers = Tracker.sorted.all
+                @trackers = Tracker.sorted.to_a
                 @wiki ||= @project.wiki
               end

app/controllers/queries_controller.rb +2 -1

                                 order("#{Query.table_name}.name").
                                 limit(@limit).
                                 offset(@offset).
-                                all
+                                to_a
                 respond_to do |format|
+                  format.html {render_error :status => 406}
                   format.api
                 end
               end

app/controllers/reports_controller.rb +1 -1

               private
               def find_issue_statuses
-                @statuses = IssueStatus.sorted.all
+                @statuses = IssueStatus.sorted.to_a
               end
             end

app/controllers/repositories_controller.rb +3 -3

                   @repository.merge_extra_info(attrs[:attrs_extra])
                 end
                 @repository.project = @project
-                if request.put? && @repository.save
+                if @repository.save
                   redirect_to settings_project_path(@project, :tab => 'repositories')
                 else
                   render :action => 'edit'
                 @committers = @repository.committers
                 @users = @project.users
                 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
-                @users += User.where(:id => additional_user_ids).all unless additional_user_ids.empty?
+                @users += User.where(:id => additional_user_ids).to_a unless additional_user_ids.empty?
                 @users.compact!
                 @users.sort!
                 if request.post? && params[:committers].is_a?(Hash)
                   limit(@changeset_pages.per_page).
                   offset(@changeset_pages.offset).
                   includes(:user, :repository, :parents).
-                  all
+                  to_a
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }

app/controllers/roles_controller.rb +5 -5

                     render :action => "index", :layout => false if request.xhr?
                   }
                   format.api {
-                    @roles = Role.givable.all
+                    @roles = Role.givable.to_a
                   }
                 end
               end
                 if params[:copy].present? && @copy_from = Role.find_by_id(params[:copy])
                   @role.copy_from(@copy_from)
                 end
-                @roles = Role.sorted.all
+                @roles = Role.sorted.to_a
               end
               def create
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to roles_path
                 else
-                  @roles = Role.sorted.all
+                  @roles = Role.sorted.to_a
                   render :action => 'new'
                 end
               end
               end
               def update
-                if request.put? and @role.update_attributes(params[:role])
+                if @role.update_attributes(params[:role])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to roles_path
                 else
               end
               def permissions
-                @roles = Role.sorted.all
+                @roles = Role.sorted.to_a
                 @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
                 if request.post?
                   @roles.each do |role|

app/controllers/search_controller.rb +1 -1

                   when 'my_projects'
                     User.current.memberships.collect(&:project)
                   when 'subprojects'
-                    @project ? (@project.self_and_descendants.active.all) : nil
+                    @project ? (@project.self_and_descendants.active.to_a) : nil
                   else
                     @project
                   end

app/controllers/sys_controller.rb +3 -2

               before_filter :check_enabled
               def projects
-                p = Project.active.has_module(:repository).order("#{Project.table_name}.identifier").preload(:repository).all
+                p = Project.active.has_module(:repository).
+                      order("#{Project.table_name}.identifier").preload(:repository).to_a
                 # extra_info attribute from repository breaks activeresource client
                 render :xml => p.to_xml(
                                    :only => [:id, :identifier, :name, :is_public, :status],
                   raise ActiveRecord::RecordNotFound unless project
                   projects << project
                 else
-                  projects = scope.all
+                  projects = scope.to_a
                 end
                 projects.each do |project|
                   project.repositories.each do |repository|

app/controllers/timelog_controller.rb +5 -5

                   format.html {
                     @entry_count = scope.count
                     @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
-                    @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).all
+                    @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).to_a
                     @total_hours = scope.sum(:hours).to_f
                     render :layout => !request.xhr?
                   format.api  {
                     @entry_count = scope.count
                     @offset, @limit = api_offset_and_limit
-                    @entries = scope.offset(@offset).limit(@limit).preload(:custom_values => :custom_field).all
+                    @entries = scope.offset(@offset).limit(@limit).preload(:custom_values => :custom_field).to_a
                   }
                   format.atom {
-                    entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").all
+                    entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").to_a
                     render_feed(entries, :title => l(:label_spent_time))
                   }
                   format.csv {
                     # Export all entries
-                    @entries = scope.all
+                    @entries = scope.to_a
                     send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                   }
                 end
               end
               def find_time_entries
-                @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]).all
+                @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]).to_a
                 raise ActiveRecord::RecordNotFound if @time_entries.empty?
                 @projects = @time_entries.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1

app/controllers/trackers_controller.rb +3 -3

                     render :action => "index", :layout => false if request.xhr?
                   }
                   format.api {
-                    @trackers = Tracker.sorted.all
+                    @trackers = Tracker.sorted.to_a
                   }
                 end
               end
               def new
                 @tracker ||= Tracker.new(params[:tracker])
-                @trackers = Tracker.sorted.all
+                @trackers = Tracker.sorted.to_a
                 @projects = Project.all
               end
                   redirect_to fields_trackers_path
                   return
                 end
-                @trackers = Tracker.sorted.all
+                @trackers = Tracker.sorted.to_a
                 @custom_fields = IssueCustomField.all.sort
               end
             end

app/controllers/users_controller.rb +4 -4

                 @user_count = scope.count
                 @user_pages = Paginator.new @user_count, @limit, params['page']
                 @offset ||= @user_pages.offset
-                @users =  scope.order(sort_clause).limit(@limit).offset(@offset).all
+                @users =  scope.order(sort_clause).limit(@limit).offset(@offset).to_a
                 respond_to do |format|
                   format.html {
               def show
                 # show projects based on current user visibility
-                @memberships = @user.memberships.where(Project.visible_condition(User.current)).all
+                @memberships = @user.memberships.where(Project.visible_condition(User.current)).to_a
                 events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
                 @events_by_day = events.group_by(&:event_date)
                 @user.admin = params[:user][:admin] || false
                 @user.login = params[:user][:login]
                 @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
-                @user.pref.attributes = params[:pref]
+                @user.pref.attributes = params[:pref] if params[:pref]
                 if @user.save
                   Mailer.account_information(@user, @user.password).deliver if params[:send_information]
                 # Was the account actived ? (do it before User#save clears the change)
                 was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
                 # TODO: Similar to My#account
-                @user.pref.attributes = params[:pref]
+                @user.pref.attributes = params[:pref] if params[:pref]
                 if @user.save
                   @user.pref.save

app/controllers/versions_controller.rb +4 -4

               def index
                 respond_to do |format|
                   format.html {
-                    @trackers = @project.trackers.sorted.all
+                    @trackers = @project.trackers.sorted.to_a
                     retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
                     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                     project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                     @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
                   }
                   format.api {
-                    @versions = @project.shared_versions.all
+                    @versions = @project.shared_versions.to_a
                   }
                 end
               end
                     @issues = @version.fixed_issues.visible.
                       includes(:status, :tracker, :priority).
                       reorder("#{Tracker.table_name}.position, #{Issue.table_name}.id").
-                      all
+                      to_a
                   }
                   format.api
                 end
               end
               def update
-                if request.put? && params[:version]
+                if params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
                   @version.safe_attributes = attributes

app/controllers/watchers_controller.rb +2 -2

               def append
                 if params[:watcher].is_a?(Hash)
                   user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
-                  @users = User.active.where(:id => user_ids).all
+                  @users = User.active.where(:id => user_ids).to_a
                 end
                 if @users.blank?
                   render :nothing => true
               def find_watchables
                 klass = Object.const_get(params[:object_type].camelcase) rescue nil
                 if klass && klass.respond_to?('watched_by')
-                  @watchables = klass.where(:id => Array.wrap(params[:object_id])).all
+                  @watchables = klass.where(:id => Array.wrap(params[:object_id])).to_a
                   raise Unauthorized if @watchables.any? {|w|
                     if w.respond_to?(:visible?)
                       !w.visible?

app/controllers/wiki_controller.rb +9 -5

                   reorder('version DESC').
                   limit(@version_pages.per_page + 1).
                   offset(@version_pages.offset).
-                  all
+                  to_a
                 render :layout => false if request.xhr?
               end
                 @pages = @wiki.pages.
                                   order('title').
                                   includes([:content, {:attachments => :author}]).
-                                  all
+                                  to_a
                 respond_to do |format|
                   format.html {
                     export = render_to_string :action => 'export_multiple', :layout => false
               def find_existing_or_new_page
                 @page = @wiki.find_or_new_page(params[:id])
                 if @wiki.page_found_with_redirect?
-                  redirect_to params.update(:id => @page.title)
+                  redirect_to_page @page
                 end
               end
                   return
                 end
                 if @wiki.page_found_with_redirect?
-                  redirect_to params.update(:id => @page.title)
+                  redirect_to_page @page
                 end
               end
+              def redirect_to_page(page)
+                redirect_to :action => action_name, :project_id => page.wiki.project, :id => page.title
+              end
               # Returns true if the current user is allowed to edit the page, otherwise false
               def editable?(page = @page)
                 page.editable_by?(User.current)
                             reorder("#{WikiPage.table_name}.title").
                             includes(:wiki => :project).
                             includes(:parent).
-                            all
+                            to_a
               end
             end

app/controllers/workflows_controller.rb +7 -7

                   @source_role = Role.find_by_id(params[:source_role_id].to_i)
                 end
                 @target_trackers = params[:target_tracker_ids].blank? ?
-                    nil : Tracker.where(:id => params[:target_tracker_ids]).all
+                    nil : Tracker.where(:id => params[:target_tracker_ids]).to_a
                 @target_roles = params[:target_role_ids].blank? ?
-                    nil : Role.where(:id => params[:target_role_ids]).all
+                    nil : Role.where(:id => params[:target_role_ids]).to_a
                 if request.post?
                   if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
                     flash.now[:error] = l(:error_workflow_copy_source)
               def find_roles
                 ids = Array.wrap(params[:role_id])
                 if ids == ['all']
-                  @roles = Role.sorted.all
+                  @roles = Role.sorted.to_a
                 elsif ids.present?
-                  @roles = Role.where(:id => ids).all
+                  @roles = Role.where(:id => ids).to_a
                 end
                 @roles = nil if @roles.blank?
               end
               def find_trackers
                 ids = Array.wrap(params[:tracker_id])
                 if ids == ['all']
-                  @trackers = Tracker.sorted.all
+                  @trackers = Tracker.sorted.to_a
                 elsif ids.present?
-                  @trackers = Tracker.where(:id => ids).all
+                  @trackers = Tracker.where(:id => ids).to_a
                 end
                 @trackers = nil if @trackers.blank?
               end
                 if @trackers && @used_statuses_only
                   @statuses = @trackers.map(&:issue_statuses).flatten.uniq.sort.presence
                 end
-                @statuses ||= IssueStatus.sorted.all
+                @statuses ||= IssueStatus.sorted.to_a
               end
             end

app/helpers/application_helper.rb +7 -21

                 if project.archived?
                   h(project.name)
                 elsif options.key?(:action)
-                  ActiveSupport::Deprecation.warn "#link_to_project with :action option is deprecated and will be removed in Redmine 3.0."
+                  raise "#link_to_project no longer accepts :action option in Redmine 3.0"
-                  url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
-                  link_to project.name, url, html_options
                 else
                   link_to project.name, project_path(project, options), html_options
                 end
                 end
               end
-              # Generates a link to a version
-              def link_to_version(version, options = {})
-                return '' unless version && version.is_a?(Version)
-                options = {:title => format_date(version.effective_date)}.merge(options)
-                link_to_if version.visible?, format_version_name(version), version_path(version), options
-              end
               # Helper that formats object for html or text rendering
               def format_object(object, html=true, &block)
                 if block_given?
                 when 'Project'
                   html ? link_to_project(object) : object.to_s
                 when 'Version'
-                  html ? link_to_version(object) : object.to_s
+                  html ? link_to(object.name, version_path(object)) : object.to_s
                 when 'TrueClass'
                   l(:general_text_Yes)
                 when 'FalseClass'
               end
               def format_version_name(version)
-                if !version.shared? || version.project == @project
+                if version.project == @project
                   h(version)
                 else
                   h("#{version.project} - #{version}")
                   h(Setting.app_title)
                 else
                   b = []
-                  ancestors = (@project.root? ? [] : @project.ancestors.visible.all)
+                  ancestors = (@project.root? ? [] : @project.ancestors.visible.to_a)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
                     source
                   end
                 end
-                super sources, options
+                super *sources, options
               end
               # Overrides Rails' image_tag with themes and plugins support.
                     end
                   end
                 end
-                super sources, options
+                super *sources, options
               end
               # TODO: remove this in 2.5.0
               end
               def sanitize_anchor_name(anchor)
-                if ''.respond_to?(:encoding) || RUBY_PLATFORM == 'java'
+                anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
-                  anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
-                else
-                  # TODO: remove when ruby1.8 is no longer supported
-                  anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
-                end
               end
               # Returns the javascript tags that are included in the html layout head

app/helpers/groups_helper.rb +1 -1

                 scope = User.active.sorted.not_in_group(group).like(params[:q])
                 principal_count = scope.count
                 principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
-                principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+                principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).to_a
                 s = content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals')

app/helpers/issues_helper.rb +3 -3

               def render_issue_subject_with_tree(issue)
                 s = ''
-                ancestors = issue.root? ? [] : issue.ancestors.visible.all
+                ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
-                    all
+                    to_a
                 end
                 @sidebar_queries
               end
                 if association
                   record = association.class_name.constantize.find_by_id(id)
                   if record
-                    record.name.force_encoding('UTF-8') if record.name.respond_to?(:force_encoding)
+                    record.name.force_encoding('UTF-8')
                     return record.name
                   end
                 end

app/helpers/members_helper.rb +1 -1

                 scope = Principal.active.sorted.not_member_of(project).like(params[:q])
                 principal_count = scope.count
                 principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
-                principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+                principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).to_a
                 s = content_tag('div', principals_check_box_tags('membership[user_ids][]', principals), :id => 'principals')

app/helpers/my_helper.rb +13 -8

                   where(:project_id => User.current.projects.map(&:id)).
                   where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", startdt, enddt, startdt, enddt).
                   includes(:project, :tracker, :priority, :assigned_to).
-                  all
+                  references(:project, :tracker, :priority, :assigned_to).
+                  to_a
               end
               def documents_items
-                Document.visible.order("#{Document.table_name}.created_on DESC").limit(10).all
+                Document.visible.order("#{Document.table_name}.created_on DESC").limit(10).to_a
               end
               def issuesassignedtome_items
                   where(:assigned_to_id => ([User.current.id] + User.current.group_ids)).
                   limit(10).
                   includes(:status, :project, :tracker, :priority).
+                  references(:status, :project, :tracker, :priority).
                   order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC").
-                  all
+                  to_a
               end
               def issuesreportedbyme_items
                   where(:author_id => User.current.id).
                   limit(10).
                   includes(:status, :project, :tracker).
+                  references(:status, :project, :tracker).
                   order("#{Issue.table_name}.updated_on DESC").
-                  all
+                  to_a
               end
               def issueswatched_items
-                Issue.visible.on_active_project.watched_by(User.current.id).recently_updated.limit(10).all
+                Issue.visible.on_active_project.watched_by(User.current.id).recently_updated.limit(10).to_a
               end
               def news_items
                   where(:project_id => User.current.projects.map(&:id)).
                   limit(10).
                   includes(:project, :author).
+                  references(:project, :author).
                   order("#{News.table_name}.created_on DESC").
-                  all
+                  to_a
               end
               def timelog_items
                 TimeEntry.
                   where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, Date.today - 6, Date.today).
-                  includes(:activity, :project, {:issue => [:tracker, :status]}).
+                  joins(:activity, :project, {:issue => [:tracker, :status]}).
+                  references(:activity, :project, {:issue => [:tracker, :status]}).
                   order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC").
-                  all
+                  to_a
               end
             end

app/helpers/projects_helper.rb +5 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ProjectsHelper
+              def link_to_version(version, options = {})
+                return '' unless version && version.is_a?(Version)
+                link_to_if version.visible?, format_version_name(version), version_path(version), options
+              end
               def project_settings_tabs
                 tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
                         {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},

app/helpers/queries_helper.rb +1 -1

                   end
                 end
-                export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
+                export = CSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                   # csv header fields
                   csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
                   # csv lines

app/helpers/search_helper.rb 0 -1

                     result << '...'
                     break
                   end
-                  words = words.mb_chars
                   if i.even?
                     result << h(words.length > 100 ? "#{words.slice(0..44)} ... #{words.slice(-45..-1)}" : words)
                   else

app/helpers/sort_helper.rb +2 -1

                 def to_sql
                   sql = @criteria.collect do |k,o|
                     if s = @available_criteria[k]
-                      (o ? s.to_a : s.to_a.collect {|c| append_desc(c)})
+                      s = [s] unless s.is_a?(Array)
+                      (o ? s : s.collect {|c| append_desc(c)})
                     end
                   end.flatten.compact
                   sql.blank? ? nil : sql

app/helpers/timelog_helper.rb +1 -1

               def report_to_csv(report)
                 decimal_separator = l(:general_csv_decimal_separator)
-                export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
+                export = CSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                   # Column headers
                   headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
                   headers += report.periods

app/models/attachment.rb +8 -7

               validates_length_of :disk_filename, :maximum => 255
               validates_length_of :description, :maximum => 255
               validate :validate_max_file_size
+              attr_protected :id
               acts_as_event :title => :filename,
                             :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
               acts_as_activity_provider :type => 'files',
                                         :permission => :view_files,
                                         :author_key => :author_id,
-                                        :find_options => {:select => "#{Attachment.table_name}.*",
+                                        :scope => select("#{Attachment.table_name}.*").
-                                                          :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                  joins("LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
-                                                                    "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )"}
+                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )")
               acts_as_activity_provider :type => 'documents',
                                         :permission => :view_documents,
                                         :author_key => :author_id,
-                                        :find_options => {:select => "#{Attachment.table_name}.*",
+                                        :scope => select("#{Attachment.table_name}.*").
-                                                          :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                  joins("LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
-                                                                    "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
+                                                        "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id")
               cattr_accessor :storage_path
               @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
                   if @temp_file.size > 0
                     if @temp_file.respond_to?(:original_filename)
                       self.filename = @temp_file.original_filename
-                      self.filename.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
+                      self.filename.force_encoding("UTF-8")
                     end
                     if @temp_file.respond_to?(:content_type)
                       self.content_type = @temp_file.content_type.to_s.chomp

app/models/auth_source.rb +1 0

               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 60
+              attr_protected :id
               def authenticate(login, password)
               end

app/models/board.rb +6 -3

             class Board < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
-              has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
+              has_many :topics, lambda {where("#{Message.table_name}.parent_id IS NULL").order("#{Message.table_name}.created_on DESC")}, :class_name => 'Message'
-              has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
+              has_many :messages, lambda {order("#{Message.table_name}.created_on DESC")}, :dependent => :destroy
               belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
               acts_as_tree :dependent => :nullify
               acts_as_list :scope => '(project_id = #{project_id} AND parent_id #{parent_id ? "= #{parent_id}" : "IS NULL"})'
               validates_length_of :name, :maximum => 30
               validates_length_of :description, :maximum => 255
               validate :validate_board
+              attr_protected :id
               scope :visible, lambda {|*args|
-                includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
+                joins(:project).
+                references(:project).
+                where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
               }
               safe_attributes 'name', 'description', 'parent_id', 'move_to'

app/models/change.rb +1 0

               validates_presence_of :changeset_id, :action, :path
               before_save :init_path
               before_validation :replace_invalid_utf8_of_path
+              attr_protected :id
               def relative_path
                 changeset.repository.relative_path(path)

app/models/changeset.rb +6 -3

                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
               acts_as_searchable :columns => 'comments',
-                                 :include => {:repository => :project},
+                                 :scope => preload(:repository => :project),
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                         :author_key => :user_id,
-                                        :find_options => {:include => [:user, {:repository => :project}]}
+                                        :scope => preload(:user, {:repository => :project})
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
+              attr_protected :id
               scope :visible, lambda {|*args|
-                includes(:repository => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
+                joins(:repository => :project).
+                references(:repository => :project).
+                where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
               }
               after_create :scan_for_issues

app/models/comment.rb +1 0

               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               validates_presence_of :commented, :author, :comments
+              attr_protected :id
               after_create :send_notification

app/models/custom_field.rb +3 -2

               validates_length_of :name, :maximum => 30
               validates_inclusion_of :field_format, :in => Proc.new { Redmine::FieldFormat.available_formats }
               validate :validate_custom_field
+              attr_protected :id
               before_validation :set_searchable
               before_save do |field|
                 values = read_attribute(:possible_values)
                 if values.is_a?(Array)
                   values.each do |value|
-                    value.force_encoding('UTF-8') if value.respond_to?(:force_encoding)
+                    value.force_encoding('UTF-8')
                   end
                   values
                 else
               # to move in project_custom_field
               def self.for_all
-                where(:is_for_all => true).order('position').all
+                where(:is_for_all => true).order('position').to_a
               end
               def type_name

app/models/custom_value.rb +1 0

             class CustomValue < ActiveRecord::Base
               belongs_to :custom_field
               belongs_to :customized, :polymorphic => true
+              attr_protected :id
               def initialize(attributes=nil, *args)
                 super

app/models/document.rb +7 -3

               belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
               acts_as_attachable :delete_permission => :delete_documents
-              acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
+              acts_as_searchable :columns => ['title', "#{table_name}.description"],
+                                 :scope => preload(:project)
               acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                             :author => Proc.new {|o| o.attachments.reorder("#{Attachment.table_name}.created_on ASC").first.try(:author) },
                             :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
-              acts_as_activity_provider :find_options => {:include => :project}
+              acts_as_activity_provider :scope => preload(:project)
               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60
+              attr_protected :id
               after_create :send_notification
               scope :visible, lambda {|*args|
-                includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_documents, *args))
+                joins(:project).
+                references(:project).
+                where(Project.allowed_to_condition(args.shift || User.current, :view_documents, *args))
               }
               safe_attributes 'category_id', 'title', 'description'

app/models/enabled_module.rb +1 0

               validates_presence_of :name
               validates_uniqueness_of :name, :scope => :project_id
+              attr_protected :id
               after_create :module_enabled

app/models/enumeration.rb +1 -1

             class Enumeration < ActiveRecord::Base
               include Redmine::SubclassFactory
-              default_scope :order => "#{Enumeration.table_name}.position ASC"
+              default_scope lambda {order("#{Enumeration.table_name}.position ASC")}
               belongs_to :project

app/models/group.rb +3 -5

               validates_presence_of :lastname
               validates_uniqueness_of :lastname, :case_sensitive => false
               validates_length_of :lastname, :maximum => 255
+              attr_protected :id
               before_destroy :remove_references_before_destroy
               def user_removed(user)
                 members.each do |member|
                   MemberRole.
-                    includes(:member).
+                    joins(:member).
+                    references(:member).
                     where("#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids).
                     each(&:destroy)
                 end
                 super(attr_name, *args)
               end
-              def self.builtin_id(arg)
-                (arg.anonymous? ? GroupAnonymous : GroupNonMember).instance_id
-              end
               def self.anonymous
                 GroupAnonymous.load_instance
               end

app/models/group_anonymous.rb 0 -4

               def builtin_type
                 "anonymous"
               end
-              def self.instance_id
-                @@instance_id ||= load_instance.id
-              end
             end

app/models/group_builtin.rb +1 -1

               class << self
                 def load_instance
                   return nil if self == GroupBuiltin
-                  instance = first(:order => 'id') || create_instance
+                  instance = order('id').first || create_instance
                 end
                 def create_instance

app/models/group_non_member.rb 0 -4

               def builtin_type
                 "non_member"
               end
-              def self.instance_id
-                @@instance_id ||= load_instance.id
-              end
             end

app/models/issue.rb +50 -25

               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :visible_journals,
+                lambda {where(["(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(User.current, :view_private_notes)}))", false])},
                 :class_name => 'Journal',
-                :as => :journalized,
+                :as => :journalized
-                :conditions => Proc.new {
-                  ["(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(User.current, :view_private_notes)}))", false]
-                },
-                :readonly => true
               has_many :time_entries, :dependent => :destroy
-              has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC"
+              has_and_belongs_to_many :changesets, lambda {order("#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC")}
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
-                                 :include => [:project, :visible_journals],
                                  # sort by id so that limited eager loading doesn't break with postgresql
-                                 :order_column => "#{table_name}.id"
+                                 :order_column => "#{table_name}.id",
+                                 :scope => lambda { joins(:project).
+                                                    joins("LEFT OUTER JOIN #{Journal.table_name} ON #{Journal.table_name}.journalized_type='Issue'" +
+                                                          " AND #{Journal.table_name}.journalized_id = #{Issue.table_name}.id" +
+                                                          " AND (#{Journal.table_name}.private_notes = #{connection.quoted_false}" +
+                                                                " OR (#{Project.allowed_to_condition(User.current, :view_private_notes)}))") }
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},
                             :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
-              acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
+              acts_as_activity_provider :scope => preload(:project, :author, :tracker),
                                         :author_key => :author_id
               DONE_RATIO_OPTIONS = %w(issue_field issue_status)
               validates :start_date, :date => true
               validates :due_date, :date => true
               validate :validate_issue, :validate_required_fields
+              attr_protected :id
               scope :visible, lambda {|*args|
-                includes(:project).where(Issue.visible_condition(args.shift || User.current, *args))
+                joins(:project).
+                references(:project).
+                where(Issue.visible_condition(args.shift || User.current, *args))
               }
               scope :open, lambda {|*args|
                 is_closed = args.size > 0 ? !args.first : false
-                includes(:status).where("#{IssueStatus.table_name}.is_closed = ?", is_closed)
+                joins(:status).
+                references(:status).
+                where("#{IssueStatus.table_name}.is_closed = ?", is_closed)
               }
               scope :recently_updated, lambda { order("#{Issue.table_name}.updated_on DESC") }
               scope :on_active_project, lambda {
-                includes(:status, :project, :tracker).where("#{Project.table_name}.status = ?", Project::STATUS_ACTIVE)
+                joins(:project).
+                references(:project).
+                where("#{Project.table_name}.status = ?", Project::STATUS_ACTIVE)
               }
               scope :fixed_version, lambda {|versions|
                 ids = [versions].flatten.compact.map {|v| v.is_a?(Version) ? v.id : v}
               # Returns a SQL conditions string used to find all issues visible by the specified user
               def self.visible_condition(user, options={})
                 Project.allowed_to_condition(user, :view_issues, options) do |role, user|
-                  if user.logged?
+                  if user.id && user.logged?
                     case role.issues_visibility
                     when 'all'
                       nil
               # Do not redefine alias chain on reload (see #4838)
               alias_method_chain(:assign_attributes, :project_and_tracker_first) unless method_defined?(:assign_attributes_without_project_and_tracker_first)
+              def attributes=(new_attributes)
+                assign_attributes new_attributes
+              end
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               def safe_attributes=(attrs, user=User.current)
                 return unless attrs.is_a?(Hash)
-                attrs = attrs.dup
+                attrs = attrs.deep_dup
                 # Project and Tracker must be set before since new_statuses_allowed_to depends on it.
                 if (p = attrs.delete('project_id')) && safe_attribute?('project_id')
                 if attrs['custom_field_values'].present?
                   editable_custom_field_ids = editable_custom_field_values(user).map {|v| v.custom_field_id.to_s}
-                  # TODO: use #select when ruby1.8 support is dropped
+                  attrs['custom_field_values'].select! {|k, v| editable_custom_field_ids.include?(k.to_s)}
-                  attrs['custom_field_values'] = attrs['custom_field_values'].reject {|k, v| !editable_custom_field_ids.include?(k.to_s)}
                 end
                 if attrs['custom_fields'].present?
                   editable_custom_field_ids = editable_custom_field_values(user).map {|v| v.custom_field_id.to_s}
-                  # TODO: use #select when ruby1.8 support is dropped
+                  attrs['custom_fields'].select! {|c| editable_custom_field_ids.include?(c['id'].to_s)}
-                  attrs['custom_fields'] = attrs['custom_fields'].reject {|c| !editable_custom_field_ids.include?(c['id'].to_s)}
                 end
                 # mass-assignment security bypass
               def assignable_versions
                 return @assignable_versions if @assignable_versions
-                versions = project.shared_versions.open.all
+                versions = project.shared_versions.open.to_a
                 if fixed_version
                   if fixed_version_id_changed?
                     # nothing to do
                 if issues.any?
                   issue_ids = issues.map(&:id)
                   # Relations with issue_from in given issues and visible issue_to
-                  relations_from = IssueRelation.includes(:issue_to => [:status, :project]).where(visible_condition(user)).where(:issue_from_id => issue_ids).all
+                  relations_from = IssueRelation.joins(:issue_to => :project).
+                                     references(:issue_to => :project).
+                                     where(visible_condition(user)).where(:issue_from_id => issue_ids).to_a
                   # Relations with issue_to in given issues and visible issue_from
-                  relations_to = IssueRelation.includes(:issue_from => [:status, :project]).where(visible_condition(user)).where(:issue_to_id => issue_ids).all
+                  relations_to = IssueRelation.joins(:issue_from => :project).
+                                     references(:issue_from => :project).
+                                     where(visible_condition(user)).
+                                     where(:issue_to_id => issue_ids).to_a
                   issues.each do |issue|
                     relations =
                       relations_from.select {|relation| relation.issue_from_id == issue.id} +
               def parent_issue_id=(arg)
                 s = arg.to_s.strip.presence
                 if s && (m = s.match(%r{\A#?(\d+)\z})) && (@parent_issue = Issue.find_by_id(m[1]))
+                  @parent_issue.id
                   @invalid_parent_issue_id = nil
                 elsif s.blank?
                   @parent_issue = nil
                     self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id)
                     cond = ["root_id = ? AND lft >= ? AND rgt <= ? ", old_root_id, lft, rgt]
                     self.class.base_class.select('id').lock(true).where(cond)
-                    offset = right_most_bound + 1 - lft
+                    offset = rdm_right_most_bound + 1 - lft
                     Issue.where(cond).
                       update_all(["root_id = ?, lft = lft + ?, rgt = rgt + ?", root_id, offset, offset])
                   end
                 recalculate_attributes_for(former_parent_id) if former_parent_id
               end
+              def rdm_right_most_bound
+                right_most_node =
+                  self.class.base_class.unscoped.
+                    order("#{quoted_right_column_full_name} desc").limit(1).lock(true).first
+                  right_most_node ? (right_most_node[right_column_name] || 0 ) : 0
+              end
+              private :rdm_right_most_bound
               def update_parent_attributes
                 recalculate_attributes_for(parent_id) if parent_id
               end
                       end
                       done = p.leaves.joins(:status).
                         sum("COALESCE(CASE WHEN estimated_hours > 0 THEN estimated_hours ELSE NULL END, #{average}) " +
-                            "* (CASE WHEN is_closed = #{connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)").to_f
+                            "* (CASE WHEN is_closed = #{self.class.connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)").to_f
                       progress = done / (average * leaves_count)
                       p.done_ratio = progress.round
                     end
               def self.update_versions(conditions=nil)
                 # Only need to update issues with a fixed_version from
                 # a different project and that is not systemwide shared
-                Issue.includes(:project, :fixed_version).
+                Issue.joins(:project, :fixed_version).
+                  references(:version, :fixed_version).
                   where("#{Issue.table_name}.fixed_version_id IS NOT NULL" +
                     " AND #{Issue.table_name}.project_id <> #{Version.table_name}.project_id" +
                     " AND #{Version.table_name}.sharing <> 'system'").

app/models/issue_category.rb +1 0

               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_length_of :name, :maximum => 30
+              attr_protected :id
               safe_attributes 'name', 'assigned_to_id'

app/models/issue_custom_field.rb +1 -1

                 sql = super
                 id_column ||= id
                 tracker_condition = "#{Issue.table_name}.tracker_id IN (SELECT tracker_id FROM #{table_name_prefix}custom_fields_trackers#{table_name_suffix} WHERE custom_field_id = #{id_column})"
-                project_condition = "EXISTS (SELECT 1 FROM #{CustomField.table_name} ifa WHERE ifa.is_for_all = #{connection.quoted_true} AND ifa.id = #{id_column})" +
+                project_condition = "EXISTS (SELECT 1 FROM #{CustomField.table_name} ifa WHERE ifa.is_for_all = #{self.class.connection.quoted_true} AND ifa.id = #{id_column})" +
                   " OR #{Issue.table_name}.project_id IN (SELECT project_id FROM #{table_name_prefix}custom_fields_projects#{table_name_suffix} WHERE custom_field_id = #{id_column})"
                 "((#{sql}) AND (#{tracker_condition}) AND (#{project_condition}))"

app/models/issue_query.rb +19 -15

               scope :visible, lambda {|*args|
                 user = args.shift || User.current
                 base = Project.allowed_to_condition(user, :view_issues, *args)
-                scope = includes(:project).where("#{table_name}.project_id IS NULL OR (#{base})")
+                scope = joins("LEFT OUTER JOIN #{Project.table_name} ON #{table_name}.project_id = #{Project.table_name}.id").
+                  references(:project).
+                  where("#{table_name}.project_id IS NULL OR (#{base})")
                 if user.admin?
                   scope.where("#{table_name}.visibility <> ? OR #{table_name}.user_id = ?", VISIBILITY_PRIVATE, user.id)
                 if project
                   principals += project.principals.sort
                   unless project.leaf?
-                    subprojects = project.descendants.visible.all
+                    subprojects = project.descendants.visible.to_a
                     principals += Principal.member_of(subprojects)
                   end
-                  versions = project.shared_versions.all
+                  versions = project.shared_versions.to_a
-                  categories = project.issue_categories.all
+                  categories = project.issue_categories.to_a
                   issue_custom_fields = project.all_issue_custom_fields
                 else
                   if all_projects.any?
                     principals += Principal.member_of(all_projects)
                   end
-                  versions = Version.visible.where(:sharing => 'system').all
+                  versions = Version.visible.where(:sharing => 'system').to_a
                   issue_custom_fields = IssueCustomField.where(:is_for_all => true)
                 end
                 principals.uniq!
                   scope = scope.preload(:author)
                 end
-                issues = scope.all
+                issues = scope.to_a
                 if has_column?(:spent_hours)
                   Issue.load_visible_spent_hours(issues)
                   joins(:status, :project).
                   where(statement).
                   includes(([:status, :project] + (options[:include] || [])).uniq).
+                  references(([:status, :project] + (options[:include] || [])).uniq).
                   where(options[:conditions]).
                   order(order_option).
                   joins(joins_for_order_statement(order_option.join(','))).
                   limit(options[:limit]).
                   offset(options[:offset]).
-                  find_ids
+                  pluck(:id)
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
                   limit(options[:limit]).
                   offset(options[:offset]).
                   preload(:details, :user, {:issue => [:project, :author, :tracker, :status]}).
-                  all
+                  to_a
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
                   where(project_statement).
                   where(options[:conditions]).
                   includes(:project).
-                  all
+                  references(:project).
+                  to_a
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
                   groups = Group.givable
                   operator = '!' # Override the operator since we want to find by assigned_to
                 else
-                  groups = Group.where(:id => value).all
+                  groups = Group.where(:id => value).to_a
                 end
                 groups ||= []
                     " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id))"
                 when "=", "!"
                   role_cond = value.any? ?
-                    "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")" :
+                    "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{self.class.connection.quote_string(val)}'"}.join(",") + ")" :
                     "1=0"
                   sw = operator == "!" ? 'NOT' : ''
               def sql_for_is_private_field(field, operator, value)
                 op = (operator == "=" ? 'IN' : 'NOT IN')
-                va = value.map {|v| v == '0' ? connection.quoted_false : connection.quoted_true}.uniq.join(',')
+                va = value.map {|v| v == '0' ? self.class.connection.quoted_false : self.class.connection.quoted_true}.uniq.join(',')
                 "#{Issue.table_name}.is_private #{op} (#{va})"
               end
                 sql = case operator
                   when "*", "!*"
                     op = (operator == "*" ? 'IN' : 'NOT IN')
-                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}')"
+                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{self.class.connection.quote_string(relation_type)}')"
                   when "=", "!"
                     op = (operator == "=" ? 'IN' : 'NOT IN')
-                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = #{value.first.to_i})"
+                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{self.class.connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = #{value.first.to_i})"
                   when "=p", "=!p", "!p"
                     op = (operator == "!p" ? 'NOT IN' : 'IN')
                     comp = (operator == "=!p" ? '<>' : '=')
-                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{comp} #{value.first.to_i})"
+                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{self.class.connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{comp} #{value.first.to_i})"
                   end
                 if relation_options[:sym] == field && !options[:reverse]

app/models/issue_status.rb +2 -1

               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
+              attr_protected :id
               scope :sorted, lambda { order("#{table_name}.position ASC") }
               scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
                     includes(:new_status).
                     where(["role_id IN (:role_ids) AND tracker_id = :tracker_id AND (#{conditions})",
                       {:role_ids => roles.collect(&:id), :tracker_id => tracker.id, :true => true, :false => false}
-                      ]).all.
+                      ]).to_a.
                     map(&:new_status).compact.sort
                 else
                   []

app/models/journal.rb +7 -5

               belongs_to :user
               has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
               attr_accessor :indice
+              attr_protected :id
               acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                             :description => :notes,
               acts_as_activity_provider :type => 'issues',
                                         :author_key => :user_id,
-                                        :find_options => {:include => [{:issue => :project}, :details, :user],
+                                        :scope => preload({:issue => :project}, :user).
-                                                          :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
+                                                  joins("LEFT OUTER JOIN #{JournalDetail.table_name} ON #{JournalDetail.table_name}.journal_id = #{Journal.table_name}.id").
-                                                                         " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
+                                                  where("#{Journal.table_name}.journalized_type = 'Issue' AND" +
+                                                        " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')")
               before_create :split_private_notes
               after_create :send_notification
               scope :visible, lambda {|*args|
                 user = args.shift || User.current
+                joins(:issue => :project).
-                includes(:issue => :project).
+                references(:project).
                   where(Issue.visible_condition(user, *args)).
                   where("(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(user, :view_private_notes, *args)}))", false)
               }

app/models/journal_detail.rb +1 0

             class JournalDetail < ActiveRecord::Base
               belongs_to :journal
               before_save :normalize_values
+              attr_protected :id
               def custom_field
                 if property == 'cf'

app/models/mail_handler.rb +2 -2

                 @@handler_options[:no_notification] = (@@handler_options[:no_notification].to_s == '1')
                 @@handler_options[:no_permission_check] = (@@handler_options[:no_permission_check].to_s == '1')
-                email.force_encoding('ASCII-8BIT') if email.respond_to?(:force_encoding)
+                email.force_encoding('ASCII-8BIT')
                 super(email)
               end
                         end
                 parts.reject! do |part|
-                  part.header[:content_disposition].try(:disposition_type) == 'attachment'
+                  part.attachment?
                 end
                 @plain_text_body = parts.map do |p|

app/models/member.rb +1 0

               validates_presence_of :principal, :project
               validates_uniqueness_of :user_id, :scope => :project_id
               validate :validate_role
+              attr_protected :id
               before_destroy :set_issue_category_nil

app/models/member_role.rb +1 0

               validates_presence_of :role
               validate :validate_role_member
+              attr_protected :id
               def validate_role_member
                 errors.add :role_id, :invalid if role && !role.member?

app/models/message.rb +6 -3

               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               acts_as_attachable
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
+              attr_protected :id
               acts_as_searchable :columns => ['subject', 'content'],
-                                 :include => {:board => :project},
+                                 :scope => preload(:board => :project),
                                  :project_key => "#{Board.table_name}.project_id",
                                  :date_column => "#{table_name}.created_on"
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
                                                                                                                                                    {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"})}
-              acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
+              acts_as_activity_provider :scope => preload({:board => :project}, :author),
                                         :author_key => :author_id
               acts_as_watchable
               after_create :send_notification
               scope :visible, lambda {|*args|
-                includes(:board => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
+                joins(:board => :project).
+                references(:board => :project).
+                where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
               }
               safe_attributes 'subject', 'content'

app/models/news.rb +9 -5

               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-              has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
+              has_many :comments, lambda {order("created_on")}, :as => :commented, :dependent => :delete_all
               validates_presence_of :title, :description
               validates_length_of :title, :maximum => 60
               validates_length_of :summary, :maximum => 255
+              attr_protected :id
               acts_as_attachable :delete_permission => :manage_news
-              acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
+              acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"],
+                                 :scope => preload(:project)
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
-              acts_as_activity_provider :find_options => {:include => [:project, :author]},
+              acts_as_activity_provider :scope => preload(:project, :author),
                                         :author_key => :author_id
               acts_as_watchable
               after_create :send_notification
               scope :visible, lambda {|*args|
-                includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
+                joins(:project).
+                references([:author, :project]).
+                where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
               }
               safe_attributes 'title', 'summary', 'description'
               # returns latest news for projects visible by user
               def self.latest(user = User.current, count = 5)
-                visible(user).includes([:author, :project]).order("#{News.table_name}.created_on DESC").limit(count).all
+                visible(user).joins([:author, :project]).order("#{News.table_name}.created_on DESC").limit(count).to_a
               end
               private

app/models/principal.rb +9 -7

               STATUS_LOCKED     = 3
               has_many :members, :foreign_key => 'user_id', :dependent => :destroy
-              has_many :memberships, :class_name => 'Member',
+              has_many :memberships,
-                       :foreign_key => 'user_id',
+                       lambda {preload(:project, :roles).
-                       :include => [:project, :roles],
+                               joins(:project).
-                       :conditions => "#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}",
+                               where("#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}").
-                       :order => "#{Project.table_name}.name"
+                               order("#{Project.table_name}.name")},
+                       :class_name => 'Member',
+                       :foreign_key => 'user_id'
               has_many :projects, :through => :memberships
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               # Principals that are members of a collection of projects
               scope :member_of, lambda {|projects|
-                projects = [projects] unless projects.is_a?(Array)
+                projects = [projects] if projects.is_a?(Project)
-                if projects.empty?
+                if projects.blank?
                   where("1=0")
                 else
                   ids = projects.map(&:id)

app/models/project.rb +38 -28

               # Specific overridden Activities
               has_many :time_entry_activities
-              has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
+              has_many :members,
+                       lambda { joins(:principal, :roles).
+                                references(:principal, :roles).
+                                where("#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}") }
               has_many :memberships, :class_name => 'Member'
-              has_many :member_principals, :class_name => 'Member',
+              has_many :member_principals,
-                                           :include => :principal,
+                       lambda { joins(:principal).
-                                           :conditions => "#{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
+                                references(:principal).
+                                where("#{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}")},
+                :class_name => 'Member'
               has_many :enabled_modules, :dependent => :delete_all
-              has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
+              has_and_belongs_to_many :trackers, lambda {order("#{Tracker.table_name}.position")}
-              has_many :issues, :dependent => :destroy, :include => [:status, :tracker]
+              has_many :issues, :dependent => :destroy
               has_many :issue_changes, :through => :issues, :source => :journals
-              has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
+              has_many :versions, lambda {order("#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC")}, :dependent => :destroy
               has_many :time_entries, :dependent => :destroy
               has_many :queries, :class_name => 'IssueQuery', :dependent => :delete_all
               has_many :documents, :dependent => :destroy
-              has_many :news, :dependent => :destroy, :include => :author
+              has_many :news, lambda {includes(:author)}, :dependent => :destroy
-              has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
+              has_many :issue_categories, lambda {order("#{IssueCategory.table_name}.name")}, :dependent => :delete_all
-              has_many :boards, :dependent => :destroy, :order => "position ASC"
+              has_many :boards, lambda {order("position ASC")}, :dependent => :destroy
-              has_one :repository, :conditions => ["is_default = ?", true]
+              has_one :repository, lambda {where(["is_default = ?", true])}
               has_many :repositories, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               # Custom field for the project issues
               has_and_belongs_to_many :issue_custom_fields,
+                                      lambda {order("#{CustomField.table_name}.position")},
                                       :class_name => 'IssueCustomField',
-                                      :order => "#{CustomField.table_name}.position",
                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
                 if !initialized.key?('trackers') && !initialized.key?('tracker_ids')
                   default = Setting.default_projects_tracker_ids
                   if default.is_a?(Array)
-                    self.trackers = Tracker.where(:id => default.map(&:to_i)).sorted.all
+                    self.trackers = Tracker.where(:id => default.map(&:to_i)).sorted.to_a
                   else
-                    self.trackers = Tracker.sorted.all
+                    self.trackers = Tracker.sorted.to_a
                   end
                 end
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
-                visible(user).limit(count).order("created_on DESC").all
+                visible(user).limit(count).order("created_on DESC").to_a
               end
               # Returns true if the project is visible to +user+ or to the current user.
               end
               def override_roles(role)
-                @override_members ||= memberships.where(:user_id => [GroupAnonymous.instance_id, GroupNonMember.instance_id]).all
+                group_class = role.anonymous? ? GroupAnonymous : GroupNonMember
-                member = @override_members.detect {|m| role.anonymous? ^ (m.user_id == GroupNonMember.instance_id)}
+                member = member_principals.where("#{Principal.table_name}.type = ?", group_class.name).first
-                member ? member.roles : [role]
+                member ? member.roles.to_a : [role]
               end
               def principals
               # by the current user
               def allowed_parents
                 return @allowed_parents if @allowed_parents
-                @allowed_parents = Project.where(Project.allowed_to_condition(User.current, :add_subprojects)).all
+                @allowed_parents = Project.where(Project.allowed_to_condition(User.current, :add_subprojects)).to_a
                 @allowed_parents = @allowed_parents - self_and_descendants
                 if User.current.allowed_to?(:add_project, nil, :global => true) || (!new_record? && parent.nil?)
                   @allowed_parents << nil
                 @rolled_up_trackers ||=
                   Tracker.
                     joins(:projects).
+                    references(:project).
                     joins("JOIN #{EnabledModule.table_name} ON #{EnabledModule.table_name}.project_id = #{Project.table_name}.id AND #{EnabledModule.table_name}.name = 'issue_tracking'").
                     select("DISTINCT #{Tracker.table_name}.*").
                     where("#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status <> #{STATUS_ARCHIVED}", lft, rgt).
                     sorted.
-                    all
+                    to_a
               end
               # Closes open and locked project versions that are completed
               def rolled_up_versions
                 @rolled_up_versions ||=
                   Version.
-                    includes(:project).
+                    joins(:project).
+                    references(:project).
                     where("#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status <> ?", lft, rgt, STATUS_ARCHIVED)
               end
               def shared_versions
                 if new_record?
                   Version.
-                    includes(:project).
+                    joins(:project).
+                    references(:project).
+                    preload(:project).
                     where("#{Project.table_name}.status <> ? AND #{Version.table_name}.sharing = 'system'", STATUS_ARCHIVED)
                 else
                   @shared_versions ||= begin
                     r = root? ? self : root
                     Version.
-                      includes(:project).
+                      joins(:project).
+                      references(:project).
+                      preload(:project).
                       where("#{Project.table_name}.id = #{id}" +
                               " OR (#{Project.table_name}.status <> #{Project::STATUS_ARCHIVED} AND (" +
                                 " #{Version.table_name}.sharing = 'system'" +
               # Deletes all project's members
               def delete_all_members
                 me, mr = Member.table_name, MemberRole.table_name
-                connection.delete("DELETE FROM #{mr} WHERE #{mr}.member_id IN (SELECT #{me}.id FROM #{me} WHERE #{me}.project_id = #{id})")
+                self.class.connection.delete("DELETE FROM #{mr} WHERE #{mr}.member_id IN (SELECT #{me}.id FROM #{me} WHERE #{me}.project_id = #{id})")
                 Member.delete_all(['project_id = ?', id])
               end
                 project = project.is_a?(Project) ? project : Project.find(project)
                 to_be_copied = %w(wiki versions issue_categories issues members queries boards)
-                to_be_copied = to_be_copied & options[:only].to_a unless options[:only].nil?
+                to_be_copied = to_be_copied & Array.wrap(options[:only]) unless options[:only].nil?
                 Project.transaction do
                   if save
                     save
                   end
                 end
+                true
               end
               # Returns a new unsaved Project instance with attributes copied from +project+
               def copy_queries(project)
                 project.queries.each do |query|
                   new_query = IssueQuery.new
-                  new_query.attributes = query.attributes.dup.except("id", "project_id", "sort_criteria", "user_id", "type")
+                  new_query.attributes = query.attributes.dup.except("id", "project_id", "sort_criteria")
                   new_query.sort_criteria = query.sort_criteria if query.sort_criteria
                   new_query.project = self
                   new_query.user_id = query.user_id
-                  new_query.role_ids = query.role_ids if query.visibility == IssueQuery::VISIBILITY_ROLES
                   self.queries << new_query
                 end
               end

app/models/query.rb +10 -10

               end
               def trackers
-                @trackers ||= project.nil? ? Tracker.sorted.all : project.rolled_up_trackers
+                @trackers ||= project.nil? ? Tracker.sorted.to_a : project.rolled_up_trackers
               end
               # Returns a hash of localized labels for all filter operators
               end
               def all_projects
-                @all_projects ||= Project.visible.all
+                @all_projects ||= Project.visible.to_a
               end
               def all_projects_values
                         sql = "#{db_table}.#{db_field} BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5}"
                       end
                     else
-                      sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
+                      sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{self.class.connection.quote_string(val)}'"}.join(",") + ")"
                     end
                   else
                     # IN an empty set
                   end
                 when "!"
                   if value.any?
-                    sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
+                    sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{self.class.connection.quote_string(val)}'"}.join(",") + "))"
                   else
                     # NOT IN an empty set
                     sql = "1=1"
                     end
                   end
                 when "o"
-                  sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_false})" if field == "status_id"
+                  sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_false})" if field == "status_id"
                 when "c"
-                  sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_true})" if field == "status_id"
+                  sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_true})" if field == "status_id"
                 when "><t-"
                   # between today - n days and today
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0)
                   date = Date.today
                   sql = date_clause(db_table, db_field, date.beginning_of_year, date.end_of_year)
                 when "~"
-                  sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
+                  sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{self.class.connection.quote_string(value.first.to_s.downcase)}%'"
                 when "!~"
-                  sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
+                  sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{self.class.connection.quote_string(value.first.to_s.downcase)}%'"
                 else
                   raise "Unknown query operator #{operator}"
                 end
                   if self.class.default_timezone == :utc
                     from = from.utc
                   end
-                  s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from)])
+                  s << ("#{table}.#{field} > '%s'" % [self.class.connection.quoted_date(from)])
                 end
                 if to
                   if to.is_a?(Date)
                   if self.class.default_timezone == :utc
                     to = to.utc
                   end
-                  s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to)])
+                  s << ("#{table}.#{field} <= '%s'" % [self.class.connection.quoted_date(to)])
                 end
                 s.join(' AND ')
               end

app/models/repository.rb +9 -7

               IDENTIFIER_MAX_LENGTH = 255
               belongs_to :project
-              has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
+              has_many :changesets, lambda{order("#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC")}
               has_many :filechanges, :class_name => 'Change', :through => :changesets
               serialize :extra_info
               validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :allow_blank => true
               # Checks if the SCM is enabled when creating a repository
               validate :repo_create_validation, :on => :create
+              attr_protected :id
               safe_attributes 'identifier',
                 'login',
                     reorder("#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC").
                     limit(limit).
                     preload(:user).
-                    all
+                    to_a
                 else
                   filechanges.
                     where("path = ?", path.with_leading_slash).
                   return @found_committer_users[committer] if @found_committer_users.has_key?(committer)
                   user = nil
-                  c = changesets.where(:committer => committer).includes(:user).first
+                  c = changesets.where(:committer => committer).
+                        includes(:user).references(:user).first
                   if c && c.user
                     user = c.user
                   elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
                 ci = "#{table_name_prefix}changesets_issues#{table_name_suffix}"
                 cp = "#{table_name_prefix}changeset_parents#{table_name_suffix}"
-                connection.delete("DELETE FROM #{ch} WHERE #{ch}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
+                self.class.connection.delete("DELETE FROM #{ch} WHERE #{ch}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
-                connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
+                self.class.connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
-                connection.delete("DELETE FROM #{cp} WHERE #{cp}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
+                self.class.connection.delete("DELETE FROM #{cp} WHERE #{cp}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
-                connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
+                self.class.connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
                 clear_extra_info_of_changesets
               end

app/models/repository/cvs.rb +1 -1

                 # Need to retrieve existing revision numbers to sort them as integers
                 sql = "SELECT revision FROM #{Changeset.table_name} "
                 sql << "WHERE repository_id = #{id} AND revision NOT LIKE 'tmp%'"
-                @current_revision_number ||= (connection.select_values(sql).collect(&:to_i).max || 0)
+                @current_revision_number ||= (self.class.connection.select_values(sql).collect(&:to_i).max || 0)
                 @current_revision_number += 1
               end
             end

app/models/repository/git.rb +1 -1

               def latest_changesets(path,rev,limit=10)
                 revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
                 return [] if revisions.nil? || revisions.empty?
-                changesets.where(:scmid => revisions.map {|c| c.scmid}).all
+                changesets.where(:scmid => revisions.map {|c| c.scmid}).to_a
               end
               def clear_extra_info_of_changesets

app/models/repository/mercurial.rb +3 -2

             class Repository::Mercurial < Repository
               # sort changesets by revision number
               has_many :changesets,
-                       :order       => "#{Changeset.table_name}.id DESC",
+                       lambda {order("#{Changeset.table_name}.id DESC")},
                        :foreign_key => 'repository_id'
               attr_protected        :root_url
                 changesets.
                   includes(:user).
                   where(latest_changesets_cond(path, rev, limit)).
+                  references(:user).
                   limit(limit).
                   order("#{Changeset.table_name}.id DESC").
-                  all
+                  to_a
               end
               def is_short_id_in_db?

app/models/repository/subversion.rb +1 -1

                 revisions = scm.revisions(path, rev, nil, :limit => limit)
                 if revisions
                   identifiers = revisions.collect(&:identifier).compact
-                  changesets.where(:revision => identifiers).reorder("committed_on DESC").includes(:repository, :user).all
+                  changesets.where(:revision => identifiers).reorder("committed_on DESC").includes(:repository, :user).to_a
                 else
                   []
                 end

app/models/role.rb +1 -1

               # Find all the roles that can be given to a project member
               def self.find_all_givable
-                Role.givable.all
+                Role.givable.to_a
               end
               # Return the builtin 'non member' role.  If the role doesn't exist,

app/models/setting.rb +2 0

               validates_numericality_of :value, :only_integer => true, :if => Proc.new { |setting|
                 (s = @@available_settings[setting.name]) && s['format'] == 'int'
               }
+              attr_protected :id
               # Hash used to cache setting values
               @cached_settings = {}
               def self.set_from_params(name, params)
                 params = params.dup
                 params.delete_if {|v| v.blank? } if params.is_a?(Array)
+                params.symbolize_keys! if params.is_a?(Hash)
                 m = "#{name}_from_params"
                 if respond_to? m

app/models/time_entry.rb +10 -4

               acts_as_activity_provider :timestamp => "#{table_name}.created_on",
                                         :author_key => :user_id,
-                                        :find_options => {:include => :project}
+                                        :scope => preload(:project)
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validate :validate_time_entry
               scope :visible, lambda {|*args|
-                includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args))
+                joins(:project).
+                references(:project).
+                where(Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args))
               }
               scope :on_issue, lambda {|issue|
-                includes(:issue).where("#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}")
+                joins(:issue).
+                references(:issue).
+                where("#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}")
               }
               scope :on_project, lambda {|project, include_subprojects|
-                includes(:project).where(project.project_condition(include_subprojects))
+                joins(:project).
+                references(:project).
+                where(project.project_condition(include_subprojects))
               }
               scope :spent_between, lambda {|from, to|
                 if from && to

app/models/time_entry_query.rb +3 -2

                 if project
                   principals += project.principals.sort
                   unless project.leaf?
-                    subprojects = project.descendants.visible.all
+                    subprojects = project.descendants.visible.to_a
                     if subprojects.any?
                       add_available_filter "subproject_id",
                         :type => :list_subprojects,
                   where(statement).
                   order(order_option).
                   joins(joins_for_order_statement(order_option.join(','))).
-                  includes(:activity)
+                  includes(:activity).
+                  references(:activity)
               end
               def sql_for_activity_id_field(field, operator, value)

app/models/token.rb +1 0

             class Token < ActiveRecord::Base
               belongs_to :user
               validates_uniqueness_of :value
+              attr_protected :id
               before_create :delete_previous_tokens, :generate_new_token

app/models/tracker.rb +2 -2

                         connection.select_rows("SELECT DISTINCT old_status_id, new_status_id FROM #{WorkflowTransition.table_name} WHERE tracker_id = #{id} AND type = 'WorkflowTransition'").
                         flatten.
                         uniq
-                @issue_statuses = IssueStatus.where(:id => ids).all.sort
+                @issue_statuses = IssueStatus.where(:id => ids).to_a.sort
               end
               def disabled_core_fields
               # Returns the fields that are disabled for all the given trackers
               def self.disabled_core_fields(trackers)
                 if trackers.present?
-                  trackers.uniq.map(&:disabled_core_fields).reduce(:&)
+                  trackers.map(&:disabled_core_fields).reduce(:&)
                 else
                   []
                 end

app/models/user.rb +26 -9

                                       :after_remove => Proc.new {|user, group| group.user_removed(user)}
               has_many :changesets, :dependent => :nullify
               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
-              has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
+              has_one :rss_token, lambda {where "action='feeds'"}, :class_name => 'Token'
-              has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
+              has_one :api_token, lambda {where "action='api'"}, :class_name => 'Token'
               belongs_to :auth_source
               scope :logged, lambda { where("#{User.table_name}.status <> #{STATUS_ANONYMOUS}") }
               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
               validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
-              validates_confirmation_of :password, :allow_nil => true
               validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
               validate :validate_password_length
+              validate do
+                if password_confirmation && password != password_confirmation
+                  errors.add(:password, :confirmation)
+                end
+              end
               before_create :set_mail_notification
               before_save   :generate_password_if_needed, :update_hashed_password
                 write_attribute(:mail, arg.to_s.strip)
               end
+              def self.find_or_initialize_by_identity_url(url)
+                user = where(:identity_url => url).first
+                unless user
+                  user = User.new
+                  user.identity_url = url
+                end
+                user
+              end
               def identity_url=(url)
                 if url.blank?
                   write_attribute(:identity_url, '')
                 hash = Hash.new([])
-                members = Member.joins(:project).
+                group_class = anonymous? ? GroupAnonymous : GroupNonMember
+                members = Member.joins(:project, :principal).
                   where("#{Project.table_name}.status <> 9").
-                  where("#{Member.table_name}.user_id = ? OR (#{Project.table_name}.is_public = ? AND #{Member.table_name}.user_id = ?)", self.id, true, Group.builtin_id(self)).
+                  where("#{Member.table_name}.user_id = ? OR (#{Project.table_name}.is_public = ? AND #{Principal.table_name}.type = ?)", self.id, true, group_class.name).
-                  preload(:project, :roles)
+                  preload(:project, :roles).
+                  to_a
                 members.reject! {|member| member.user_id != id && project_ids.include?(member.project_id)}
                 members.each do |member|
                     # Authorize if user is authorized on every element of the array
                     context.map {|project| allowed_to?(action, project, options, &block)}.reduce(:&)
                   end
+                elsif context
+                  raise ArgumentError.new("#allowed_to? context argument must be a Project, an Array of projects or nil")
                 elsif options[:global]
                   # Admin users are always authorized
                   return true if admin?
                 return if self.id.nil?
                 substitute = User.anonymous
                 Attachment.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
                 Comment.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
                 Issue.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
                 Issue.where(['assigned_to_id = ?', id]).update_all('assigned_to_id = NULL')
                 Journal.where(['user_id = ?', id]).update_all(['user_id = ?', substitute.id])
                 JournalDetail.
                   where(["property = 'attr' AND prop_key = 'assigned_to_id' AND old_value = ?", id.to_s]).
                   update_all(['old_value = ?', substitute.id.to_s])
                 JournalDetail.
                   where(["property = 'attr' AND prop_key = 'assigned_to_id' AND value = ?", id.to_s]).
                   update_all(['value = ?', substitute.id.to_s])
                 Message.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
                 News.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
                 # Remove private queries and keep public ones

app/models/version.rb +4 -6

               validates :effective_date, :date => true
               validates_inclusion_of :status, :in => VERSION_STATUSES
               validates_inclusion_of :sharing, :in => VERSION_SHARINGS
+              attr_protected :id
               scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
               scope :open, lambda { where(:status => 'open') }
               scope :visible, lambda {|*args|
-                includes(:project).where(Project.allowed_to_condition(args.first || User.current, :view_issues))
+                joins(:project).
+                references(:project).
+                where(Project.allowed_to_condition(args.first || User.current, :view_issues))
               }
               safe_attributes 'name',
                 end
               end
-              # Returns true if the version is shared, otherwise false
-              def shared?
-                sharing != 'none'
-              end
               private
               def load_issue_counts

app/models/watcher.rb +1 0

               validates_presence_of :user
               validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
               validate :validate_user
+              attr_protected :id
               # Returns true if at least one object among objects is watched by user
               def self.any_watched?(objects, user)

app/models/wiki.rb +2 -1

             class Wiki < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
-              has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title'
+              has_many :pages, lambda {order('title')}, :class_name => 'WikiPage', :dependent => :destroy
               has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all
               acts_as_watchable
               validates_presence_of :start_page
               validates_format_of :start_page, :with => /\A[^,\.\/\?\;\|\:]*\z/
+              attr_protected :id
               safe_attributes 'start_page'

app/models/wiki_content.rb +9 -8

               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               validates_presence_of :text
               validates_length_of :comments, :maximum => 255, :allow_nil => true
+              attr_protected :id
               acts_as_versioned
                                           :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
                                           :author_key => "#{WikiContent.versioned_table_name}.author_id",
                                           :permission => :view_wiki_edits,
-                                          :find_options => {:select => "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
+                                          :scope => select("#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
-                                                                       "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
+                                                           "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
-                                                                       "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
+                                                           "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
-                                                                       "#{WikiContent.versioned_table_name}.id",
+                                                           "#{WikiContent.versioned_table_name}.id").
-                                                            :joins => "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
+                                                    joins("LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
-                                                                      "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id " +
+                                                          "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id " +
-                                                                      "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"}
+                                                          "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id")
                 after_destroy :page_update_after_destroy
                             # uncompressed data
                             data
                           end
-                    str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
+                    str.force_encoding("UTF-8")
                     str
                   end
                 end

app/models/wiki_page.rb +6 -7

                             :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
               acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"],
-                                 :include => [{:wiki => :project}, :content],
+                                 :scope => preload(:wiki => :project).joins(:content, {:wiki => :project}),
                                  :permission => :view_wiki_pages,
                                  :project_key => "#{Wiki.table_name}.project_id"
               validates_format_of :title, :with => /\A[^,\.\/\?\;\|\s]*\z/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
+              attr_protected :id
               validate :validate_parent_title
               before_destroy :remove_redirects
               def save_with_content(content)
                 ret = nil
                 transaction do
-                  self.content = content
+                  ret = save
-                  if new_record?
+                  if content.text_changed?
-                    # Rails automatically saves associated content
+                    self.content = content
-                    ret = save
+                    ret = ret && content.changed?
-                  else
-                    ret = save && (content.text_changed? ? content.save : true)
                   end
                   raise ActiveRecord::Rollback unless ret
                 end

app/models/wiki_redirect.rb +1 0

               validates_presence_of :title, :redirects_to
               validates_length_of :title, :redirects_to, :maximum => 255
+              attr_protected :id
             end

app/models/workflow_rule.rb +2 -1

               belongs_to :new_status, :class_name => 'IssueStatus', :foreign_key => 'new_status_id'
               validates_presence_of :role, :tracker, :old_status
+              attr_protected :id
               # Copies workflows from source to targets
               def self.copy(source_tracker, source_role, target_trackers, target_roles)
                 target_trackers = [target_trackers].flatten.compact
                 target_roles = [target_roles].flatten.compact
-                target_trackers = Tracker.sorted.all if target_trackers.empty?
+                target_trackers = Tracker.sorted.to_a if target_trackers.empty?
                 target_roles = Role.all if target_roles.empty?
                 target_trackers.each do |target_tracker|

app/models/workflow_transition.rb +1 -1

                 roles = Array.wrap roles
                 transaction do
-                  records = WorkflowTransition.where(:tracker_id => trackers.map(&:id), :role_id => roles.map(&:id)).all
+                  records = WorkflowTransition.where(:tracker_id => trackers.map(&:id), :role_id => roles.map(&:id)).to_a
                   transitions.each do |old_status_id, transitions_by_new_status|
                     transitions_by_new_status.each do |new_status_id, transition_by_rule|

app/views/common/_tabs.html.erb +2 -2

               <% end -%>
               </ul>
               <div class="tabs-buttons" style="display:none;">
-                <button class="tab-left" type="button" onclick="moveTabLeft(this);"></button>
+                <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
-                <button class="tab-right" type="button" onclick="moveTabRight(this);"></button>
+                <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
               </div>
             </div>

app/views/groups/_memberships.html.erb +1 -1

             <% roles = Role.find_all_givable %>
-            <% projects = Project.active.all %>
+            <% projects = Project.active.to_a %>
             <div class="splitcontentleft">
             <% if @group.memberships.any? %>

app/views/projects/settings/_members.html.erb +1 -1

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
-               members = @project.member_principals.includes(:member_roles, :roles, :principal).all.sort %>
+               members = @project.member_principals.includes(:member_roles, :roles, :principal).to_a.sort %>
             <div class="splitcontentleft">
             <% if members.any? %>

app/views/timelog/_form.html.erb +1 -1

                 <% elsif params[:issue_id] %>
                   <%= hidden_field_tag 'issue_id', params[:issue_id] %>
                 <% else %>
-                  <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project, :include_blank => true) %></p>
+                  <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true) %></p>
                 <% end %>
               <% end %>
               <p>

app/views/users/_memberships.html.erb +1 -1

             <% roles = Role.find_all_givable %>
-            <% projects = Project.active.all %>
+            <% projects = Project.active.to_a %>
             <div class="splitcontentleft">
             <% if @user.memberships.any? %>

app/views/wiki/edit.html.erb +1 -1

                   <%= fp.select :parent_id,
                                 content_tag('option', '', :value => '') +
                                    wiki_page_options_for_select(
-                                     @wiki.pages.includes(:parent).all -
+                                     @wiki.pages.includes(:parent).to_a -
                                      @page.self_and_descendants, @page.parent) %>
                 </p>
               <% end %>

app/views/wiki/rename.html.erb +1 -1

             <p><%= f.select :parent_id,
                             content_tag('option', '', :value => '') +
                               wiki_page_options_for_select(
-                                @wiki.pages.includes(:parent).all - @page.self_and_descendants,
+                                @wiki.pages.includes(:parent).to_a - @page.self_and_descendants,
                                 @page.parent),
                             :label => :field_parent_title %></p>
             </div>

config/application.rb +2 -7

             require 'rails/all'
-            if defined?(Bundler)
+            Bundler.require(*Rails.groups)
-              # If you precompile assets before deploying to production, use this line
-              Bundler.require(*Rails.groups(:assets => %w(development test)))
-              # If you want your assets lazily compiled in production, use this line
-              # Bundler.require(:default, :assets, Rails.env)
-            end
             module RedmineApp
               class Application < Rails::Application
                 # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
                 # config.i18n.default_locale = :de
-                I18n.enforce_available_locales = false
+                I18n.enforce_available_locales = true
                 # Configure the default encoding used in templates for Ruby 1.9.
                 config.encoding = "utf-8"

config/boot.rb 0 -2

-            require 'rubygems'
             # Set up gems listed in the Gemfile.
             ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

config/database.yml.example +1 -2

-            # Default setup is given for MySQL with ruby1.9. If you're running Redmine
+            # Default setup is given for MySQL with ruby1.9.
-            # with MySQL and ruby1.8, replace the adapter name with `mysql`.
             # Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
             # Line indentation must be 2 spaces (no tabs).

config/environment.rb +3 -3

-            # Load the rails application
+            # Load the Rails application
             require File.expand_path('../application', __FILE__)
             # Make sure there's no plugin in vendor/plugin before starting
               exit 1
             end
-            # Initialize the rails application
+            # Initialize the Rails application
-            RedmineApp::Application.initialize!
+            Rails.application.initialize!

config/environments/development.rb +10 -8

-            # Settings specified here will take precedence over those in config/application.rb
+            Rails.application.configure do
-            RedmineApp::Application.configure do
+              # Settings specified here will take precedence over those in config/application.rb
               # In the development environment your application's code is reloaded on
               # every request.  This slows down response time but is perfect for development
               # since you don't have to restart the webserver when you make code changes.
-              config.cache_classes     = false
+              config.cache_classes = false
-              # Log error messages when you accidentally call methods on nil.
+              # Do not eager load code on boot.
-              config.whiny_nils        = true
+              config.eager_load = false
               # Show full error reports and disable caching
-              #config.action_controller.consider_all_requests_local = true
+              config.consider_all_requests_local = true
-              config.action_controller.perform_caching             = false
+              config.action_controller.perform_caching = false
-              # Don't care if the mailer can't send
+              # Disable delivery errors
               config.action_mailer.raise_delivery_errors = false
+              # Print deprecation notices to stderr and the Rails logger.
               config.active_support.deprecation = [:stderr, :log]
             end

config/environments/production.rb +13 -21

@@ -1,33 +1,25
1	# Settings specified here will take precedence over those in config/application.rb	1	Rails.application.configure do
2	RedmineApp::Application.configure do	2	# Settings specified here will take precedence over those in config/application.rb
3	# The production environment is meant for finished, "live" apps.	3
4	# Code is not reloaded between requests	4	# Code is not reloaded between requests.
5	config.cache_classes = true	5	config.cache_classes = true
6		6
7	#####	7	# Eager load code on boot. This eager loads most of Rails and
8	# Customize the default logger	8	# your application in memory, allowing both threaded web servers
9	# http://www.ruby-doc.org/stdlib-1.8.7/libdoc/logger/rdoc/Logger.html	9	# and those relying on copy on write to perform better.
10	#	10	# Rake tasks automatically ignore this option for performance.
11	# Use a different logger for distributed setups	11	config.eager_load = true
12	# config.logger = SyslogLogger.new
13	#
14	# Rotate logs bigger than 1MB, keeps no more than 7 rotated logs around.
15	# When setting a new Logger, make sure to set it's log level too.
16	#
17	# config.logger = Logger.new(config.log_path, 7, 1048576)
18	# config.logger.level = Logger::INFO
19		12
20	# Full error reports are disabled and caching is turned on	13	# Full error reports are disabled and caching is turned on.
		14	config.consider_all_requests_local = false
21	config.action_controller.perform_caching = true	15	config.action_controller.perform_caching = true
22		16
23	# Enable serving of images, stylesheets, and javascripts from an asset server	17	# Disable delivery errors
24	# config.action_controller.asset_host = "http://assets.example.com"
25
26	# Disable delivery errors if you bad email addresses should just be ignored
27	config.action_mailer.raise_delivery_errors = false	18	config.action_mailer.raise_delivery_errors = false
28		19
29	# No email in production log	20	# No email in production log
30	config.action_mailer.logger = nil	21	config.action_mailer.logger = nil
31		22
		23	# Print deprecation notices to the Rails logger.
32	config.active_support.deprecation = :log	24	config.active_support.deprecation = :log
33	end	25	end

config/environments/test.rb +10 -7

-            # Settings specified here will take precedence over those in config/application.rb
+            Rails.application.configure do
-            RedmineApp::Application.configure do
+              # Settings specified here will take precedence over those in config/application.rb
               # The test environment is used exclusively to run your application's
               # test suite.  You never need to work with it otherwise.  Remember that
               # your test database is "scratch space" for the test suite and is wiped
               # and recreated between test runs.  Don't rely on the data there!
               config.cache_classes = true
-              # Log error messages when you accidentally call methods on nil.
+              # Do not eager load code on boot. This avoids loading your whole application
-              config.whiny_nils = true
+              # just for the purpose of running a single test. If you are using a tool that
+              # preloads Rails for running tests, you may have to set it to true.
+              config.eager_load = false
               # Show full error reports and disable caching
-              #config.action_controller.consider_all_requests_local = true
+              config.consider_all_requests_local = true
               config.action_controller.perform_caching = false
               config.action_mailer.perform_deliveries = true
               # ActionMailer::Base.deliveries array.
               config.action_mailer.delivery_method = :test
-              # Skip protect_from_forgery in requests
+              # Disable request forgery protection in test environment.
-              # http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
               config.action_controller.allow_forgery_protection = false
+              # Print deprecation notices to stderr and the Rails logger.
               config.active_support.deprecation = [:stderr, :log]
               config.secret_token = 'a secret token for running the tests'

config/environments/test_pgsql.rb +1 0

@@ -1,1 +1,2
		1	# Same as test.rb
1	instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb'))	2	instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb'))

config/environments/test_sqlite3.rb +1 0

@@ -1,1 +1,2
		1	# Same as test.rb
1	instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb'))	2	instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb'))

config/initializers/10-patches.rb +10 -43

@@ -54,56 +54,23 module ActionView
54	end	54	end
55	end	55	end
56		56
57	# Do not HTML escape text templates
58	module ActionView
59	class Template
60	module Handlers
61	class ERB
62	def call(template)
63	if template.source.encoding_aware?
64	# First, convert to BINARY, so in case the encoding is
65	# wrong, we can still find an encoding tag
66	# (<%# encoding %>) inside the String using a regular
67	# expression
68	template_source = template.source.dup.force_encoding("BINARY")
69
70	erb = template_source.gsub(ENCODING_TAG, '')
71	encoding = $2
72
73	erb.force_encoding valid_encoding(template.source.dup, encoding)
74
75	# Always make sure we return a String in the default_internal
76	erb.encode!
77	else
78	erb = template.source.dup
79	end
80
81	self.class.erb_implementation.new(
82	erb,
83	:trim => (self.class.erb_trim_mode == "-"),
84	:escape => template.identifier =~ /\.text/ # only escape HTML templates
85	).src
86	end
87	end
88	end
89	end
90	end
91
92	ActionView::Base.field_error_proc = Proc.new{ \|html_tag, instance\| html_tag \|\| ''.html_safe }	57	ActionView::Base.field_error_proc = Proc.new{ \|html_tag, instance\| html_tag \|\| ''.html_safe }
93		58
94	# HTML5: <option value=""></option> is invalid, use <option value=""> </option> instead	59	# HTML5: <option value=""></option> is invalid, use <option value=""> </option> instead
95	module ActionView	60	module ActionView
96	module Helpers	61	module Helpers
97	class InstanceTag	62	module Tags
98	private	63	class Base
99	def add_options_with_non_empty_blank_option(option_tags, options, value = nil)	64	private
100	if options[:include_blank] == true	65	def add_options_with_non_empty_blank_option(option_tags, options, value = nil)
101	options = options.dup	66	if options[:include_blank] == true
102	options[:include_blank] = ' '.html_safe	67	options = options.dup
		68	options[:include_blank] = ' '.html_safe
		69	end
		70	add_options_without_non_empty_blank_option(option_tags, options, value)
103	end	71	end
104	add_options_without_non_empty_blank_option(option_tags, options, value)	72	alias_method_chain :add_options, :non_empty_blank_option
105	end	73	end
106	alias_method_chain :add_options, :non_empty_blank_option
107	end	74	end
108		75
109	module FormTagHelper	76	module FormTagHelper

config/initializers/30-redmine.rb +2 -6

             I18n.default_locale = 'en'
             I18n.backend = Redmine::I18n::Backend.new
+            # Forces I18n to load available locales from the backend
+            I18n.config.available_locales = nil
             require 'redmine'
             unless Redmine::Configuration['mirror_plugins_assets_on_startup'] == false
               Redmine::Plugin.mirror_assets
             end
-            Rails.application.config.to_prepare do
-              Redmine::FieldFormat::RecordList.subclasses.each do |klass|
-                klass.instance.reset_target_class
-              end
-            end
  No newline at end of file

config/locales/ja.yml +5 -5

               field_is_for_all: 全プロジェクト向け
               field_possible_values: 選択肢
               field_regexp: 正規表現
-              field_min_length: 最短長
+              field_min_length: 最小値
-              field_max_length: 最大長
+              field_max_length: 最大値
               field_value: 値
               field_category: カテゴリ
               field_title: タイトル
               field_activity: 活動
               field_spent_on: 日付
               field_identifier: 識別子
-              field_is_filter: フィルタとして使用
+              field_is_filter: フィルタとして使う
               field_issue_to: 関連するチケット
               field_delay: 遅延
               field_assignable: このロールにチケットを割り当て可能
               field_column_names: 項目
               field_time_entries: 時間を記録
               field_time_zone: タイムゾーン
-              field_searchable: 検索対象
+              field_searchable: 検索条件に設定可能とする
               field_default_value: デフォルト値
               field_comments_sorting: コメントの表示順
               field_parent_title: 親ページ
               label_subproject_plural: サブプロジェクト
               label_subproject_new: 新しいサブプロジェクト
               label_and_its_subprojects: "%{value} とサブプロジェクト"
-              label_min_max_length: 最短 - 最大長
+              label_min_max_length: 最小値 - 最大値の長さ
               label_list: リストから選択
               label_date: 日付
               label_integer: 整数

config/locales/zh-TW.yml +1 -1

               label_only: 僅於
               label_drop_down_list: 下拉式清單
               label_checkboxes: 核取方塊
-              label_radio_buttons: 選項按鈕
               label_link_values_to: 連結欄位值至此網址
               label_custom_field_select_type: 請選擇連結此自訂欄位的物件類型
               label_check_for_updates: 檢查更新
               description_date_from: 輸入起始日期
               description_date_to: 輸入結束日期
               text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+              label_radio_buttons: radio buttons

config/routes.rb +8 -8

             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-            RedmineApp::Application.routes.draw do
+            Rails.application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'account/activate', :to => 'account#activate', :via => :get
               get 'account/activation_email', :to => 'account#activation_email', :as => 'activation_email'
-              match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put]
+              match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put, :patch]
-              match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
+              match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put, :patch]
-              match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put]
+              match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put, :patch]
-              match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
+              match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put, :patch]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
-              match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
+              match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => [:put, :patch], :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
                 resources :issues, :only => [:index, :new, :create]
                 # issue form update
-                match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'
+                match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :patch, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                     post 'rename'
                     get 'history'
                     get 'diff'
-                    match 'preview', :via => [:post, :put]
+                    match 'preview', :via => [:post, :put, :patch]
                     post 'protect'
                     post 'add_attachment'
                   end

db/migrate/001_setup.rb +4 -1

             class Setup < ActiveRecord::Migration
-              class User < ActiveRecord::Base; end
+              class User < ActiveRecord::Base
+                attr_protected :id
+              end
               # model removed
               class Permission < ActiveRecord::Base; end

db/migrate/072_add_enumerations_position.rb +1 -1

                 Enumeration.all.group_by(&:opt).each do |opt, enums|
                   enums.each_with_index do |enum, i|
                     # do not call model callbacks
-                    Enumeration.update_all "position = #{i+1}", {:id => enum.id}
+                    Enumeration.where({:id => enum.id}).update_all("position = #{i+1}")
                   end
                 end
               end

db/migrate/078_add_custom_fields_position.rb +1 -1

                 CustomField.all.group_by(&:type).each  do |t, fields|
                   fields.each_with_index do |field, i|
                     # do not call model callbacks
-                    CustomField.update_all "position = #{i+1}", {:id => field.id}
+                    CustomField.where({:id => field.id}).update_all("position = #{i+1}")
                   end
                 end
               end

db/migrate/101_populate_changesets_user_id.rb +1 -1

                     username, email = $1.strip, $3
                     u = User.find_by_login(username)
                     u ||= User.find_by_mail(email) unless email.blank?
-                    Changeset.update_all("user_id = #{u.id}", ["committer = ?", committer]) unless u.nil?
+                    Changeset.where(["committer = ?", committer]).update_all("user_id = #{u.id}") unless u.nil?
                   end
                 end
               end

db/migrate/20091225164732_remove_enumerations_opt.rb +3 -3

               def self.down
                 add_column :enumerations, :opt, :string, :limit => 4, :default => '', :null => false
-                Enumeration.update_all("opt = 'IPRI'", "type = 'IssuePriority'")
+                Enumeration.where("type = 'IssuePriority'").update_all("opt = 'IPRI'")
-                Enumeration.update_all("opt = 'DCAT'", "type = 'DocumentCategory'")
+                Enumeration.where("type = 'DocumentCategory'").update_all("opt = 'DCAT'")
-                Enumeration.update_all("opt = 'ACTI'", "type = 'TimeEntryActivity'")
+                Enumeration.where("type = 'TimeEntryActivity'").update_all("opt = 'ACTI'")
               end
             end

db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb +1 -1

             class EnableCalendarAndGanttModulesWhereAppropriate < ActiveRecord::Migration
               def self.up
-                EnabledModule.where(:name => 'issue_tracking').all.each do |e|
+                EnabledModule.where(:name => 'issue_tracking').each do |e|
                   EnabledModule.create(:name => 'calendar', :project_id => e.project_id)
                   EnabledModule.create(:name => 'gantt', :project_id => e.project_id)
                 end

db/migrate/20130215111141_populate_issues_closed_on.rb +2 -1

                   # Then set closed_on for closed issues that weren't up updated by the above UPDATE
                   # No journal was found so we assume that they were closed on creation
-                  Issue.update_all "closed_on = created_on", {:status_id => closed_status_ids, :closed_on => nil}
+                  Issue.where({:status_id => closed_status_ids, :closed_on => nil}).
+                           update_all("closed_on = created_on")
                 end
               end

doc/CHANGELOG +1 -1

             * Defect #16655: start_date not set despite settings[default_issue_start_date_to_creation_date] being set.
             * Defect #16668: Redmine links broken when object name contains special characters
             * Defect #16669: Markdown formatter should use the :no_intra_emphasis extension
-            * Defect #16708: Form is submitted when switching tab
+            * Defect #16708: Form is submitted when swithing tab
             * Defect #16739: custom_fields.json only returns single tracker instead of array of trackers
             * Defect #16747: Remove useless settings when editing a query from the gantt
             * Defect #16755: Field set as read-only still available in the issues list context menu

doc/INSTALL +1 -4

             == Requirements
-            * Ruby 1.8.7, 1.9.2, 1.9.3, 2.0 or 2.1
+            * Ruby >= 1.9.3
             * RubyGems
             * Bundler >= 1.0.21
 . Configure the database parameters in config/database.yml
                for the "production" environment (default database is MySQL and ruby1.9)
-               If you're running Redmine with MySQL and ruby1.8, replace the adapter name
-               with `mysql`
 . Install the required gems by running:
                  bundle install --without development test

lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +3 -3

                         send :include, Redmine::Acts::ActivityProvider::InstanceMethods
                       end
-                      options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options)
+                      options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options, :scope)
                       self.activity_provider_options ||= {}
                       # One model can provide different event types
                         provider_options = activity_provider_options[event_type]
                         raise "#{self.name} can not provide #{event_type} events." if provider_options.nil?
-                        scope = self
+                        scope = (provider_options[:scope] || self)
                         if from && to
                           scope = scope.where("#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to)
                           scope = scope.where(Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym, options))
                         end
-                        scope.all(provider_options[:find_options].dup)
+                        scope.to_a
                       end
                     end
                   end

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb +2 -3

                       attachable_options[:view_permission] = options.delete(:view_permission) || "view_#{self.name.pluralize.underscore}".to_sym
                       attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
-                      has_many :attachments, options.merge(:as => :container,
+                      has_many :attachments, lambda {order("#{Attachment.table_name}.created_on ASC, #{Attachment.table_name}.id ASC")},
-                                                           :order => "#{Attachment.table_name}.created_on ASC, #{Attachment.table_name}.id ASC",
+                                             options.merge(:as => :container, :dependent => :destroy)
-                                                           :dependent => :destroy)
                       send :include, Redmine::Acts::Attachable::InstanceMethods
                       before_save :attach_saved_attachments
                     end

lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb +3 -4

                       return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
                       cattr_accessor :customizable_options
                       self.customizable_options = options
-                      has_many :custom_values, :as => :customized,
+                      has_many :custom_values, lambda {includes(:custom_field).order("#{CustomField.table_name}.position")},
-                                               :include => :custom_field,
+                                               :as => :customized,
-                                               :order => "#{CustomField.table_name}.position",
                                                :dependent => :delete_all,
                                                :validate => false
                     end
                     def available_custom_fields
-                      CustomField.where("type = '#{self.class.name}CustomField'").sorted.all
+                      CustomField.where("type = '#{self.class.name}CustomField'").sorted.to_a
                     end
                     # Sets the values of the object's custom fields

lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb +10 -5

                     # * :permission - permission required to search the model (default to :view_"objects")
                     def acts_as_searchable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
+                      options.assert_valid_keys(:columns, :project_key, :date_column, :order_column, :search_custom_fields, :permission, :scope)
                       cattr_accessor :searchable_options
                       self.searchable_options = options
                         # TODO: make user an argument
                         user = User.current
                         tokens = [] << tokens unless tokens.is_a?(Array)
-                        projects = [] << projects unless projects.nil? || projects.is_a?(Array)
+                        projects = [] << projects if projects.is_a?(Project)
                         limit_options = {}
                         limit_options[:limit] = options[:limit] if options[:limit]
                         tokens_conditions = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort]
-                        scope = self.scoped
+                        scope = (searchable_options[:scope] || self)
+                        if scope.is_a? Proc
+                          scope = scope.call
+                        end
                         project_conditions = []
                         if searchable_options.has_key?(:permission)
                           project_conditions << Project.allowed_to_condition(user, searchable_options[:permission] || :view_project)
                         results_count = 0
                         scope = scope.
-                          includes(searchable_options[:include]).
+                          joins(searchable_options[:include]).
                           order("#{searchable_options[:order_column]} " + (options[:before] ? 'DESC' : 'ASC')).
                           where(project_conditions).
-                          where(tokens_conditions)
+                          where(tokens_conditions).
+                          uniq
                         results_count = scope.count
                         if options[:offset]
                           scope_with_limit = scope_with_limit.where("#{searchable_options[:date_column]} #{options[:before] ? '<' : '>'} ?", options[:offset])
                         end
-                        results = scope_with_limit.all
+                        results = scope_with_limit.to_a
                         [results, results_count]
                       end

lib/plugins/acts_as_tree/lib/active_record/acts/tree.rb +1 -1

                       configuration.update(options) if options.is_a?(Hash)
                       belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache]
-                      has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => configuration[:dependent]
+                      has_many :children, lambda {order(configuration[:order])}, :class_name => name, :foreign_key => configuration[:foreign_key], :dependent => configuration[:dependent]
                       scope :roots, lambda {
                                       where("#{configuration[:foreign_key]} IS NULL").

lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb +1 -1

                     end
                     def notified_watchers
-                      notified = watcher_users.active
+                      notified = watcher_users.active.to_a
                       notified.reject! {|user| user.mail.blank? || user.mail_notification == 'none'}
                       if respond_to?(:visible?)
                         notified.reject! {|user| !visible?(user)}

lib/redmine.rb +1 -6

             require 'redmine/hook'
             require 'redmine/plugin'
-            if RUBY_VERSION < '1.9'
+            require 'csv'
-              require 'fastercsv'
-            else
-              require 'csv'
-              FCSV = CSV
-            end
             Redmine::Scm::Base.add "Subversion"
             Redmine::Scm::Base.add "Darcs"

lib/redmine/access_control.rb +3 -1

                     if action.is_a?(Symbol)
                       perm = permission(action)
                       !perm.nil? && perm.read?
-                    else
+                    elsif action.is_a?(Hash)
                       s = "#{action[:controller]}/#{action[:action]}"
                       permissions.detect {|p| p.actions.include?(s) && p.read?}.present?
+                    else
+                      raise ArgumentError.new("Symbol or a Hash expected, #{action.class.name} given: #{action}")
                     end
                   end

lib/redmine/codeset_util.rb +29 -118

@@ -1,160 +1,71
1	if RUBY_VERSION < '1.9'
2	require 'iconv'
3	end
4		1
5	module Redmine	2	module Redmine
6	module CodesetUtil	3	module CodesetUtil
7		4
8	def self.replace_invalid_utf8(str)	5	def self.replace_invalid_utf8(str)
9	return str if str.nil?	6	return str if str.nil?
10	if str.~~respond_to?~~(~~:force_encoding~~)	7	str.force_encoding('UTF-8')
11	str.~~force_encoding~~(~~'UTF-8'~~)	8	if ! str.valid_encoding?
12	if ! str.valid_encoding?	9	str = str.encode("US-ASCII", :invalid => :replace,
13	str = str.encode("US-ASCII", :invalid => :replace,	10	:undef => :replace, :replace => '?').encode("UTF-8")
14	:undef => :replace, :replace => '?').encode("UTF-8")
15	end
16	elsif RUBY_PLATFORM == 'java'
17	begin
18	ic = Iconv.new('UTF-8', 'UTF-8')
19	str = ic.iconv(str)
20	rescue
21	str = str.gsub(%r{[^\r\n\t\x20-\x7e]}, '?')
22	end
23	else
24	ic = Iconv.new('UTF-8', 'UTF-8')
25	txtar = ""
26	begin
27	txtar += ic.iconv(str)
28	rescue Iconv::IllegalSequence
29	txtar += $!.success
30	str = '?' + $!.failed[1,$!.failed.length]
31	retry
32	rescue
33	txtar += $!.success
34	end
35	str = txtar
36	end	11	end
37	str	12	str
38	end	13	end
39		14
40	def self.to_utf8(str, encoding)	15	def self.to_utf8(str, encoding)
41	return str if str.nil?	16	return str if str.nil?
42	str.force_encoding("ASCII-8BIT") if ~~str~~.~~respond_to?~~(~~:force_encoding~~)	17	str.force_encoding("ASCII-8BIT")
43	if str.empty?	18	if str.empty?
44	str.force_encoding("UTF-8") if ~~str~~.~~respond_to?~~(~~:force_encoding~~)	19	str.force_encoding("UTF-8")
45	return str	20	return str
46	end	21	end
47	enc = encoding.blank? ? "UTF-8" : encoding	22	enc = encoding.blank? ? "UTF-8" : encoding
48	if str.respond_to?(:force_encoding)	23	if enc.upcase != "UTF-8"
49	if enc.upcase != "UTF-8"	24	str.force_encoding(enc)
50	str.force_encoding(enc)	25	str = str.encode("UTF-8", :invalid => :replace,
51	str = str.encode("UTF-8", :invalid => :replace,	26	:undef => :replace, :replace => '?')
52	:undef => :replace, :replace => '?')
53	else
54	str.force_encoding("UTF-8")
55	if ! str.valid_encoding?
56	str = str.encode("US-ASCII", :invalid => :replace,
57	:undef => :replace, :replace => '?').encode("UTF-8")
58	end
59	end
60	elsif RUBY_PLATFORM == 'java'
61	begin
62	ic = Iconv.new('UTF-8', enc)
63	str = ic.iconv(str)
64	rescue
65	str = str.gsub(%r{[^\r\n\t\x20-\x7e]}, '?')
66	end
67	else	27	else
68	ic = Iconv.new('UTF-8', enc)	28	str.force_encoding("UTF-8")
69	txtar = ""	29	if ! str.valid_encoding?
70	begin	30	str = str.encode("US-ASCII", :invalid => :replace,
71	txtar += ic.iconv(str)	31	:undef => :replace, :replace => '?').encode("UTF-8")
72	rescue Iconv::IllegalSequence
73	txtar += $!.success
74	str = '?' + $!.failed[1,$!.failed.length]
75	retry
76	rescue
77	txtar += $!.success
78	end	32	end
79	str = txtar
80	end	33	end
81	str	34	str
82	end	35	end
83		36
84	def self.to_utf8_by_setting(str)	37	def self.to_utf8_by_setting(str)
85	return str if str.nil?	38	return str if str.nil?
86	~~str~~ = self.to_utf8_by_setting_internal(str)	39	self.to_utf8_by_setting_internal(str).force_encoding('UTF-8')
87	if str.respond_to?(:force_encoding)
88	str.force_encoding('UTF-8')
89	end
90	str
91	end	40	end
92		41
93	def self.to_utf8_by_setting_internal(str)	42	def self.to_utf8_by_setting_internal(str)
94	return str if str.nil?	43	return str if str.nil?
95	if str.~~respond_to?~~(~~:force_encoding~~)	44	str.force_encoding('ASCII-8BIT')
96	str.force_encoding('ASCII-8BIT')
97	end
98	return str if str.empty?	45	return str if str.empty?
99	return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii	46	return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
100	if str.~~respond_to?~~(~~:force_encoding~~)	47	str.force_encoding('UTF-8')
101	str.force_encoding('UTF-8')
102	end
103	encodings = Setting.repositories_encodings.split(',').collect(&:strip)	48	encodings = Setting.repositories_encodings.split(',').collect(&:strip)
104	encodings.each do \|encoding\|	49	encodings.each do \|encoding\|
105	if str.respond_to?(:force_encoding)	50	begin
106	begin	51	str.force_encoding(encoding)
107	str.~~force_encoding~~(~~encoding~~)	52	utf8 = str.encode('UTF-8')
108	utf8 = str.encode('UTF-8')	53	return utf8 if utf8.valid_encoding?
109	return utf8 if utf8.valid_encoding?	54	rescue
110	rescue	55	# do nothing here and try the next encoding
111	# do nothing here and try the next encoding
112	end
113	else
114	begin
115	return Iconv.conv('UTF-8', encoding, str)
116	rescue Iconv::Failure
117	# do nothing here and try the next encoding
118	end
119	end	56	end
120	end	57	end
121	~~str~~ = self.replace_invalid_utf8(str)	58	self.replace_invalid_utf8(str).force_encoding('UTF-8')
122	if str.respond_to?(:force_encoding)
123	str.force_encoding('UTF-8')
124	end
125	str
126	end	59	end
127		60
128	def self.from_utf8(str, encoding)	61	def self.from_utf8(str, encoding)
129	str \|\|= ''	62	str \|\|= ''
130	if str.~~respond_to?~~(~~:force_encoding~~)	63	str.force_encoding('UTF-8')
131	~~str~~.~~force_encoding~~('UTF-8')	64	if encoding.upcase != 'UTF-8'
132	if encoding.upcase != 'UTF-8'	65	str = str.encode(encoding, :invalid => :replace,
133	str = str.encode(encoding, :invalid => :replace,	66	:undef => :replace, :replace => '?')
134	:undef => :replace, :replace => '?')
135	else
136	str = self.replace_invalid_utf8(str)
137	end
138	elsif RUBY_PLATFORM == 'java'
139	begin
140	ic = Iconv.new(encoding, 'UTF-8')
141	str = ic.iconv(str)
142	rescue
143	str = str.gsub(%r{[^\r\n\t\x20-\x7e]}, '?')
144	end
145	else	67	else
146	ic = Iconv.new(encoding, 'UTF-8')	68	str = self.replace_invalid_utf8(str)
147	txtar = ""
148	begin
149	txtar += ic.iconv(str)
150	rescue Iconv::IllegalSequence
151	txtar += $!.success
152	str = '?' + $!.failed[1, $!.failed.length]
153	retry
154	rescue
155	txtar += $!.success
156	end
157	str = txtar
158	end	69	end
159	end	70	end
160	end	71	end

lib/redmine/core_ext/active_record.rb 0 -25

@@ -15,35 +15,10
15	# along with this program; if not, write to the Free Software	15	# along with this program; if not, write to the Free Software
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module ActiveRecord
19	module FinderMethods
20	def find_ids(*args)
21	find_ids_with_associations
22	end
23
24	private
25
26	def find_ids_with_associations
27	join_dependency = construct_join_dependency_for_association_find
28	relation = construct_relation_for_association_find_ids(join_dependency)
29	rows = connection.select_all(relation, 'SQL', relation.bind_values)
30	rows.map {\|row\| row["id"].to_i}
31	rescue ThrowResult
32	[]
33	end
34
35	def construct_relation_for_association_find_ids(join_dependency)
36	relation = except(:includes, :eager_load, :preload, :select).select("#{table_name}.id")
37	apply_join_dependency(relation, join_dependency)
38	end
39	end
40	end
41
42	class DateValidator < ActiveModel::EachValidator	18	class DateValidator < ActiveModel::EachValidator
43	def validate_each(record, attribute, value)	19	def validate_each(record, attribute, value)
44	before_type_cast = record.attributes_before_type_cast[attribute.to_s]	20	before_type_cast = record.attributes_before_type_cast[attribute.to_s]
45	if before_type_cast.is_a?(String) && before_type_cast.present?	21	if before_type_cast.is_a?(String) && before_type_cast.present?
46	# TODO: #*_date_before_type_cast returns a Mysql::Time with ruby1.8+mysql gem
47	unless before_type_cast =~ /\A\d{4}-\d{2}-\d{2}( 00:00:00)?\z/ && value	22	unless before_type_cast =~ /\A\d{4}-\d{2}-\d{2}( 00:00:00)?\z/ && value
48	record.errors.add attribute, :not_a_date	23	record.errors.add attribute, :not_a_date
49	end	24	end

lib/redmine/core_ext/string/conversions.rb 0 -7

                       s.gsub!(',', '.')
                       begin; Kernel.Float(s); rescue; nil; end
                     end
-                    # Object#to_a removed in ruby1.9
-                    if RUBY_VERSION > '1.9'
-                      def to_a
-                        [self.dup]
-                      end
-                    end
                   end
                 end
               end

lib/redmine/export/pdf.rb +1 -3

                     def self.rdm_from_utf8(txt, encoding)
                       txt ||= ''
                       txt = Redmine::CodesetUtil.from_utf8(txt, encoding)
-                      if txt.respond_to?(:force_encoding)
+                      txt.force_encoding('ASCII-8BIT')
-                        txt.force_encoding('ASCII-8BIT')
-                      end
                       txt
                     end

lib/redmine/field_format.rb +1 -6

                   def target_class
                     @target_class ||= self.class.name[/^(.*::)?(.+)Format$/, 2].constantize rescue nil
                   end
-                  def reset_target_class
-                    @target_class = nil
-                  end
                   def possible_custom_value_options(custom_value)
                     options = possible_values_options(custom_value.custom_field, custom_value.customized)
                     missing = [custom_value.value_was].flatten.reject(&:blank?) - options.map(&:last)
                     if missing.any?
                       options += target_class.where(:id => missing.map(&:to_i)).map {|o| [o.to_s, o.id.to_s]}
-                      #TODO: use #sort_by! when ruby1.8 support is dropped
+                      options.sort_by!(&:first)
-                      options = options.sort_by(&:first)
                     end
                     options
                   end

lib/redmine/helpers/gantt.rb +1 -1

                         where("child.id IN (?)", ids).
                         order("#{Project.table_name}.lft ASC").
                         uniq.
-                        all
+                        to_a
                     else
                       @projects = []
                     end

lib/redmine/menu_manager.rb +1 -1

                   # * Checking the url target (project only)
                   # * Checking the conditions of the item
                   def allowed_node?(node, user, project)
-                    if project && user && !user.allowed_to?(node.url, project)
+                    if node.url.is_a?(Hash) && project && user && !user.allowed_to?(node.url, project)
                       return false
                     end
                     if node.condition && !node.condition.call(project)

lib/redmine/scm/adapters/abstract_adapter.rb +7 -20

             require 'cgi'
             require 'redmine/scm/adapters'
-            if RUBY_VERSION < '1.9'
-              require 'iconv'
-            end
             module Redmine
               module Scm
                 module Adapters
                   class AbstractAdapter #:nodoc:
                     # raised if scm command exited with error, e.g. unknown revision.
-                    class ScmCommandAborted < CommandFailed; end
+                    class ScmCommandAborted < ::Redmine::Scm::Adapters::CommandFailed; end
                     class << self
                       def client_command
                     def scm_iconv(to, from, str)
                       return nil if str.nil?
                       return str if to == from
-                      if str.respond_to?(:force_encoding)
+                      str.force_encoding(from)
-                        str.force_encoding(from)
+                      begin
-                        begin
+                        str.encode(to)
-                          str.encode(to)
+                      rescue Exception => err
-                        rescue Exception => err
+                        logger.error("failed to convert from #{from} to #{to}. #{err}")
-                          logger.error("failed to convert from #{from} to #{to}. #{err}")
+                        nil
-                          nil
-                        end
-                      else
-                        begin
-                          Iconv.conv(to, from, str)
-                        rescue Iconv::Failure => err
-                          logger.error("failed to convert from #{from} to #{to}. #{err}")
-                          nil
-                        end
                       end
                     end

lib/redmine/scm/adapters/bazaar_adapter.rb +2 -5

                       end
                       def scm_command_version
-                        scm_version = scm_version_from_command_line.dup
+                        scm_version = scm_version_from_command_line.dup.force_encoding('ASCII-8BIT')
-                        if scm_version.respond_to?(:force_encoding)
-                          scm_version.force_encoding('ASCII-8BIT')
-                        end
                         if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                         prefix_utf8 = "#{url}/#{path}".gsub('\\', '/')
                         logger.debug "PREFIX: #{prefix_utf8}"
                         prefix = scm_iconv(@path_encoding, 'UTF-8', prefix_utf8)
-                        prefix.force_encoding('ASCII-8BIT') if prefix.respond_to?(:force_encoding)
+                        prefix.force_encoding('ASCII-8BIT')
                         re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$}
                         io.each_line do |line|
                           next unless line =~ re

lib/redmine/scm/adapters/cvs_adapter.rb +3 -5

                       end
                       def scm_command_version
-                        scm_version = scm_version_from_command_line.dup
+                        scm_version = scm_version_from_command_line.dup.force_encoding('ASCII-8BIT')
-                        if scm_version.respond_to?(:force_encoding)
-                          scm_version.force_encoding('ASCII-8BIT')
-                        end
                         if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)}m)
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                     def entries(path=nil, identifier=nil, options={})
                       logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
                       path_locale = scm_iconv(@path_encoding, 'UTF-8', path)
-                      path_locale.force_encoding("ASCII-8BIT") if path_locale.respond_to?(:force_encoding)
+                      path_locale.force_encoding("ASCII-8BIT")
                       entries = Entries.new
                       cmd_args = %w|-q rls -e|
                       cmd_args << "-D" << time_to_cvstime_rlog(identifier) if identifier
                         file_state = nil
                         branch_map = nil
                         io.each_line() do |line|
+                          line = line.strip
                           if state != "revision" && /^#{ENDLOG}/ =~ line
                             commit_log = String.new
                             revision   = nil

lib/redmine/scm/adapters/darcs_adapter.rb +1 -4

                       end
                       def darcs_binary_version
-                        darcsversion = darcs_binary_version_from_command_line.dup
+                        darcsversion = darcs_binary_version_from_command_line.dup.force_encoding('ASCII-8BIT')
-                        if darcsversion.respond_to?(:force_encoding)
-                          darcsversion.force_encoding('ASCII-8BIT')
-                        end
                         if m = darcsversion.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end

lib/redmine/scm/adapters/git_adapter.rb +2 -8

                       end
                       def scm_command_version
-                        scm_version = scm_version_from_command_line.dup
+                        scm_version = scm_version_from_command_line.dup.force_encoding('ASCII-8BIT')
-                        if scm_version.respond_to?(:force_encoding)
-                          scm_version.force_encoding('ASCII-8BIT')
-                        end
                         if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                             type = $1
                             sha  = $2
                             size = $3
-                            name = $4
+                            name = $4.force_encoding(@path_encoding)
-                            if name.respond_to?(:force_encoding)
-                              name.force_encoding(@path_encoding)
-                            end
                             full_path = p.empty? ? name : "#{p}/#{name}"
                             n      = scm_iconv('UTF-8', @path_encoding, name)
                             full_p = scm_iconv('UTF-8', @path_encoding, full_path)

lib/redmine/scm/adapters/mercurial_adapter.rb +5 -17

                         # The hg version is expressed either as a
                         # release number (eg 0.9.5 or 1.0) or as a revision
                         # id composed of 12 hexa characters.
-                        theversion = hgversion_from_command_line.dup
+                        theversion = hgversion_from_command_line.dup.force_encoding('ASCII-8BIT')
-                        if theversion.respond_to?(:force_encoding)
-                          theversion.force_encoding('ASCII-8BIT')
-                        end
                         if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                     def summary
                       return @summary if @summary
                       hg 'rhsummary' do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           @summary = parse_xml(output)['rhsummary']
                         rescue
                       p1 = scm_iconv(@path_encoding, 'UTF-8', path)
                       manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
                                     CGI.escape(without_leading_slash(p1.to_s))) do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           parse_xml(output)['rhmanifest']['repository']['manifest']
                         rescue
                       hg_args << '--limit' << options[:limit] if options[:limit]
                       hg_args << hgtarget(path) unless path.blank?
                       log = hg(*hg_args) do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           # Mercurial < 1.5 does not support footer template for '</log>'
                           parse_xml("#{output}</log>")['log']
                       blame = Annotate.new
                       hg 'rhannotate', '-ncu', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
                         io.each_line do |line|
-                          line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
+                          line.force_encoding('ASCII-8BIT')
                           next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
                           r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
                                            :identifier => $3)

lib/redmine/scm/adapters/subversion_adapter.rb +5 -20

                       end
                       def svn_binary_version
-                        scm_version = scm_version_from_command_line.dup
+                        scm_version = scm_version_from_command_line.dup.force_encoding('ASCII-8BIT')
-                        if scm_version.respond_to?(:force_encoding)
-                          scm_version.force_encoding('ASCII-8BIT')
-                        end
                         if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                       cmd << credentials_string
                       info = nil
                       shellout(cmd) do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           doc = parse_xml(output)
                           # root_url = doc.elements["info/entry/repository/root"].text
                       cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       shellout(cmd) do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           doc = parse_xml(output)
                           each_xml_element(doc['lists']['list'], 'entry') do |entry|
                       cmd << credentials_string
                       properties = {}
                       shellout(cmd) do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           doc = parse_xml(output)
                           each_xml_element(doc['properties']['target'], 'property') do |property|
                       cmd << " --limit #{options[:limit].to_i}" if options[:limit]
                       cmd << ' ' + target(path)
                       shellout(cmd) do |io|
-                        output = io.read
+                        output = io.read.force_encoding('UTF-8')
-                        if output.respond_to?(:force_encoding)
-                          output.force_encoding('UTF-8')
-                        end
                         begin
                           doc = parse_xml(output)
                           each_xml_element(doc['log'], 'logentry') do |logentry|

lib/redmine/unified_diff.rb +1 -19

                     while starting < max && line_left[starting] == line_right[starting]
                       starting += 1
                     end
-                    if (! "".respond_to?(:force_encoding)) && starting < line_left.size
-                      while line_left[starting].ord.between?(128, 191) && starting > 0
-                        starting -= 1
-                      end
-                    end
                     ending = -1
                     while ending >= -(max - starting) && (line_left[ending] == line_right[ending])
                       ending -= 1
                     end
-                    if (! "".respond_to?(:force_encoding)) && ending > (-1 * line_left.size)
-                      while line_left[ending].ord.between?(128, 255) && ending < -1
-                        if line_left[ending].ord.between?(128, 191)
-                          if line_left[ending + 1].ord.between?(128, 191)
-                            ending += 1
-                          else
-                            break
-                          end
-                        else
-                          ending += 1
-                        end
-                      end
-                    end
                     unless starting == 0 && ending == -1
                       [starting, ending]
                     end
                 def line_to_html(line, offsets)
                   html = line_to_html_raw(line, offsets)
-                  html.force_encoding('UTF-8') if html.respond_to?(:force_encoding)
+                  html.force_encoding('UTF-8')
                   html
                 end

lib/tasks/ci.rake +2 -2

                 else
                   Rake::Task["test"].invoke
                 end
-                # Rake::Task["test:ui"].invoke if RUBY_VERSION >= '1.9.3'
+                # Rake::Task["test:ui"].invoke
               end
               desc "Finish the build"
               case database
               when 'mysql'
-                dev_conf =  {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'),
+                dev_conf =  {'adapter' => 'mysql2',
                              'database' => dev_db_name, 'host' => 'localhost',
                              'encoding' => 'utf8'}
                 if ENV['RUN_ON_NOT_OFFICIAL']

lib/tasks/locales.rake 0 -3

               desc <<-END_DESC
             Removes a translation string from all locale file (only works for top-level childless non-multiline keys, probably doesn\'t work on windows).
-            This task does not work on Ruby 1.8.6.
-            You need to use Ruby 1.8.7 or later.
             Options:
               key=key_1,key_2    Comma-separated list of keys to delete
               skip=en,de         Comma-separated list of locale files to ignore (filename without extension)

lib/tasks/migrate_from_mantis.rake +1 -7

             desc 'Mantis migration script'
             require 'active_record'
-            require 'iconv' if RUBY_VERSION < '1.9'
             require 'pp'
             namespace :redmine do
                 end
                 def self.encode(text)
-                  if RUBY_VERSION < '1.9'
+                  text.to_s.force_encoding(@charset).encode('UTF-8')
-                    @ic ||= Iconv.new('UTF-8', @charset)
-                    @ic.iconv text
-                  else
-                    text.to_s.force_encoding(@charset).encode('UTF-8')
-                  end
                 end
               end

lib/tasks/migrate_from_trac.rake +2 -8

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'active_record'
-            require 'iconv' if RUBY_VERSION < '1.9'
             require 'pp'
             namespace :redmine do
                       attachment_type = read_attribute(:type)
                       #replace exotic characters with their hex representation to avoid invalid filenames
                       trac_file = filename.gsub( /[^a-zA-Z0-9\-_\.!~*']/n ) do |x|
-                        codepoint = RUBY_VERSION < '1.9' ? x[0] : x.codepoints.to_a[0]
+                        codepoint = x.codepoints.to_a[0]
                         sprintf('%%%02x', codepoint)
                       end
                       "#{TracMigrate.trac_attachments_directory}/#{attachment_type}/#{id}/#{trac_file}"
                   end
                   def self.encode(text)
-                    if RUBY_VERSION < '1.9'
+                    text.to_s.force_encoding(@charset).encode('UTF-8')
-                      @ic ||= Iconv.new('UTF-8', @charset)
-                      @ic.iconv text
-                    else
-                      text.to_s.force_encoding(@charset).encode('UTF-8')
-                    end
                   end
                 end

script/about +1 -5

@@ -1,6 +1,2
1	#!/usr/bin/env ruby	1	#!/usr/bin/env ruby
2		2	abort "script/about no longer exists, please use bin/about instead."
3	ENV["RAILS_ENV"] \|\|= "production"
4	require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
5	puts
6	puts Redmine::Info.environment

script/rails +1 -5

@@ -1,6 +1,2
1	#!/usr/bin/env ruby	1	#!/usr/bin/env ruby
2	# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.	2	abort "script/rails no longer exists, please use bin/rails instead."
3
4	APP_PATH = File.expand_path('../../config/application', __FILE__)
5	require File.expand_path('../../config/boot', __FILE__)
6	require 'rails/commands'

test/functional/account_controller_test.rb +6 -6

               end
               def test_login_with_suburi_should_redirect_to_back_url_param
-                @relative_url_root = ApplicationController.relative_url_root
+                @relative_url_root = Redmine::Utils.relative_url_root
-                ApplicationController.relative_url_root = '/redmine'
+                Redmine::Utils.relative_url_root = '/redmine'
                 back_urls = [
                   'http://test.host/redmine/issues/show/1',
                   assert_redirected_to back_url
                 end
               ensure
-                ApplicationController.relative_url_root = @relative_url_root
+                Redmine::Utils.relative_url_root = @relative_url_root
               end
               def test_login_should_not_redirect_to_another_host
               end
               def test_login_with_suburi_should_not_redirect_to_another_suburi
-                @relative_url_root = ApplicationController.relative_url_root
+                @relative_url_root = Redmine::Utils.relative_url_root
-                ApplicationController.relative_url_root = '/redmine'
+                Redmine::Utils.relative_url_root = '/redmine'
                 back_urls = [
                   'http://test.host/',
                   assert_redirected_to '/my/page'
                 end
               ensure
-                ApplicationController.relative_url_root = @relative_url_root
+                Redmine::Utils.relative_url_root = @relative_url_root
               end
               def test_login_with_wrong_password

test/functional/activities_controller_test.rb +7 -5

               end
               def test_index_atom_feed_with_one_item_type
-                get :index, :format => 'atom', :show_issues => '1'
+                with_settings :default_language => 'en' do
-                assert_response :success
+                  get :index, :format => 'atom', :show_issues => '1'
-                assert_template 'common/feed'
+                  assert_response :success
+                  assert_template 'common/feed'
-                assert_select 'title', :text => /Issues/
+                  assert_select 'title', :text => /Issues/
+                end
               end
               def test_index_should_show_private_notes_with_permission_only

test/functional/attachments_controller_test.rb +1 -2

                 assert a.save
                 assert_equal 'japanese-utf-8.txt', a.filename
-                str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
+                str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e".force_encoding('UTF-8')
-                str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
                 get :show, :id => a.id
                 assert_response :success

test/functional/calendars_controller_test.rb +8 -7

               end
               def test_week_number_calculation
-                Setting.start_of_week = 7
+                with_settings :start_of_week => 7 do
+                  get :show, :month => '1', :year => '2010'
-                get :show, :month => '1', :year => '2010'
+                  assert_response :success
-                assert_response :success
+                end
                 assert_select 'tr' do
                   assert_select 'td.week-number', :text => '53'
                   assert_select 'td.even', :text => '9'
                 end
-                Setting.start_of_week = 1
+                with_settings :start_of_week => 1 do
-                get :show, :month => '1', :year => '2010'
+                  get :show, :month => '1', :year => '2010'
-                assert_response :success
+                  assert_response :success
+                end
                 assert_select 'tr' do
                   assert_select 'td.week-number', :text => '53'

test/functional/context_menus_controller_test.rb +8 -6

               end
               def test_context_menu_one_issue_by_anonymous
-                get :issues, :ids => [1]
+                with_settings :default_language => 'en' do
-                assert_response :success
+                  get :issues, :ids => [1]
-                assert_template 'context_menus/issues'
+                  assert_response :success
-                assert_tag :tag => 'a', :content => 'Delete',
+                  assert_template 'context_menus/issues'
-                                        :attributes => { :href => '#',
+                  assert_tag :tag => 'a', :content => 'Delete',
-                                                         :class => 'icon-del disabled' }
+                                          :attributes => { :href => '#',
+                                                           :class => 'icon-del disabled' }
+                end
               end
               def test_context_menu_multiple_issues_of_same_project

test/functional/custom_fields_controller_test.rb +1 -1

               end
               def test_new_js
-                get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
+                xhr :get, :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type

test/functional/groups_controller_test.rb +1 -1

               end
               def test_autocomplete_for_user
-                get :autocomplete_for_user, :id => 10, :q => 'smi', :format => 'js'
+                xhr :get, :autocomplete_for_user, :id => 10, :q => 'smi', :format => 'js'
                 assert_response :success
                 assert_include 'John Smith', response.body
               end

test/functional/issues_controller_test.rb +16 -41

               def test_index_csv_big_5
                 with_settings :default_language => "zh-TW" do
-                  str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88"
+                  str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88".force_encoding('UTF-8')
-                  str_big5  = "\xa4@\xa4\xeb"
+                  str_big5  = "\xa4@\xa4\xeb".force_encoding('Big5')
-                  if str_utf8.respond_to?(:force_encoding)
-                    str_utf8.force_encoding('UTF-8')
-                    str_big5.force_encoding('Big5')
-                  end
                   issue = Issue.generate!(:subject => str_utf8)
                   get :index, :project_id => 1,
                               :format => 'csv'
                   assert_equal 'text/csv; header=present', @response.content_type
                   lines = @response.body.chomp.split("\n")
-                  s1 = "\xaa\xac\xbaA"
+                  s1 = "\xaa\xac\xbaA".force_encoding('Big5')
-                  if str_utf8.respond_to?(:force_encoding)
-                    s1.force_encoding('Big5')
-                  end
                   assert_include s1, lines[0]
                   assert_include str_big5, lines[1]
                 end
               def test_index_csv_cannot_convert_should_be_replaced_big_5
                 with_settings :default_language => "zh-TW" do
-                  str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85"
+                  str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85".force_encoding('UTF-8')
-                  if str_utf8.respond_to?(:force_encoding)
-                    str_utf8.force_encoding('UTF-8')
-                  end
                   issue = Issue.generate!(:subject => str_utf8)
                   get :index, :project_id => 1,
                               :set_filter => 1
                   assert_equal 'text/csv; header=present', @response.content_type
                   lines = @response.body.chomp.split("\n")
-                  s1 = "\xaa\xac\xbaA" # status
+                  s1 = "\xaa\xac\xbaA".force_encoding('Big5') # status
-                  if str_utf8.respond_to?(:force_encoding)
-                    s1.force_encoding('Big5')
-                  end
                   assert lines[0].include?(s1)
                   s2 = lines[1].split(",")[2]
-                  if s1.respond_to?(:force_encoding)
+                  s3 = "\xa5H?".force_encoding('Big5') # subject
-                    s3 = "\xa5H?" # subject
+                  assert_equal s3, s2
-                    s3.force_encoding('Big5')
-                    assert_equal s3, s2
-                  elsif RUBY_PLATFORM == 'java'
-                    assert_equal "??", s2
-                  else
-                    assert_equal "\xa5H???", s2
-                  end
                 end
               end
               def test_put_update_with_attachment_that_fails_to_save
                 set_tmp_attachments_directory
-                # Delete all fixtured journals, a race condition can occur causing the wrong
-                # journal to get fetched in the next find.
-                Journal.delete_all
-                # Mock out the unsaved attachment
-                Attachment.any_instance.stubs(:create).returns(Attachment.new)
                 # anonymous user
-                put :update,
+                with_settings :attachment_max_size => 0 do
-                     :id => 1,
+                  put :update,
-                     :issue => {:notes => ''},
+                       :id => 1,
-                     :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
+                       :issue => {:notes => ''},
-                assert_redirected_to :action => 'show', :id => '1'
+                       :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
-                assert_equal '1 file(s) could not be saved.', flash[:warning]
+                  assert_redirected_to :action => 'show', :id => '1'
+                  assert_equal '1 file(s) could not be saved.', flash[:warning]
+                end
               end
               def test_put_update_with_no_change
                 post :bulk_edit, :ids => [1, 2, 6], :issue => {:project_id => 1}
                 assert_response :success
                 assert_template 'bulk_edit'
-                assert_equal Project.find(1).shared_versions.open.all.sort, assigns(:versions).sort
+                assert_equal Project.find(1).shared_versions.open.to_a.sort, assigns(:versions).sort
                 assert_select 'select[name=?]', 'issue[fixed_version_id]' do
                   assert_select 'option', :text => '2.0'

test/functional/issues_custom_fields_visibility_test.rb +2 -2

                 p1 = Project.generate!
                 p2 = Project.generate!
                 user = User.generate!
-                User.add_to_project(user, p1, Role.where(:id => [1, 3]).all)
+                User.add_to_project(user, p1, Role.where(:id => [1, 3]).to_a)
-                User.add_to_project(user, p2, Role.where(:id => 3).all)
+                User.add_to_project(user, p2, Role.where(:id => 3).to_a)
                 Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueA'})
                 Issue.generate!(:project => p2, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueB'})
                 Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueC'})

test/functional/members_controller_test.rb +1 -1

               end
               def test_autocomplete
-                get :autocomplete, :project_id => 1, :q => 'mis', :format => 'js'
+                xhr :get, :autocomplete, :project_id => 1, :q => 'mis', :format => 'js'
                 assert_response :success
                 assert_include 'User Misc', response.body
               end

test/functional/messages_controller_test.rb +2 -2

                 assert_template 'show'
                 replies = assigns(:replies)
                 assert_not_nil replies
-                assert !replies.include?(message.children.order('id').first)
+                assert_not_include message.children.reorder('id').first, replies
-                assert replies.include?(message.children.order('id').last)
+                assert_include message.children.reorder('id').last, replies
               end
               def test_show_with_reply_permission

test/functional/my_controller_test.rb +1 -1

                                 :new_password_confirmation => 'secret1234'
                 assert_response :success
                 assert_template 'password'
-                assert_error_tag :content => /Password doesn&#x27;t match confirmation/
+                assert_error_tag :content => /Password doesn.*t match confirmation/
                 # wrong password
                 post :password, :password => 'wrongpassword',

test/functional/repositories_bazaar_controller_test.rb +24 -30

@@ -26,7 +26,7 class RepositoriesBazaarControllerTest < ActionController::TestCase
26	REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s	26	REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
27	REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")	27	REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
28	PRJ_ID = 3	28	PRJ_ID = 3
29	CHAR_1_UTF8_HEX = "\xc3\x9c"	29	CHAR_1_UTF8_HEX = "\xc3\x9c".dup.force_encoding('UTF-8')
30		30
31	def setup	31	def setup
32	User.current = nil	32	User.current = nil
@@ -36,10 +36,6 class RepositoriesBazaarControllerTest < ActionController::TestCase
36	:url => REPOSITORY_PATH_TRUNK,	36	:url => REPOSITORY_PATH_TRUNK,
37	:log_encoding => 'UTF-8')	37	:log_encoding => 'UTF-8')
38	assert @repository	38	assert @repository
39	@char_1_utf8 = CHAR_1_UTF8_HEX.dup
40	if @char_1_utf8.respond_to?(:force_encoding)
41	@char_1_utf8.force_encoding('UTF-8')
42	end
43	end	39	end
44		40
45	if File.directory?(REPOSITORY_PATH)	41	if File.directory?(REPOSITORY_PATH)
@@ -176,31 +172,29 class RepositoriesBazaarControllerTest < ActionController::TestCase
176	end	172	end
177	end	173	end
178		174
179	if REPOSITORY_PATH.respond_to?(:force_encoding)	175	def test_annotate_author_non_ascii
180	def test_annotate_author_non_ascii	176	log_encoding = nil
181	log_encoding = nil	177	if Encoding.locale_charmap == "UTF-8" \|\|
182	if Encoding.locale_charmap == "~~UTF-8~~" \|\|	178	Encoding.locale_charmap == "ISO-8859-1"
183	Encoding.locale_charmap == ~~"ISO-8859-1"~~	179	log_encoding = Encoding.locale_charmap
184	log_encoding = Encoding.locale_charmap	180	end
185	end	181	unless log_encoding.nil?
186	unless log_encoding.nil?	182	repository = Repository::Bazaar.create(
187	repository = Repository::Bazaar.create(	183	:project => @project,
188	:project => @project,	184	:url => File.join(REPOSITORY_PATH, "author_non_ascii"),
189	~~:url~~ => ~~File~~.~~join~~(~~REPOSITORY_PATH~~, "author_non_ascii"),	185	:identifier => 'author_non_ascii',
190	~~:identifier~~ => ~~'author_non_ascii'~~,	186	:log_encoding => log_encoding)
191	:log_encoding => log_encoding)	187	assert repository
192	assert repository	188	get :annotate, :id => PRJ_ID, :repository_id => 'author_non_ascii',
193	get :annotate, :id => PRJ_ID, :repository_id => 'author_non_ascii',	189	:path => repository_path_hash(['author-non-ascii-test.txt'])[:param]
194	:path => repository_path_hash(['author-non-ascii-test.txt'])[:param]	190	assert_response :success
195	assert_response :success	191	assert_template 'annotate'
196	assert_template 'annotate'	192	assert_select "th.line-num", :text => '1' do
197	assert_select "~~th.line-num~~", ~~:text~~ => ~~'1'~~ do	193	assert_select "+ td.revision" do
198	assert_select "~~+ td.revision~~" do	194	assert_select "a", :text => '2'
199	assert_select "a", :text => ~~'2'~~	195	assert_select "+ td.author", :text => "test #{CHAR_1_UTF8_HEX}" do
200	assert_select "+ td~~.author~~", ~~:text~~ => ~~"test~~ #{~~@char_1_utf8~~}" do	196	assert_select "+ td",
201	assert_select "+ td",	197	:text => "author non ASCII test"
202	:text => "author non ASCII test"
203	end
204	end	198	end
205	end	199	end
206	end	200	end

test/functional/repositories_filesystem_controller_test.rb +5 -7

               PRJ_ID = 3
               def setup
-                @ruby19_non_utf8_pass =
+                @ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
-                    (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
                 User.current = nil
                 Setting.enabled_scm << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
                 @project = Project.find(PRJ_ID)
                                :attributes => { :class => 'line-num' },
                                :sibling => { :tag => 'td', :content => /japanese/ }
                     if @ruby19_non_utf8_pass
-                      puts "TODO: show repository file contents test fails in Ruby 1.9 " +
+                      puts "TODO: show repository file contents test fails " +
-                           "and Encoding.default_external is not UTF-8. " +
+                           "when Encoding.default_external is not UTF-8. " +
                            "Current value is '#{Encoding.default_external.to_s}'"
                     else
-                      str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
+                      str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e".force_encoding('UTF-8')
-                      str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
                       assert_tag :tag => 'th',
                                  :content => '3',
                                  :attributes => { :class => 'line-num' },
                 end
                 def test_show_utf16
-                  enc = (RUBY_VERSION == "1.9.2" ? 'UTF-16LE' : 'UTF-16')
+                  enc = 'UTF-16'
                   with_settings :repositories_encodings => enc do
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['japanese', 'utf-16.txt'])[:param]

test/functional/repositories_git_controller_test.rb +19 -24

               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"
+              CHAR_1_HEX = "\xc3\x9c".force_encoding('UTF-8')
-              FELIX_HEX  = "Felix Sch\xC3\xA4fer"
+              FELIX_HEX  = "Felix Sch\xC3\xA4fer".force_encoding('UTF-8')
               NUM_REV = 28
               ## Git, Mercurial and CVS path encodings are binary.
               JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
               def setup
-                @ruby19_non_utf8_pass =
+                @ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
-                  (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
-                @char_1        = CHAR_1_HEX.dup
-                @felix_utf8  = FELIX_HEX.dup
-                if @char_1.respond_to?(:force_encoding)
-                  @char_1.force_encoding('UTF-8')
-                  @felix_utf8.force_encoding('UTF-8')
-                end
               end
               def test_create_and_update
                     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],
+                            :path => repository_path_hash(['latin-1-dir', "test-#{CHAR_1_HEX}.txt"])[:param],
                             :rev => r1
                         assert_response :success
                         assert_template 'entry'
                                :content => '1',
                                :attributes => { :class => 'line-num' },
                                :sibling => { :tag => 'td',
-                                             :content => /test-#{@char_1}.txt/ }
+                                             :content => /test-#{CHAR_1_HEX}.txt/ }
                       end
                     end
                   end
                                      :descendant => {
                                        :tag => 'th',
                                        :attributes => { :class => 'filename' } ,
-                                       :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
+                                       :content => /latin-1-dir\/test-#{CHAR_1_HEX}.txt/ ,
                                       },
                                      :sibling => {
                                        :tag => 'tbody',
                                        :descendant => {
                                           :tag => 'td',
                                           :attributes => { :class => /diff_in/ },
-                                          :content => /test-#{@char_1}.txt/
+                                          :content => /test-#{CHAR_1_HEX}.txt/
                                        }
                                      }
                         end
                 end
                 def test_annotate_binary_file
-                  get :annotate, :id => PRJ_ID,
+                  with_settings :default_language => 'en' do
-                      :path => repository_path_hash(['images', 'edit.png'])[:param]
+                    get :annotate, :id => PRJ_ID,
-                  assert_response 500
+                        :path => repository_path_hash(['images', 'edit.png'])[:param]
-                  assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
+                    assert_response 500
-                                          :content => /cannot be annotated/
+                    assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
+                                            :content => /cannot be annotated/
+                  end
                 end
                 def test_annotate_error_when_too_big
                     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],
+                            :path => repository_path_hash(['latin-1-dir', "test-#{CHAR_1_HEX}.txt"])[:param],
                             :rev => r1
                         assert_select "th.line-num", :text => '1' do
                           assert_select "+ td.revision" do
                             assert_select "a", :text => '57ca437c'
                             assert_select "+ td.author", :text => "jsmith" do
                               assert_select "+ td",
-                                            :text => "test-#{@char_1}.txt"
+                                            :text => "test-#{CHAR_1_HEX}.txt"
                             end
                           end
                         end
                     assert_select "th.line-num", :text => '1' do
                       assert_select "+ td.revision" do
                         assert_select "a", :text => '83ca5fd5'
-                        assert_select "+ td.author", :text => @felix_utf8 do
+                        assert_select "+ td.author", :text => FELIX_HEX do
                           assert_select "+ td",
                                         :text => "And this is a file with a leading and trailing space..."
                         end
                 private
                 def puts_ruby19_non_utf8_pass
-                  puts "TODO: This test fails in Ruby 1.9 " +
+                  puts "TODO: This test fails " +
-                       "and Encoding.default_external is not UTF-8. " +
+                       "when Encoding.default_external is not UTF-8. " +
                        "Current value is '#{Encoding.default_external.to_s}'"
                 end
               else

test/functional/repositories_mercurial_controller_test.rb +7 -14

               PRJ_ID     = 3
               NUM_REV    = 34
-              ruby19_non_utf8_pass =
+              ruby19_non_utf8_pass = Encoding.default_external.to_s != 'UTF-8'
-                 (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
               def setup
                 User.current = nil
                                   )
                 assert @repository
                 @diff_c_support = true
-                @char_1        = CHAR_1_HEX.dup
+                @char_1        = CHAR_1_HEX.dup.force_encoding('UTF-8')
-                @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
+                @tag_char_1    = "tag-#{CHAR_1_HEX}-00".force_encoding('UTF-8')
-                @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
+                @branch_char_0 = "branch-#{CHAR_1_HEX}-00".force_encoding('UTF-8')
-                @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
+                @branch_char_1 = "branch-#{CHAR_1_HEX}-01".force_encoding('UTF-8')
-                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 " +
+                puts "TODO: Mercurial functional test fails " +
-                     "and Encoding.default_external is not UTF-8. " +
+                     "when 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)

test/functional/roles_controller_test.rb +2 -2

                 assert_template 'index'
                 assert_not_nil assigns(:roles)
-                assert_equal Role.order('builtin, position').all, assigns(:roles)
+                assert_equal Role.order('builtin, position').to_a, assigns(:roles)
                 assert_tag :tag => 'a', :attributes => { :href => '/roles/1/edit' },
                                         :content => 'Manager'
                 assert_template 'permissions'
                 assert_not_nil assigns(:roles)
-                assert_equal Role.order('builtin, position').all, assigns(:roles)
+                assert_equal Role.order('builtin, position').to_a, assigns(:roles)
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'permissions[3][]',

test/functional/search_controller_test.rb +3 -1

               end
               def test_search_all_projects
-                get :index, :q => 'recipe subproject commit', :all_words => ''
+                with_settings :default_language => 'en' do
+                  get :index, :q => 'recipe subproject commit', :all_words => ''
+                end
                 assert_response :success
                 assert_template 'index'

test/functional/time_entry_reports_controller_test.rb +11 -43

               def test_csv_big_5
                 Setting.default_language = "zh-TW"
-                str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88"
+                str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88".force_encoding('UTF-8')
-                str_big5  = "\xa4@\xa4\xeb"
+                str_big5  = "\xa4@\xa4\xeb".force_encoding('Big5')
-                if str_utf8.respond_to?(:force_encoding)
-                  str_utf8.force_encoding('UTF-8')
-                  str_big5.force_encoding('Big5')
-                end
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 user.lastname  = "test-lastname"
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
-                s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp"
+                s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp".force_encoding('Big5')
-                s2 = "\xa4u\xae\xc9\xc1`\xadp"
+                s2 = "\xa4u\xae\xc9\xc1`\xadp".force_encoding('Big5')
-                if s1.respond_to?(:force_encoding)
-                  s1.force_encoding('Big5')
-                  s2.force_encoding('Big5')
-                end
                 assert_equal s1, lines.first
                 # Total row
                 assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
                 assert_equal "#{s2},7.30,7.30", lines[2]
-                str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
+                str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)".force_encoding('UTF-8')
-                if str_tw.respond_to?(:force_encoding)
-                  str_tw.force_encoding('UTF-8')
-                end
                 assert_equal str_tw, l(:general_lang_name)
                 assert_equal 'Big5', l(:general_csv_encoding)
                 assert_equal ',', l(:general_csv_separator)
               def test_csv_cannot_convert_should_be_replaced_big_5
                 Setting.default_language = "zh-TW"
-                str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85"
+                str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85".force_encoding('UTF-8')
-                if str_utf8.respond_to?(:force_encoding)
-                  str_utf8.force_encoding('UTF-8')
-                end
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 user.lastname  = "test-lastname"
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
-                s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp"
+                s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp".force_encoding('Big5')
-                if s1.respond_to?(:force_encoding)
-                  s1.force_encoding('Big5')
-                end
                 assert_equal s1, lines.first
                 # Total row
-                s2 = ""
+                s2 = "\xa5H?".force_encoding('Big5')
-                if s2.respond_to?(:force_encoding)
-                  s2 = "\xa5H?"
-                  s2.force_encoding('Big5')
-                elsif RUBY_PLATFORM == 'java'
-                  s2 = "??"
-                else
-                  s2 = "\xa5H???"
-                end
                 assert_equal "#{s2} #{user.lastname},7.30,7.30", lines[1]
               end
                   assert_equal 'text/csv; header=present', @response.content_type
                   lines = @response.body.chomp.split("\n")
                   # Headers
-                  s1 = "Utilisateur;2011-11-11;Temps total"
+                  s1 = "Utilisateur;2011-11-11;Temps total".force_encoding('ISO-8859-1')
-                  s2 = "Temps total"
+                  s2 = "Temps total".force_encoding('ISO-8859-1')
-                  if s1.respond_to?(:force_encoding)
-                    s1.force_encoding('ISO-8859-1')
-                    s2.force_encoding('ISO-8859-1')
-                  end
                   assert_equal s1, lines.first
                   # Total row
                   assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
                   assert_equal "#{s2};7,30;7,30", lines[2]
-                  str_fr = "Fran\xc3\xa7ais"
+                  str_fr = "Fran\xc3\xa7ais".force_encoding('UTF-8')
-                  if str_fr.respond_to?(:force_encoding)
-                    str_fr.force_encoding('UTF-8')
-                  end
                   assert_equal str_fr, l(:general_lang_name)
                   assert_equal 'ISO-8859-1', l(:general_csv_encoding)
                   assert_equal ';', l(:general_csv_separator)

test/functional/timelog_controller_test.rb +10 -8

               end
               def test_index_csv_all_projects
-                Setting.date_format = '%m/%d/%Y'
+                with_settings :date_format => '%m/%d/%Y' do
-                get :index, :format => 'csv'
+                  get :index, :format => 'csv'
-                assert_response :success
+                  assert_response :success
-                assert_equal 'text/csv; header=present', response.content_type
+                  assert_equal 'text/csv; header=present', response.content_type
+                end
               end
               def test_index_csv
-                Setting.date_format = '%m/%d/%Y'
+                with_settings :date_format => '%m/%d/%Y' do
-                get :index, :project_id => 1, :format => 'csv'
+                  get :index, :project_id => 1, :format => 'csv'
-                assert_response :success
+                  assert_response :success
-                assert_equal 'text/csv; header=present', response.content_type
+                  assert_equal 'text/csv; header=present', response.content_type
+                end
               end
             end

test/functional/timelog_custom_fields_visibility_test.rb +4 -4

                 p1 = Project.generate!
                 p2 = Project.generate!
                 user = User.generate!
-                User.add_to_project(user, p1, Role.where(:id => [1, 3]).all)
+                User.add_to_project(user, p1, Role.where(:id => [1, 3]).to_a)
-                User.add_to_project(user, p2, Role.where(:id => 3).all)
+                User.add_to_project(user, p2, Role.where(:id => 3).to_a)
                 TimeEntry.generate!(
                   :issue => Issue.generate!(:project => p1, :tracker_id => 1,
                                             :custom_field_values => {@field2.id => 'ValueA'}))
                                             :custom_field_values => {@field2.id => 'ValueC'}))
                 @request.session[:user_id] = user.id
                 get :index, :c => ["hours", "issue.cf_#{@field2.id}"]
-                assert_select 'td', :text => 'ValueA'
+                assert_select 'td', {:text => 'ValueA'}, "ValueA not found in:\n#{response.body}"
                 assert_select 'td', :text => 'ValueB', :count => 0
-                assert_select 'td', :text => 'ValueC'
+                assert_select 'td', {:text => 'ValueC'}, "ValueC not found in:\n#{response.body}"
                 get :index, :set_filter => '1', "issue.cf_#{@field2.id}" => '*'
                 assert_equal %w(ValueA ValueC), assigns(:entries).map{|i| i.issue.custom_field_value(@field2)}.sort

test/functional/welcome_controller_test.rb +1 -3

                 @request.session[:user_id] = 2
                 get :index
-                assert_tag 'script',
+                assert_select 'script', :text => %r{warnLeavingUnsaved}
-                  :attributes => {:type => "text/javascript"},
-                  :content => %r{warnLeavingUnsaved}
               end
               def test_warn_on_leaving_unsaved_turn_off

test/functional/wiki_controller_test.rb +6 -2

               end
               def test_show_old_version
-                get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '2'
+                with_settings :default_language => 'en' do
+                  get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '2'
+                end
                 assert_response :success
                 assert_template 'show'
               end
               def test_show_first_version
-                get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '1'
+                with_settings :default_language => 'en' do
+                  get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '1'
+                end
                 assert_response :success
                 assert_template 'show'

test/functional/workflows_controller_test.rb +1 -1

                 get :permissions, :role_id => 1, :tracker_id => 2, :used_statuses_only => '0'
                 assert_response :success
-                assert_equal IssueStatus.sorted.all, assigns(:statuses)
+                assert_equal IssueStatus.sorted.to_a, assigns(:statuses)
               end
               def test_post_permissions

test/integration/account_test.rb +1 -7

             require File.expand_path('../../test_helper', __FILE__)
-            begin
+            class AccountTest < ActionDispatch::IntegrationTest
-              require 'mocha/setup'
-            rescue
-              # Won't run some tests
-            end
-            class AccountTest < ActionController::IntegrationTest
               fixtures :users, :roles
               def test_login

test/integration/admin_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class AdminTest < ActionController::IntegrationTest
+            class AdminTest < ActionDispatch::IntegrationTest
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,

test/integration/api_test/authentication_test.rb +2 -5

               end
               def test_invalid_utf8_credentials_should_not_trigger_an_error
-                invalid_utf8 = "\x82"
+                invalid_utf8 = "\x82".force_encoding('UTF-8')
-                if invalid_utf8.respond_to?(:force_encoding)
+                assert !invalid_utf8.valid_encoding?
-                  invalid_utf8.force_encoding('UTF-8')
-                  assert !invalid_utf8.valid_encoding?
-                end
                 assert_nothing_raised do
                   get '/users/current.xml', {}, credentials(invalid_utf8, "foo")
                 end

test/integration/api_test/memberships_test.rb +1 -1

                 assert_response :unprocessable_entity
                 assert_equal 'application/xml', @response.content_type
-                assert_tag 'errors', :child => {:tag => 'error', :content => /member_roles is invalid/}
+                assert_tag 'errors', :child => {:tag => 'error', :content => /role can't be empty/i}
               end
               test "DELETE /memberships/:id.xml should destroy the membership" do

test/integration/api_test/projects_test.rb +6 -6

               end
               test "POST /projects.xml with valid parameters should create the project" do
-                Setting.default_projects_modules = ['issue_tracking', 'repository']
+                with_settings :default_projects_modules => ['issue_tracking', 'repository'] do
+                  assert_difference('Project.count') do
-                assert_difference('Project.count') do
+                    post '/projects.xml',
-                  post '/projects.xml',
+                      {:project => {:name => 'API test', :identifier => 'api-test'}},
-                    {:project => {:name => 'API test', :identifier => 'api-test'}},
+                      credentials('admin')
-                    credentials('admin')
+                  end
                 end
                 project = Project.order('id DESC').first

test/integration/application_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class ApplicationTest < ActionController::IntegrationTest
+            class ApplicationTest < ActionDispatch::IntegrationTest
               include Redmine::I18n
               fixtures :projects, :trackers, :issue_statuses, :issues,

test/integration/attachments_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class AttachmentsTest < ActionController::IntegrationTest
+            class AttachmentsTest < ActionDispatch::IntegrationTest
               fixtures :projects, :enabled_modules,
                        :users, :roles, :members, :member_roles,
                        :trackers, :projects_trackers,

test/integration/feeds_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class FeedsTest < ActionController::IntegrationTest
+            class FeedsTest < ActionDispatch::IntegrationTest
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers, :enabled_modules,

test/integration/issues_test.rb +14 -14

             require File.expand_path('../../test_helper', __FILE__)
-            class IssuesTest < ActionController::IntegrationTest
+            class IssuesTest < ActionDispatch::IntegrationTest
               fixtures :projects,
                        :users,
                        :roles,
               end
               def test_pagination_links_on_index
-                Setting.per_page_options = '2'
+                with_settings :per_page_options => '2' do
-                get '/projects/ecookbook/issues'
+                  get '/projects/ecookbook/issues'
-                assert_tag :a, :content => '2',
-                               :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+                  assert_tag :a, :content => '2',
+                                 :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+                end
               end
               def test_pagination_links_on_index_without_project_id_in_url
-                Setting.per_page_options = '2'
+                with_settings :per_page_options => '2' do
-                get '/issues', :project_id => 'ecookbook'
+                  get '/issues', :project_id => 'ecookbook'
-                assert_tag :a, :content => '2',
+                  assert_tag :a, :content => '2',
-                               :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+                                 :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+                end
               end
               def test_issue_with_user_custom_field
                 @field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true, :trackers => Tracker.all)
                 Role.anonymous.add_permission! :add_issues, :edit_issues
-                users = Project.find(1).users
+                users = Project.find(1).users.uniq.sort
                 tester = users.first
                 # Issue form
                     :issue => {
                       :custom_field_values => {@field.id.to_s => new_tester.id.to_s}
                     }
+                  assert_redirected_to "/issues/#{issue.id}"
                 end
-                assert_response 302
                 # Issue view
                 follow_redirect!

test/integration/layout_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class LayoutTest < ActionController::IntegrationTest
+            class LayoutTest < ActionDispatch::IntegrationTest
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,

test/integration/lib/redmine/hook_test.rb +3 -1

             require File.expand_path('../../../../test_helper', __FILE__)
-            class HookTest < ActionController::IntegrationTest
+            class HookTest < ActionDispatch::IntegrationTest
               fixtures :users, :roles, :projects, :members, :member_roles
               # Hooks that are manually registered later
                 end
               end
+              Redmine::Hook.clear_listeners
               class ContentForInsideHook < Redmine::Hook::ViewListener
                 render_on :view_welcome_index_left, :inline => <<-VIEW
             <% content_for :header_tags do %>

test/integration/lib/redmine/menu_manager_test.rb +1 -1

             require File.expand_path('../../../../test_helper', __FILE__)
-            class MenuManagerTest < ActionController::IntegrationTest
+            class MenuManagerTest < ActionDispatch::IntegrationTest
               include Redmine::I18n
               fixtures :projects, :trackers, :issue_statuses, :issues,

test/integration/lib/redmine/themes_test.rb +1 -1

             require File.expand_path('../../../../test_helper', __FILE__)
-            class ThemesTest < ActionController::IntegrationTest
+            class ThemesTest < ActionDispatch::IntegrationTest
               def setup
                 @theme = Redmine::Themes.themes.last

test/integration/projects_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class ProjectsTest < ActionController::IntegrationTest
+            class ProjectsTest < ActionDispatch::IntegrationTest
               fixtures :projects, :users, :members, :enabled_modules
               def test_archive_project

test/integration/repositories_git_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class RepositoriesGitTest < ActionController::IntegrationTest
+            class RepositoriesGitTest < ActionDispatch::IntegrationTest
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules

test/integration/routing/account_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingAccountTest < ActionController::IntegrationTest
+            class RoutingAccountTest < ActionDispatch::IntegrationTest
               def test_account
                 ["get", "post"].each do |method|
                   assert_routing(

test/integration/routing/activities_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingActivitiesTest < ActionController::IntegrationTest
+            class RoutingActivitiesTest < ActionDispatch::IntegrationTest
               def test_activities
                 assert_routing(
                        { :method => 'get', :path => "/activity" },

test/integration/routing/admin_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingAdminTest < ActionController::IntegrationTest
+            class RoutingAdminTest < ActionDispatch::IntegrationTest
               def test_administration_panel
                 assert_routing(
                     { :method => 'get', :path => "/admin" },

test/integration/routing/attachments_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingAttachmentsTest < ActionController::IntegrationTest
+            class RoutingAttachmentsTest < ActionDispatch::IntegrationTest
               def test_attachments
                 assert_routing(
                        { :method => 'get', :path => "/attachments/1" },

test/integration/routing/auth_sources_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingAuthSourcesTest < ActionController::IntegrationTest
+            class RoutingAuthSourcesTest < ActionDispatch::IntegrationTest
               def test_auth_sources
                 assert_routing(
                     { :method => 'get', :path => "/auth_sources" },

test/integration/routing/auto_completes_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingAutoCompletesTest < ActionController::IntegrationTest
+            class RoutingAutoCompletesTest < ActionDispatch::IntegrationTest
               def test_auto_completes
                 assert_routing(
                     { :method => 'get', :path => "/issues/auto_complete" },

test/integration/routing/boards_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingBoardsTest < ActionController::IntegrationTest
+            class RoutingBoardsTest < ActionDispatch::IntegrationTest
               def test_boards
                 assert_routing(
                     { :method => 'get', :path => "/projects/world_domination/boards" },

test/integration/routing/calendars_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingCalendarsTest < ActionController::IntegrationTest
+            class RoutingCalendarsTest < ActionDispatch::IntegrationTest
               def test_calendars
                 assert_routing(
                     { :method => 'get', :path => "/issues/calendar" },

test/integration/routing/comments_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingCommentsTest < ActionController::IntegrationTest
+            class RoutingCommentsTest < ActionDispatch::IntegrationTest
               def test_comments
                 assert_routing(
                     { :method => 'post', :path => "/news/567/comments" },

test/integration/routing/context_menus_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingContextMenusTest < ActionController::IntegrationTest
+            class RoutingContextMenusTest < ActionDispatch::IntegrationTest
               def test_context_menus_time_entries
                 ["get", "post"].each do |method|
                   assert_routing(

test/integration/routing/custom_fields_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingCustomFieldsTest < ActionController::IntegrationTest
+            class RoutingCustomFieldsTest < ActionDispatch::IntegrationTest
               def test_custom_fields
                 assert_routing(
                     { :method => 'get', :path => "/custom_fields" },

test/integration/routing/documents_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingDocumentsTest < ActionController::IntegrationTest
+            class RoutingDocumentsTest < ActionDispatch::IntegrationTest
               def test_documents_scoped_under_project
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/documents" },

test/integration/routing/enumerations_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingEnumerationsTest < ActionController::IntegrationTest
+            class RoutingEnumerationsTest < ActionDispatch::IntegrationTest
               def test_enumerations
                 assert_routing(
                     { :method => 'get', :path => "/enumerations" },

test/integration/routing/files_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingFilesTest < ActionController::IntegrationTest
+            class RoutingFilesTest < ActionDispatch::IntegrationTest
               def test_files
                 assert_routing(
                     { :method => 'get', :path => "/projects/33/files" },

test/integration/routing/gantts_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingGanttsTest < ActionController::IntegrationTest
+            class RoutingGanttsTest < ActionDispatch::IntegrationTest
               def test_gantts
                 assert_routing(
                     { :method => 'get', :path => "/issues/gantt" },

test/integration/routing/groups_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingGroupsTest < ActionController::IntegrationTest
+            class RoutingGroupsTest < ActionDispatch::IntegrationTest
               def test_groups_resources
                 assert_routing(
                     { :method => 'get', :path => "/groups" },

test/integration/routing/issue_categories_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingIssueCategoriesTest < ActionController::IntegrationTest
+            class RoutingIssueCategoriesTest < ActionDispatch::IntegrationTest
               def test_issue_categories_scoped_under_project
                 assert_routing(
                     { :method => 'get', :path => "/projects/foo/issue_categories" },

test/integration/routing/issue_relations_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingIssueRelationsTest < ActionController::IntegrationTest
+            class RoutingIssueRelationsTest < ActionDispatch::IntegrationTest
               def test_issue_relations
                 assert_routing(
                     { :method => 'get', :path => "/issues/1/relations" },

test/integration/routing/issue_statuses_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingIssueStatusesTest < ActionController::IntegrationTest
+            class RoutingIssueStatusesTest < ActionDispatch::IntegrationTest
               def test_issue_statuses
                 assert_routing(
                     { :method => 'get', :path => "/issue_statuses" },

test/integration/routing/issues_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingIssuesTest < ActionController::IntegrationTest
+            class RoutingIssuesTest < ActionDispatch::IntegrationTest
               def test_issues_rest_actions
                 assert_routing(
                     { :method => 'get', :path => "/issues" },

test/integration/routing/journals_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingJournalsTest < ActionController::IntegrationTest
+            class RoutingJournalsTest < ActionDispatch::IntegrationTest
               def test_journals
                 assert_routing(
                     { :method => 'post', :path => "/issues/1/quoted" },

test/integration/routing/mail_handler_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingMailHandlerTest < ActionController::IntegrationTest
+            class RoutingMailHandlerTest < ActionDispatch::IntegrationTest
               def test_mail_handler
                 assert_routing(
                     { :method => "post", :path => "/mail_handler" },

test/integration/routing/members_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingMembersTest < ActionController::IntegrationTest
+            class RoutingMembersTest < ActionDispatch::IntegrationTest
               def test_members
                 assert_routing(
                     { :method => 'get', :path => "/projects/5234/memberships.xml" },

test/integration/routing/messages_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingMessagesTest < ActionController::IntegrationTest
+            class RoutingMessagesTest < ActionDispatch::IntegrationTest
               def test_messages
                 assert_routing(
                     { :method => 'get', :path => "/boards/22/topics/2" },

test/integration/routing/my_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingMyTest < ActionController::IntegrationTest
+            class RoutingMyTest < ActionDispatch::IntegrationTest
               def test_my
                 ["get", "post"].each do |method|
                   assert_routing(

test/integration/routing/news_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingNewsTest < ActionController::IntegrationTest
+            class RoutingNewsTest < ActionDispatch::IntegrationTest
               def test_news_index
                 assert_routing(
                     { :method => 'get', :path => "/news" },

test/integration/routing/previews_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingPreviewsTest < ActionController::IntegrationTest
+            class RoutingPreviewsTest < ActionDispatch::IntegrationTest
               def test_previews
                 ["get", "post", "put"].each do |method|
                   assert_routing(

test/integration/routing/project_enumerations_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingProjectEnumerationsTest < ActionController::IntegrationTest
+            class RoutingProjectEnumerationsTest < ActionDispatch::IntegrationTest
               def test_project_enumerations
                 assert_routing(
                     { :method => 'put', :path => "/projects/64/enumerations" },

test/integration/routing/projects_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingProjectsTest < ActionController::IntegrationTest
+            class RoutingProjectsTest < ActionDispatch::IntegrationTest
               def test_projects
                 assert_routing(
                     { :method => 'get', :path => "/projects" },

test/integration/routing/queries_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingQueriesTest < ActionController::IntegrationTest
+            class RoutingQueriesTest < ActionDispatch::IntegrationTest
               def test_queries
                 assert_routing(
                     { :method => 'get', :path => "/queries.xml" },

test/integration/routing/reports_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingReportsTest < ActionController::IntegrationTest
+            class RoutingReportsTest < ActionDispatch::IntegrationTest
               def test_reports
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/issues/report" },

test/integration/routing/repositories_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingRepositoriesTest < ActionController::IntegrationTest
+            class RoutingRepositoriesTest < ActionDispatch::IntegrationTest
               def setup
                 @path_hash  = repository_path_hash(%w[path to file.c])
                 assert_equal "path/to/file.c", @path_hash[:path]

test/integration/routing/roles_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingRolesTest < ActionController::IntegrationTest
+            class RoutingRolesTest < ActionDispatch::IntegrationTest
               def test_roles
                 assert_routing(
                     { :method => 'get', :path => "/roles" },

test/integration/routing/search_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingSearchTest < ActionController::IntegrationTest
+            class RoutingSearchTest < ActionDispatch::IntegrationTest
               def test_search
                 assert_routing(
                     { :method => 'get', :path => "/search" },

test/integration/routing/settings_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingSettingsTest < ActionController::IntegrationTest
+            class RoutingSettingsTest < ActionDispatch::IntegrationTest
               def test_settings
                 assert_routing(
                     { :method => 'get', :path => "/settings" },

test/integration/routing/sys_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingSysTest < ActionController::IntegrationTest
+            class RoutingSysTest < ActionDispatch::IntegrationTest
               def test_sys
                 assert_routing(
                     { :method => 'get', :path => "/sys/projects" },

test/integration/routing/timelog_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingTimelogsTest < ActionController::IntegrationTest
+            class RoutingTimelogsTest < ActionDispatch::IntegrationTest
               def test_timelogs_global
                 assert_routing(
                     { :method => 'get', :path => "/time_entries" },

test/integration/routing/trackers_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingTrackersTest < ActionController::IntegrationTest
+            class RoutingTrackersTest < ActionDispatch::IntegrationTest
               def test_trackers
                 assert_routing(
                     { :method => 'get', :path => "/trackers" },

test/integration/routing/users_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingUsersTest < ActionController::IntegrationTest
+            class RoutingUsersTest < ActionDispatch::IntegrationTest
               def test_users
                 assert_routing(
                     { :method => 'get', :path => "/users" },

test/integration/routing/versions_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingVersionsTest < ActionController::IntegrationTest
+            class RoutingVersionsTest < ActionDispatch::IntegrationTest
               def test_roadmap
                 # /projects/foo/versions is /projects/foo/roadmap
                 assert_routing(

test/integration/routing/watchers_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingWatchersTest < ActionController::IntegrationTest
+            class RoutingWatchersTest < ActionDispatch::IntegrationTest
               def test_watchers
                 assert_routing(
                     { :method => 'get', :path => "/watchers/new" },

test/integration/routing/welcome_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingWelcomeTest < ActionController::IntegrationTest
+            class RoutingWelcomeTest < ActionDispatch::IntegrationTest
               def test_welcome
                 assert_routing(
                     { :method => 'get', :path => "/" },

test/integration/routing/wiki_test.rb +2 -2

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingWikiTest < ActionController::IntegrationTest
+            class RoutingWikiTest < ActionDispatch::IntegrationTest
               def test_wiki_matching
                 assert_routing(
                     { :method => 'get', :path => "/projects/567/wiki" },
                        :id => 'CookBook_documentation', :version => '2' }
                    )
                 # Make sure we don't route wiki page sub-uris to let plugins handle them
-                assert_raise(ActionController::RoutingError) do
+                assert_raise(Minitest::Assertion) do
                   assert_recognizes({}, {:method => 'get', :path => "/projects/1/wiki/CookBook_documentation/whatever"})
                 end
               end

test/integration/routing/wikis_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingWikisTest < ActionController::IntegrationTest
+            class RoutingWikisTest < ActionDispatch::IntegrationTest
               def test_wikis_plural_admin_setup
                 ["get", "post"].each do |method|
                   assert_routing(

test/integration/routing/workflows_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
-            class RoutingWorkflowsTest < ActionController::IntegrationTest
+            class RoutingWorkflowsTest < ActionDispatch::IntegrationTest
               def test_workflows
                 assert_routing(
                     { :method => 'get', :path => "/workflows" },

test/integration/users_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
-            class UsersTest < ActionController::IntegrationTest
+            class UsersTest < ActionDispatch::IntegrationTest
               fixtures :users
               def test_destroy_should_not_accept_get_requests

test/object_helpers.rb +1 -9

               def User.add_to_project(user, project, roles=nil)
                 roles = Role.find(1) if roles.nil?
-                roles = [roles] unless roles.is_a?(Array)
+                roles = [roles] if roles.is_a?(Role)
                 Member.create!(:principal => user, :project => project, :roles => roles)
               end
                 changeset.save!
                 changeset
               end
-              def Query.generate!(attributes={})
-                query = new(attributes)
-                query.name = "Generated query" if query.name.blank?
-                query.user ||= User.find(1)
-                query.save!
-                query
-              end
             end
             module IssueObjectHelpers

test/test_helper.rb +15 -5

             require 'awesome_nested_set/version'
+            class ActionView::TestCase
+              helper :application
+              include ApplicationHelper
+            end
             class ActiveSupport::TestCase
               include ActionDispatch::TestProcess
+              include Shoulda::Context::Assertions
+              include Shoulda::Context::InstanceMethods
+              extend Shoulda::Context::ClassMethods
               self.use_transactional_fixtures = true
               self.use_instantiated_fixtures  = false
-              ESCAPED_CANT  = 'can&#x27;t'
+              #ESCAPED_CANT  = 'can&#x27;t'
-              ESCAPED_UCANT = 'Can&#x27;t'
+              #ESCAPED_UCANT = 'Can&#x27;t'
               # Rails 4.0.2
-              #ESCAPED_CANT  = 'can&#39;t'
+              ESCAPED_CANT  = 'can&#39;t'
-              #ESCAPED_UCANT = 'Can&#39;t'
+              ESCAPED_UCANT = 'Can&#39;t'
               def log_user(login, password)
                 User.anonymous
               # Returns the path to the test +vendor+ repository
               def self.repository_path(vendor)
-                Rails.root.join("tmp/test/#{vendor.downcase}_repository").to_s
+                path = Rails.root.join("tmp/test/#{vendor.downcase}_repository").to_s
+                # Unlike ruby, JRuby returns Rails.root with backslashes under Windows
+                path.tr("\\", "/")
               end
               # Returns the url of the subversion test repository

test/unit/changeset_test.rb +16 -31

               def test_comments_should_be_converted_to_utf8
                 proj = Project.find(3)
                 # str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
-                str = "Texte encod\xe9 en ISO-8859-1."
+                str = "Texte encod\xe9 en ISO-8859-1.".force_encoding("ASCII-8BIT")
-                str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                                   :scmid        => '12345',
                                   :comments     => str)
                 assert( c.save )
-                str_utf8 = "Texte encod\xc3\xa9 en ISO-8859-1."
+                str_utf8 = "Texte encod\xc3\xa9 en ISO-8859-1.".force_encoding("UTF-8")
-                str_utf8.force_encoding("UTF-8") if str_utf8.respond_to?(:force_encoding)
                 assert_equal str_utf8, c.comments
               end
               def test_invalid_utf8_sequences_in_comments_should_be_replaced_latin1
                 proj = Project.find(3)
                 # str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
-                str1 = "Texte encod\xe9 en ISO-8859-1."
+                str1 = "Texte encod\xe9 en ISO-8859-1.".force_encoding("UTF-8")
-                str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
+                str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test".force_encoding("ASCII-8BIT")
-                str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
-                str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
               def test_invalid_utf8_sequences_in_comments_should_be_replaced_ja_jis
                 proj = Project.find(3)
-                str = "test\xb5\xfetest\xb5\xfe"
+                str = "test\xb5\xfetest\xb5\xfe".force_encoding('ASCII-8BIT')
-                if str.respond_to?(:force_encoding)
-                  str.force_encoding('ASCII-8BIT')
-                end
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                 s1 = "\xC2\x80"
                 s2 = "\xc3\x82\xc2\x80"
                 s4 = s2.dup
-                if s1.respond_to?(:force_encoding)
+                s3 = s1.dup
-                  s3 = s1.dup
+                s1.force_encoding('ASCII-8BIT')
-                  s1.force_encoding('ASCII-8BIT')
+                s2.force_encoding('ASCII-8BIT')
-                  s2.force_encoding('ASCII-8BIT')
+                s3.force_encoding('ISO-8859-1')
-                  s3.force_encoding('ISO-8859-1')
+                s4.force_encoding('UTF-8')
-                  s4.force_encoding('UTF-8')
+                assert_equal s3.encode('UTF-8'), s4
-                  assert_equal s3.encode('UTF-8'), s4
-                end
                 proj = Project.find(3)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
               def test_invalid_utf8_sequences_in_paths_should_be_replaced
                 proj = Project.find(3)
-                str1 = "Texte encod\xe9 en ISO-8859-1"
+                str1 = "Texte encod\xe9 en ISO-8859-1".force_encoding("UTF-8")
-                str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
+                str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test".force_encoding("ASCII-8BIT")
-                str1.force_encoding("UTF-8")      if str1.respond_to?(:force_encoding)
-                str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
                 r = Repository::Bazaar.create!(
                         :project => proj,
                         :url => '/tmp/test/bazaar',
                 assert( c.save )
                 assert_equal "", c.comments
                 assert_equal nil, c.committer
-                if c.comments.respond_to?(:force_encoding)
+                assert_equal "UTF-8", c.comments.encoding.to_s
-                  assert_equal "UTF-8", c.comments.encoding.to_s
-                end
               end
               def test_comments_empty
                 assert( c.save )
                 assert_equal "", c.comments
                 assert_equal "", c.committer
-                if c.comments.respond_to?(:force_encoding)
+                assert_equal "UTF-8", c.comments.encoding.to_s
-                  assert_equal "UTF-8", c.comments.encoding.to_s
+                assert_equal "UTF-8", c.committer.encoding.to_s
-                  assert_equal "UTF-8", c.committer.encoding.to_s
-                end
               end
               def test_comments_should_accept_more_than_64k

test/unit/custom_field_test.rb +6 -8

                 assert_equal ["One value", "And another one"], field.possible_values
               end
-              if "string".respond_to?(:encoding)
+              def test_possible_values_stored_as_binary_should_be_utf8_encoded
-                def test_possible_values_stored_as_binary_should_be_utf8_encoded
+                field = CustomField.find(11)
-                  field = CustomField.find(11)
+                assert_kind_of Array, field.possible_values
-                  assert_kind_of Array, field.possible_values
+                assert field.possible_values.size > 0
-                  assert field.possible_values.size > 0
+                field.possible_values.each do |value|
-                  field.possible_values.each do |value|
+                  assert_equal "UTF-8", value.encoding.name
-                    assert_equal "UTF-8", value.encoding.name
-                  end
                 end
               end

test/unit/enabled_module_test.rb +1 -1

               def test_enabling_wiki_should_create_a_wiki
                 CustomField.delete_all
-                project = Project.create!(:name => 'Project with wiki', :identifier => 'wikiproject')
+                project = Project.create!(:name => 'Project with wiki', :identifier => 'wikiproject', :enabled_module_names => [])
                 assert_nil project.wiki
                 project.enabled_module_names = ['wiki']
                 project.reload

test/unit/group_test.rb +1 -18

@@ -52,8 +52,7 class GroupTest < ActiveSupport::TestCase
52		52
53	def test_blank_name_error_message_fr	53	def test_blank_name_error_message_fr
54	set_language_if_valid 'fr'	54	set_language_if_valid 'fr'
55	str = "Nom doit \xc3\xaatre renseign\xc3\xa9(e)"	55	str = "Nom doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
56	str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
57	g = Group.new	56	g = Group.new
58	assert !g.save	57	assert !g.save
59	assert_include str, g.errors.full_messages	58	assert_include str, g.errors.full_messages
@@ -133,20 +132,4 class GroupTest < ActiveSupport::TestCase
133		132
134	assert_equal nil, Issue.find(1).assigned_to_id	133	assert_equal nil, Issue.find(1).assigned_to_id
135	end	134	end
136
137	def test_builtin_id_with_anonymous_user_should_return_anonymous_group
138	assert_equal 13, Group.builtin_id(User.anonymous)
139	end
140
141	def test_builtin_id_with_anonymous_role_should_return_anonymous_group
142	assert_equal 13, Group.builtin_id(Role.anonymous)
143	end
144
145	def test_builtin_id_with_user_should_return_non_member_group
146	assert_equal 12, Group.builtin_id(User.find(1))
147	end
148
149	def test_builtin_id_with_non_member_role_should_return_non_member_group
150	assert_equal 12, Group.builtin_id(Role.non_member)
151	end
152	end	135	end

test/unit/helpers/application_helper_test.rb +15 -32

               def setup
                 super
                 set_tmp_attachments_directory
-                @russian_test = "\xd1\x82\xd0\xb5\xd1\x81\xd1\x82"
+                @russian_test = "\xd1\x82\xd0\xb5\xd1\x81\xd1\x82".force_encoding('UTF-8')
-                if @russian_test.respond_to?(:force_encoding)
-                  @russian_test.force_encoding('UTF-8')
-                end
               end
               test "#link_to_if_authorized for authorized user should allow using the :controller and :action for the target link" do
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
-              if 'ruby'.respond_to?(:encoding)
+              def test_auto_links_with_non_ascii_characters
-                def test_auto_links_with_non_ascii_characters
+                to_test = {
-                  to_test = {
+                  "http://foo.bar/#{@russian_test}" =>
-                    "http://foo.bar/#{@russian_test}" =>
+                    %|<a class="external" href="http://foo.bar/#{@russian_test}">http://foo.bar/#{@russian_test}</a>|
-                      %|<a class="external" href="http://foo.bar/#{@russian_test}">http://foo.bar/#{@russian_test}</a>|
+                to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
-                  to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
-                end
-              else
-                puts 'Skipping test_auto_links_with_non_ascii_characters, unsupported ruby version'
               end
               def test_auto_mailto
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
-              if 'ruby'.respond_to?(:encoding)
+              def test_textile_external_links_with_non_ascii_characters
-                def test_textile_external_links_with_non_ascii_characters
+                to_test = {
-                  to_test = {
+                  %|This is a "link":http://foo.bar/#{@russian_test}| =>
-                    %|This is a "link":http://foo.bar/#{@russian_test}| =>
+                    %|This is a <a href="http://foo.bar/#{@russian_test}" class="external">link</a>|
-                      %|This is a <a href="http://foo.bar/#{@russian_test}" class="external">link</a>|
+                to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
-                  to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
-                end
-              else
-                puts 'Skipping test_textile_external_links_with_non_ascii_characters, unsupported ruby version'
               end
               def test_redmine_links
                 project = Project.find(1)
                 assert_equal %(<a href="/projects/ecookbook">eCookbook</a>),
                              link_to_project(project)
-                assert_equal %(<a href="/projects/ecookbook/settings">eCookbook</a>),
-                             link_to_project(project, :action => 'settings')
                 assert_equal %(<a href="http://test.host/projects/ecookbook?jump=blah">eCookbook</a>),
                              link_to_project(project, {:only_path => false, :jump => 'blah'})
-                result = link_to("eCookbook", "/projects/ecookbook/settings", :class => "project")
-                assert_equal result,
-                             link_to_project(project, {:action => 'settings'}, :class => "project")
               end
               def test_link_to_project_settings
               def test_raw_json_should_escape_closing_tags
                 s = raw_json(["<foo>bar</foo>"])
-                assert_equal '["<foo>bar<\/foo>"]', s
+                assert_include '\/foo', s
               end
               def test_raw_json_should_be_html_safe
               end
               def test_truncate_single_line_non_ascii
-                ja = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
+                ja = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 result = truncate_single_line_raw("#{ja}\n#{ja}\n#{ja}", 10)
                 assert_equal "#{ja} #{ja}...", result
                 assert !result.html_safe?

test/unit/helpers/projects_helper_test.rb +6 -22

               def test_link_to_version_within_project
                 @project = Project.find(2)
                 User.current = User.find(1)
-                assert_equal '<a href="/versions/5" title="07/01/2006">Alpha</a>', link_to_version(Version.find(5))
+                assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(Version.find(5))
               end
               def test_link_to_version
                 User.current = User.find(1)
-                assert_equal '<a href="/versions/5" title="07/01/2006">Alpha</a>', link_to_version(Version.find(5))
+                assert_equal '<a href="/versions/5">OnlineStore - Alpha</a>', link_to_version(Version.find(5))
-              end
-              def test_link_to_version_without_effective_date
-                User.current = User.find(1)
-                version = Version.find(5)
-                version.effective_date = nil
-                assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(version)
               end
               def test_link_to_private_version
-                assert_equal 'Alpha', link_to_version(Version.find(5))
+                assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5))
               end
               def test_link_to_version_invalid_version
               end
               def test_format_version_name
-                assert_equal "0.1", format_version_name(Version.find(1))
+                assert_equal "eCookbook - 0.1", format_version_name(Version.find(1))
-              end
-              def test_format_version_name_for_shared_version_within_project_should_not_display_project_name
-                @project = Project.find(1)
-                version = Version.find(1)
-                version.sharing = 'system'
-                assert_equal "0.1", format_version_name(version)
               end
-              def test_format_version_name_for_shared_version_should_display_project_name
+              def test_format_version_name_for_system_version
-                version = Version.find(1)
+                assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
-                version.sharing = 'system'
-                assert_equal "eCookbook - 0.1", format_version_name(version)
               end
               def test_version_options_for_select_with_no_versions

test/unit/initializers/patches_test.rb +19 -23

@@ -47,21 +47,19 class PatchesTest < ActiveSupport::TestCase
47	end	47	end
48		48
49	# https://github.com/rails/rails/pull/14198/files	49	# https://github.com/rails/rails/pull/14198/files
50	if RUBY_VERSION >= "1.9"	50	def test_indifferent_select
51	def test_indifferent_select	51	hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { \|_ ,v\| v == 1 }
52	hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { \|_ ,v\| v == 1 }	52	assert_equal({ 'a' => 1 }, hash)
53	assert_equal({ 'a' => 1 }, hash)	53	assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
54	assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?	54	Hash : ActiveSupport::HashWithIndifferentAccess),
55	Hash : ActiveSupport::HashWithIndifferentAccess),	55	hash
56	hash	56	end
57	end
58		57
59	def test_indifferent_select_bang	58	def test_indifferent_select_bang
60	indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)	59	indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
61	indifferent_strings.select! { \|_, v\| v == 1 }	60	indifferent_strings.select! { \|_, v\| v == 1 }
62	assert_equal({ 'a' => 1 }, indifferent_strings)	61	assert_equal({ 'a' => 1 }, indifferent_strings)
63	assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings	62	assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
64	end
65	end	63	end
66		64
67	def test_indifferent_reject	65	def test_indifferent_reject
@@ -77,15 +75,13 class PatchesTest < ActiveSupport::TestCase
77	assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings	75	assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
78	end	76	end
79		77
80	if RUBY_VERSION >= "1.9"	78	def test_select
81	def test_select	79	assert_equal @keys, @ordered_hash.select { true }.map(&:first)
82	~~assert_equal~~ ~~@keys~~, @ordered_hash.select { true }.~~map~~(&~~:first~~)	80	new_ordered_hash = @ordered_hash.select { true }
83	new_ordered_hash = @ordered_hash.select { true }	81	assert_equal @keys, new_ordered_hash.map(&:first)
84	assert_equal @keys, new_ordered_hash.map(&:first)	82	assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
85	assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?	83	Hash : ActiveSupport::OrderedHash),
86	~~Hash~~ : ~~ActiveSupport~~::~~OrderedHash~~),	84	new_ordered_hash
87	new_ordered_hash
88	end
89	end	85	end
90		86
91	def test_reject	87	def test_reject

test/unit/issue_nested_set_test.rb +1 -1

                 c.reload
                 assert_equal 5, c.issues.count
-                ic1, ic2, ic3, ic4, ic5 = c.issues.order('subject').all
+                ic1, ic2, ic3, ic4, ic5 = c.issues.order('subject').to_a
                 assert ic1.root?
                 assert_equal ic1, ic2.parent
                 assert_equal ic1, ic3.parent

test/unit/issue_priority_test.rb +4 -4

                 IssuePriority.clear_position_names
                 IssuePriority.compute_position_names
-                assert_equal %w(lowest default high3 high2 highest), IssuePriority.active.all.sort.map(&:position_name)
+                assert_equal %w(lowest default high3 high2 highest), IssuePriority.active.to_a.sort.map(&:position_name)
               end
               def test_compute_position_names_without_default_priority_should_split_priorities
                 IssuePriority.update_all :is_default => false
                 IssuePriority.compute_position_names
-                assert_equal %w(lowest low2 default high2 highest), IssuePriority.active.all.sort.map(&:position_name)
+                assert_equal %w(lowest low2 default high2 highest), IssuePriority.active.to_a.sort.map(&:position_name)
               end
               def test_adding_a_priority_should_update_position_names
                 priority = IssuePriority.create!(:name => 'New')
-                assert_equal %w(lowest default high4 high3 high2 highest), IssuePriority.active.all.sort.map(&:position_name)
+                assert_equal %w(lowest default high4 high3 high2 highest), IssuePriority.active.to_a.sort.map(&:position_name)
               end
               def test_destroying_a_priority_should_update_position_names
                 IssuePriority.find_by_position_name('highest').destroy
-                assert_equal %w(lowest default high2 highest), IssuePriority.active.all.sort.map(&:position_name)
+                assert_equal %w(lowest default high2 highest), IssuePriority.active.to_a.sort.map(&:position_name)
               end
             end

test/unit/issue_status_test.rb +1 -1

               end
               def test_sorted_scope
-                assert_equal IssueStatus.all.sort, IssueStatus.sorted.all
+                assert_equal IssueStatus.all.sort, IssueStatus.sorted.to_a
               end
               def test_named_scope

test/unit/issue_test.rb +31 -22

               def test_visible_scope_for_anonymous
                 # Anonymous user should see issues of public projects only
-                issues = Issue.visible(User.anonymous).all
+                issues = Issue.visible(User.anonymous).to_a
                 assert issues.any?
                 assert_nil issues.detect {|issue| !issue.project.is_public?}
                 assert_nil issues.detect {|issue| issue.is_private?}
               def test_visible_scope_for_anonymous_without_view_issues_permissions
                 # Anonymous user should not see issues without permission
                 Role.anonymous.remove_permission!(:view_issues)
-                issues = Issue.visible(User.anonymous).all
+                issues = Issue.visible(User.anonymous).to_a
                 assert issues.empty?
                 assert_visibility_match User.anonymous, issues
               end
                 user = User.find(9)
                 assert user.projects.empty?
                 # Non member user should see issues of public projects only
-                issues = Issue.visible(user).all
+                issues = Issue.visible(user).to_a
                 assert issues.any?
                 assert_nil issues.detect {|issue| !issue.project.is_public?}
                 assert_nil issues.detect {|issue| issue.is_private?}
                 Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 9, :subject => 'Issue by non member')
                 user = User.find(9)
-                issues = Issue.visible(user).all
+                issues = Issue.visible(user).to_a
                 assert issues.any?
                 assert_nil issues.detect {|issue| issue.author != user}
                 assert_visibility_match user, issues
                 Role.non_member.remove_permission!(:view_issues)
                 user = User.find(9)
                 assert user.projects.empty?
-                issues = Issue.visible(user).all
+                issues = Issue.visible(user).to_a
                 assert issues.empty?
                 assert_visibility_match user, issues
               end
                 # User should see issues of projects for which user has view_issues permissions only
                 Role.non_member.remove_permission!(:view_issues)
                 Member.create!(:principal => user, :project_id => 3, :role_ids => [2])
-                issues = Issue.visible(user).all
+                issues = Issue.visible(user).to_a
                 assert issues.any?
                 assert_nil issues.detect {|issue| issue.project_id != 3}
                 assert_nil issues.detect {|issue| issue.is_private?}
                   :is_private => true)
                 Role.find(2).update_attribute :issues_visibility, 'default'
-                issues = Issue.visible(User.find(8)).all
+                issues = Issue.visible(User.find(8)).to_a
                 assert issues.any?
                 assert issues.include?(issue)
                 Role.find(2).update_attribute :issues_visibility, 'own'
-                issues = Issue.visible(User.find(8)).all
+                issues = Issue.visible(User.find(8)).to_a
                 assert issues.any?
                 assert issues.include?(issue)
               end
                 user = User.find(1)
                 user.members.each(&:destroy)
                 assert user.projects.empty?
-                issues = Issue.visible(user).all
+                issues = Issue.visible(user).to_a
                 assert issues.any?
                 # Admin should see issues on private projects that admin does not belong to
                 assert issues.detect {|issue| !issue.project.is_public?}
               def test_visible_scope_with_project
                 project = Project.find(1)
-                issues = Issue.visible(User.find(2), :project => project).all
+                issues = Issue.visible(User.find(2), :project => project).to_a
                 projects = issues.collect(&:project).uniq
                 assert_equal 1, projects.size
                 assert_equal project, projects.first
               def test_visible_scope_with_project_and_subprojects
                 project = Project.find(1)
-                issues = Issue.visible(User.find(2), :project => project, :with_subprojects => true).all
+                issues = Issue.visible(User.find(2), :project => project, :with_subprojects => true).to_a
                 projects = issues.collect(&:project).uniq
                 assert projects.size > 1
                 assert_equal [], projects.select {|p| !p.is_or_is_descendant_of?(project)}
                 assert_equal 2, parent.descendants.visible(user).collect{|i| i}.size
               end
+              def test_visible_scope_with_unsaved_user_should_not_raise_an_error
+                user = User.new
+                assert_nothing_raised do
+                  Issue.visible(user).to_a
+                end
+              end
               def test_open_scope
-                issues = Issue.open.all
+                issues = Issue.open.to_a
                 assert_nil issues.detect(&:closed?)
               end
               def test_open_scope_with_arg
-                issues = Issue.open(false).all
+                issues = Issue.open(false).to_a
                 assert_equal issues, issues.select(&:closed?)
               end
               end
               test "#copy should not create a journal" do
-                copy = Issue.find(1).copy(:project_id => 3, :tracker_id => 2, :assigned_to_id => 3)
+                copy = Issue.find(1).copy({:project_id => 3, :tracker_id => 2, :assigned_to_id => 3}, :link => false)
                 copy.save!
                 assert_equal 0, copy.reload.journals.size
               end
               test "#copy should create a journal with notes" do
                 date = Date.today
                 notes = "Notes added when copying"
-                copy = Issue.find(1).copy(:project_id => 3, :tracker_id => 2, :start_date => date)
+                copy = Issue.find(1).copy({:project_id => 3, :tracker_id => 2, :start_date => date}, :link => false)
                 copy.init_journal(User.current, notes)
                 copy.save!
                 issue2.reload
                 assert_equal Date.parse('2012-10-18'), issue2.start_date
-                child = Issue.new(:parent_issue_id => issue2.id, :start_date => '2012-10-16',
+                with_settings :date_format => '%m/%d/%Y' do
-                  :project_id => 1, :tracker_id => 1, :status_id => 1, :subject => 'Child', :author_id => 1)
+                  child = Issue.new(:parent_issue_id => issue2.id, :start_date => '2012-10-16',
-                assert !child.valid?
+                    :project_id => 1, :tracker_id => 1, :status_id => 1, :subject => 'Child', :author_id => 1)
-                assert_include 'Start date cannot be earlier than 10/18/2012 because of preceding issues', child.errors.full_messages
+                  assert !child.valid?
-                assert_equal Date.parse('2012-10-18'), child.soonest_start
+                  assert_include 'Start date cannot be earlier than 10/18/2012 because of preceding issues', child.errors.full_messages
-                child.start_date = '2012-10-18'
+                  assert_equal Date.parse('2012-10-18'), child.soonest_start
-                assert child.save
+                  child.start_date = '2012-10-18'
+                  assert child.save
+                end
               end
               def test_setting_parent_to_a_dependent_issue_should_not_validate

test/unit/journal_test.rb +7 -6

               def setup
                 @journal = Journal.find 1
+                User.current = nil
               end
               def test_journalized_is_an_issue
               def test_visible_scope_for_anonymous
                 # Anonymous user should see issues of public projects only
-                journals = Journal.visible(User.anonymous).all
+                journals = Journal.visible(User.anonymous).to_a
                 assert journals.any?
                 assert_nil journals.detect {|journal| !journal.issue.project.is_public?}
                 # Anonymous user should not see issues without permission
                 Role.anonymous.remove_permission!(:view_issues)
-                journals = Journal.visible(User.anonymous).all
+                journals = Journal.visible(User.anonymous).to_a
                 assert journals.empty?
               end
                 user = User.find(9)
                 assert user.projects.empty?
                 # Non member user should see issues of public projects only
-                journals = Journal.visible(user).all
+                journals = Journal.visible(user).to_a
                 assert journals.any?
                 assert_nil journals.detect {|journal| !journal.issue.project.is_public?}
                 # Non member user should not see issues without permission
                 Role.non_member.remove_permission!(:view_issues)
                 user.reload
-                journals = Journal.visible(user).all
+                journals = Journal.visible(user).to_a
                 assert journals.empty?
                 # User should see issues of projects for which user has view_issues permissions only
                 Member.create!(:principal => user, :project_id => 1, :role_ids => [1])
                 user.reload
-                journals = Journal.visible(user).all
+                journals = Journal.visible(user).to_a
                 assert journals.any?
                 assert_nil journals.detect {|journal| journal.issue.project_id != 1}
               end
                 user = User.find(1)
                 user.members.each(&:destroy)
                 assert user.projects.empty?
-                journals = Journal.visible(user).all
+                journals = Journal.visible(user).to_a
                 assert journals.any?
                 # Admin should see issues on private projects that admin does not belong to
                 assert journals.detect {|journal| !journal.issue.project.is_public?}

test/unit/lib/redmine/codeset_util_test.rb +19 -46

               def test_to_utf8_by_setting_from_latin1
                 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
-                  s1 = "Texte encod\xc3\xa9"
+                  s1 = "Texte encod\xc3\xa9".force_encoding("UTF-8")
-                  s2 = "Texte encod\xe9"
+                  s2 = "Texte encod\xe9".force_encoding("ASCII-8BIT")
-                  s3 = s2.dup
+                  s3 = s2.dup.force_encoding("UTF-8")
-                  if s1.respond_to?(:force_encoding)
-                    s1.force_encoding("UTF-8")
-                    s2.force_encoding("ASCII-8BIT")
-                    s3.force_encoding("UTF-8")
-                  end
                   assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2)
                   assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3)
                 end
               def test_to_utf8_by_setting_from_euc_jp
                 with_settings :repositories_encodings => 'UTF-8,EUC-JP' do
-                  s1 = "\xe3\x83\xac\xe3\x83\x83\xe3\x83\x89\xe3\x83\x9e\xe3\x82\xa4\xe3\x83\xb3"
+                  s1 = "\xe3\x83\xac\xe3\x83\x83\xe3\x83\x89\xe3\x83\x9e\xe3\x82\xa4\xe3\x83\xb3".force_encoding("UTF-8")
-                  s2 = "\xa5\xec\xa5\xc3\xa5\xc9\xa5\xde\xa5\xa4\xa5\xf3"
+                  s2 = "\xa5\xec\xa5\xc3\xa5\xc9\xa5\xde\xa5\xa4\xa5\xf3".force_encoding("ASCII-8BIT")
-                  s3 = s2.dup
+                  s3 = s2.dup.force_encoding("UTF-8")
-                  if s1.respond_to?(:force_encoding)
-                    s1.force_encoding("UTF-8")
-                    s2.force_encoding("ASCII-8BIT")
-                    s3.force_encoding("UTF-8")
-                  end
                   assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2)
                   assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3)
                 end
               def test_to_utf8_by_setting_should_be_converted_all_latin1
                 with_settings :repositories_encodings => 'ISO-8859-1' do
-                  s1 = "\xc3\x82\xc2\x80"
+                  s1 = "\xc3\x82\xc2\x80".force_encoding("UTF-8")
-                  s2 = "\xC2\x80"
+                  s2 = "\xC2\x80".force_encoding("ASCII-8BIT")
-                  s3 = s2.dup
+                  s3 = s2.dup.force_encoding("UTF-8")
-                  if s1.respond_to?(:force_encoding)
-                    s1.force_encoding("UTF-8")
-                    s2.force_encoding("ASCII-8BIT")
-                    s3.force_encoding("UTF-8")
-                  end
                   assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2)
                   assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3)
                 end
               end
               def test_to_utf8_by_setting_returns_ascii_as_utf8
-                s1 = "ASCII"
+                s1 = "ASCII".force_encoding("UTF-8")
-                s2 = s1.dup
+                s2 = s1.dup.force_encoding("ISO-8859-1")
-                if s1.respond_to?(:force_encoding)
-                  s1.force_encoding("UTF-8")
-                  s2.force_encoding("ISO-8859-1")
-                end
                 str1 = Redmine::CodesetUtil.to_utf8_by_setting(s1)
                 str2 = Redmine::CodesetUtil.to_utf8_by_setting(s2)
                 assert_equal s1, str1
                 assert_equal s1, str2
-                if s1.respond_to?(:force_encoding)
+                assert_equal "UTF-8", str1.encoding.to_s
-                  assert_equal "UTF-8", str1.encoding.to_s
+                assert_equal "UTF-8", str2.encoding.to_s
-                  assert_equal "UTF-8", str2.encoding.to_s
-                end
               end
               def test_to_utf8_by_setting_invalid_utf8_sequences_should_be_stripped
                 with_settings :repositories_encodings => '' do
                   # s1 = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
-                  s1 = "Texte encod\xe9 en ISO-8859-1."
+                  s1 = "Texte encod\xe9 en ISO-8859-1.".force_encoding("ASCII-8BIT")
-                  s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding)
                   str = Redmine::CodesetUtil.to_utf8_by_setting(s1)
-                  if str.respond_to?(:force_encoding)
+                  assert str.valid_encoding?
-                    assert str.valid_encoding?
+                  assert_equal "UTF-8", str.encoding.to_s
-                    assert_equal "UTF-8", str.encoding.to_s
-                  end
                   assert_equal "Texte encod? en ISO-8859-1.", str
                 end
               end
               def test_to_utf8_by_setting_invalid_utf8_sequences_should_be_stripped_ja_jis
                 with_settings :repositories_encodings => 'ISO-2022-JP' do
-                  s1 = "test\xb5\xfetest\xb5\xfe"
+                  s1 = "test\xb5\xfetest\xb5\xfe".force_encoding("ASCII-8BIT")
-                  s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding)
                   str = Redmine::CodesetUtil.to_utf8_by_setting(s1)
-                  if str.respond_to?(:force_encoding)
+                  assert str.valid_encoding?
-                    assert str.valid_encoding?
+                  assert_equal "UTF-8", str.encoding.to_s
-                    assert_equal "UTF-8", str.encoding.to_s
-                  end
                   assert_equal "test??test??", str
                 end
               end

test/unit/lib/redmine/export/pdf_test.rb +36 -60

@@ -27,11 +27,10 class PdfTest < ActiveSupport::TestCase
27	end	27	end
28		28
29	def test_rdm_pdf_iconv_cannot_convert_ja_cp932	29	def test_rdm_pdf_iconv_cannot_convert_ja_cp932
30	encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
31	utf8_txt_1 = "\xe7\x8b\x80\xe6\x85\x8b"	30	utf8_txt_1 = "\xe7\x8b\x80\xe6\x85\x8b"
32	utf8_txt_2 = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"	31	utf8_txt_2 = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
33	utf8_txt_3 = "\xe7\x8b\x80\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"	32	utf8_txt_3 = "\xe7\x8b\x80\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
34	if utf8_txt_1.respond_to?(:force_encoding)	33	["CP932", "SJIS"].each do \|encoding\|
35	txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)	34	txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
36	txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)	35	txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
37	txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)	36	txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
@@ -41,88 +40,65 class PdfTest < ActiveSupport::TestCase
41	assert_equal "ASCII-8BIT", txt_1.encoding.to_s	40	assert_equal "ASCII-8BIT", txt_1.encoding.to_s
42	assert_equal "ASCII-8BIT", txt_2.encoding.to_s	41	assert_equal "ASCII-8BIT", txt_2.encoding.to_s
43	assert_equal "ASCII-8BIT", txt_3.encoding.to_s	42	assert_equal "ASCII-8BIT", txt_3.encoding.to_s
44	elsif RUBY_PLATFORM == 'java'
45	assert_equal "??",
46	Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
47	assert_equal "???",
48	Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
49	assert_equal "????",
50	Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
51	else
52	assert_equal "???\x91\xd4",
53	Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
54	assert_equal "???\x91\xd4???",
55	Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
56	assert_equal "??????\x91\xd4???",
57	Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
58	end	43	end
59	end	44	end
60		45
61	def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_en	46	def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_en
62	str1 = "Texte encod\xe9 en ISO-8859-1"	47	str1 = "Texte encod\xe9 en ISO-8859-1".force_encoding("UTF-8")
63	str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"	48	str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test".force_encoding("ASCII-8BIT")
64	str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
65	str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
66	txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, 'UTF-8')	49	txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, 'UTF-8')
67	txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, 'UTF-8')	50	txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, 'UTF-8')
68	if txt_1.respond_to?(:force_encoding)	51	assert_equal "ASCII-8BIT", txt_1.encoding.to_s
69	assert_equal "ASCII-8BIT", txt_1.encoding.to_s	52	assert_equal "ASCII-8BIT", txt_2.encoding.to_s
70	assert_equal "ASCII-8BIT", txt_2.encoding.to_s
71	end
72	assert_equal "Texte encod? en ISO-8859-1", txt_1	53	assert_equal "Texte encod? en ISO-8859-1", txt_1
73	assert_equal "?a?b?c?d?e test", txt_2	54	assert_equal "?a?b?c?d?e test", txt_2
74	end	55	end
75		56
76	def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja	57	def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja
77	str1 = "Texte encod\xe9 en ISO-8859-1"	58	str1 = "Texte encod\xe9 en ISO-8859-1".force_encoding("UTF-8")
78	str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"	59	str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test".force_encoding("ASCII-8BIT")
79	str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
80	str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
81	encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )	60	encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
82	txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, encoding)	61	txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, encoding)
83	txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, encoding)	62	txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, encoding)
84	if txt_1.respond_to?(:force_encoding)	63	assert_equal "ASCII-8BIT", txt_1.encoding.to_s
85	assert_equal "ASCII-8BIT", txt_1.encoding.to_s	64	assert_equal "ASCII-8BIT", txt_2.encoding.to_s
86	assert_equal "ASCII-8BIT", txt_2.encoding.to_s
87	end
88	assert_equal "Texte encod? en ISO-8859-1", txt_1	65	assert_equal "Texte encod? en ISO-8859-1", txt_1
89	assert_equal "?a?b?c?d?e test", txt_2	66	assert_equal "?a?b?c?d?e test", txt_2
90	end	67	end
91		68
92	def test_attach	69	def test_attach
93	set_fixtures_attachments_directory	70	["CP932", "SJIS"].each do \|encoding\|
		71	set_fixtures_attachments_directory
94		72
95	str2 = "\x83e\x83X\x83g"	73	str2 = "\x83e\x83X\x83g".force_encoding("ASCII-8BIT")
96	str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
97	encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
98		74
99	a1 = Attachment.find(17)	75	a1 = Attachment.find(17)
100	a2 = Attachment.find(19)	76	a2 = Attachment.find(19)
		77	User.current = User.find(1)
		78	assert a1.readable?
		79	assert a1.visible?
		80	assert a2.readable?
		81	assert a2.visible?
101		82
102	User.current = User.find(1)	83	aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
103	assert a1.readable?	84	assert_not_nil aa1
104	assert a1.visible?	85	assert_equal 17, aa1.id
105	assert a2.readable?
106	assert a2.visible?
107		86
108	~~aa1~~ = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "~~Testfile.PNG~~", ~~"UTF-8"~~)	87	aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
109	assert_not_nil aa1	88	assert_not_nil aa2
110	assert_equal 17, aa1.id	89	assert_equal 19, aa2.id
111	aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
112	assert_not_nil aa2
113	assert_equal 19, aa2.id
114		90
115	User.current = nil	91	User.current = nil
116	assert a1.readable?	92	assert a1.readable?
117	assert (! a1.visible?)	93	assert (! a1.visible?)
118	assert a2.readable?	94	assert a2.readable?
119	assert (! a2.visible?)	95	assert (! a2.visible?)
		96	aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
		97	assert_equal nil, aa1
		98	aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
		99	assert_equal nil, aa2
120		100
121	aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")	101	set_tmp_attachments_directory
122	assert_equal nil, aa1	102	end
123	aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
124	assert_equal nil, aa2
125
126	set_tmp_attachments_directory
127	end	103	end
128	end	104	end

test/unit/lib/redmine/hook_test.rb +1 0

               def setup
                 @hook_module = Redmine::Hook
+                @hook_module.clear_listeners
               end
               def teardown

test/unit/lib/redmine/i18n_test.rb +40 -48

               def test_date_format_default
                 set_language_if_valid 'en'
                 today = Date.today
-                Setting.date_format = ''
+                with_settings :date_format => '' do
-                assert_equal I18n.l(today), format_date(today)
+                  assert_equal I18n.l(today), format_date(today)
+                end
               end
               def test_date_format
                 set_language_if_valid 'en'
                 today = Date.today
-                Setting.date_format = '%d %m %Y'
+                with_settings :date_format => '%d %m %Y' do
-                assert_equal today.strftime('%d %m %Y'), format_date(today)
+                  assert_equal today.strftime('%d %m %Y'), format_date(today)
+                end
               end
               def test_date_format_default_with_user_locale
                 set_language_if_valid 'es'
                 today = now = Time.parse('2011-02-20 14:00:00')
-                Setting.date_format = '%d %B %Y'
+                with_settings :date_format => '%d %B %Y' do
-                User.current.language = 'fr'
+                  User.current.language = 'fr'
-                s1 = "20 f\xc3\xa9vrier 2011"
+                  s1 = "20 f\xc3\xa9vrier 2011".force_encoding("UTF-8")
-                s1.force_encoding("UTF-8") if s1.respond_to?(:force_encoding)
+                  assert_equal s1, format_date(today)
-                assert_equal s1, format_date(today)
+                  User.current.language = nil
-                User.current.language = nil
+                  assert_equal '20 Febrero 2011', format_date(today)
-                assert_equal '20 Febrero 2011', format_date(today)
+                end
               end
               def test_date_and_time_for_each_language
-                Setting.date_format = ''
+                with_settings :date_format => '' do
-                valid_languages.each do |lang|
+                  valid_languages.each do |lang|
-                  set_language_if_valid lang
+                    set_language_if_valid lang
-                  assert_nothing_raised "#{lang} failure" do
+                    assert_nothing_raised "#{lang} failure" do
-                    format_date(Date.today)
+                      format_date(Date.today)
-                    format_time(Time.now)
+                      format_time(Time.now)
-                    format_time(Time.now, false)
+                      format_time(Time.now, false)
-                    assert_not_equal 'default', ::I18n.l(Date.today, :format => :default),
+                      assert_not_equal 'default', ::I18n.l(Date.today, :format => :default),
-                                     "date.formats.default missing in #{lang}"
+                                       "date.formats.default missing in #{lang}"
-                    assert_not_equal 'time',    ::I18n.l(Time.now, :format => :time),
+                      assert_not_equal 'time',    ::I18n.l(Time.now, :format => :time),
-                                     "time.formats.time missing in #{lang}"
+                                       "time.formats.time missing in #{lang}"
+                    end
+                    assert l('date.day_names').is_a?(Array)
+                    assert_equal 7, l('date.day_names').size
+                    assert l('date.month_names').is_a?(Array)
+                    assert_equal 13, l('date.month_names').size
                   end
-                  assert l('date.day_names').is_a?(Array)
-                  assert_equal 7, l('date.day_names').size
-                  assert l('date.month_names').is_a?(Array)
-                  assert_equal 13, l('date.month_names').size
                 end
               end
               def test_utc_time_format
                 set_language_if_valid 'en'
                 now = Time.now
-                Setting.date_format = '%d %m %Y'
+                with_settings :date_format => '%d %m %Y', :time_format => '%H %M' do
-                Setting.time_format = '%H %M'
+                  assert_equal now.strftime('%d %m %Y %H %M'), format_time(now.utc)
-                assert_equal now.strftime('%d %m %Y %H %M'), format_time(now.utc)
+                  assert_equal now.strftime('%H %M'), format_time(now.utc, false)
-                assert_equal now.strftime('%H %M'), format_time(now.utc, false)
+                end
               end
               def test_number_to_human_size_for_each_language
                 set_language_if_valid 'bs'
                 assert_equal "KM -1000,20", number_to_currency(-1000.2)
                 set_language_if_valid 'de'
-                euro_sign = "\xe2\x82\xac"
+                euro_sign = "\xe2\x82\xac".force_encoding('UTF-8')
-                euro_sign.force_encoding('UTF-8') if euro_sign.respond_to?(:force_encoding)
                 assert_equal "-1000,20 #{euro_sign}", number_to_currency(-1000.2)
               end
                 assert_nil options.detect {|option| option.size != 2}
                 assert_nil options.detect {|option| !option.first.is_a?(String) || !option.last.is_a?(String)}
                 assert_include ["English", "en"], options
-                ja = "Japanese (\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e)"
+                ja = "Japanese (\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e)".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 assert_include [ja, "ja"], options
               end
               def test_utf8
                 set_language_if_valid 'ja'
-                str_ja_yes  = "\xe3\x81\xaf\xe3\x81\x84"
+                str_ja_yes  = "\xe3\x81\xaf\xe3\x81\x84".force_encoding('UTF-8')
                 i18n_ja_yes = l(:general_text_Yes)
-                if str_ja_yes.respond_to?(:force_encoding)
-                  str_ja_yes.force_encoding('UTF-8')
-                  assert_equal "UTF-8", i18n_ja_yes.encoding.to_s
-                end
                 assert_equal str_ja_yes, i18n_ja_yes
+                assert_equal "UTF-8", i18n_ja_yes.encoding.to_s
               end
               def test_traditional_chinese_locale
                 set_language_if_valid 'zh-TW'
-                str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
+                str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)".force_encoding('UTF-8')
-                if str_tw.respond_to?(:force_encoding)
-                  str_tw.force_encoding('UTF-8')
-                end
                 assert_equal str_tw, l(:general_lang_name)
               end
               def test_french_locale
                 set_language_if_valid 'fr'
-                str_fr = "Fran\xc3\xa7ais"
+                str_fr = "Fran\xc3\xa7ais".force_encoding('UTF-8')
-                if str_fr.respond_to?(:force_encoding)
-                  str_fr.force_encoding('UTF-8')
-                end
                 assert_equal str_fr, l(:general_lang_name)
               end
             end

test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb +168 -175

@@ -16,210 +16,203
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	require File.expand_path('../../../../../../test_helper', __FILE__)	18	require File.expand_path('../../../../../../test_helper', __FILE__)
19	begin
20	require 'mocha/setup'
21
22	class BazaarAdapterTest < ActiveSupport::TestCase
23	REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
24	REPOSITORY_PATH.gsub!(/\/+/, '/')
25
26	if File.directory?(REPOSITORY_PATH)
27	def setup
28	@adapter = Redmine::Scm::Adapters::BazaarAdapter.new(
29	File.join(REPOSITORY_PATH, "trunk")
30	)
31	end
32		19
33	def test_scm_version	20	class BazaarAdapterTest < ActiveSupport::TestCase
34	to_test = { "Bazaar (bzr) 2.1.2\n" => [2,1,2],	21	REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
35	"2.1.1\n1.7\n1.8" => [2,1,1],	22	REPOSITORY_PATH.gsub!(/\/+/, '/')
36	"2.0.1\r\n1.8.1\r\n1.9.1" => [2,0,1]}
37	to_test.each do \|s, v\|
38	test_scm_version_for(s, v)
39	end
40	end
41		23
42	def test_cat	24	if File.directory?(REPOSITORY_PATH)
43	cat = @adapter.cat('directory/document.txt')	25	def setup
44	assert cat =~ /Write the contents of a file as of a given revision to standard output/	26	@adapter = Redmine::Scm::Adapters::BazaarAdapter.new(
45	end	27	File.join(REPOSITORY_PATH, "trunk")
		28	)
		29	end
46		30
47	def test_~~cat_path_invalid~~	31	def test_scm_version
48	assert_nil @adapter.cat('invalid')	32	to_test = { "Bazaar (bzr) 2.1.2\n" => [2,1,2],
		33	"2.1.1\n1.7\n1.8" => [2,1,1],
		34	"2.0.1\r\n1.8.1\r\n1.9.1" => [2,0,1]}
		35	to_test.each do \|s, v\|
		36	test_scm_version_for(s, v)
49	end	37	end
		38	end
50		39
51	def test_cat~~_revision_invalid~~	40	def test_cat
52	assert_nil @adapter.cat('doc-mkdir.txt', '12345678')	41	cat = @adapter.cat('directory/document.txt')
53	end	42	assert cat =~ /Write the contents of a file as of a given revision to standard output/
		43	end
54		44
55	def test_diff	45	def test_cat_path_invalid
56	diff1 = @adapter.diff('doc-mkdir.txt', 3, 2)	46	assert_nil @adapter.cat('invalid')
57	assert_equal 21, diff1.size	47	end
58	buf = diff1[14].gsub(/\r\n\|\r\|\n/, "")
59	assert_equal "-Display more information.", buf
60	end
61		48
62	def test_~~diff_path~~_invalid	49	def test_cat_revision_invalid
63	assert_equal [], @adapter.diff('invalid', 1)	50	assert_nil @adapter.cat('doc-mkdir.txt', '12345678')
64	end	51	end
65		52
66	def test_diff~~_revision_invalid~~	53	def test_diff
67	assert_equal [], @adapter.diff(nil, 12345678)	54	diff1 = @adapter.diff('doc-mkdir.txt', 3, 2)
68	assert_equal [], @adapter.diff(nil, 12345678, 87654321)	55	assert_equal 21, diff1.size
69	end	56	buf = diff1[14].gsub(/\r\n\|\r\|\n/, "")
		57	assert_equal "-Display more information.", buf
		58	end
70		59
71	def test_annotate	60	def test_diff_path_invalid
72	annotate = @adapter.annotate('doc-mkdir.txt')	61	assert_equal [], @adapter.diff('invalid', 1)
73	assert_equal 17, annotate.lines.size	62	end
74	assert_equal '1', annotate.revisions[0].identifier
75	assert_equal 'jsmith@', annotate.revisions[0].author
76	assert_equal 'mkdir', annotate.lines[0]
77	end
78		63
79	def test_~~annotate_path~~_invalid	64	def test_diff_revision_invalid
80	assert_nil @adapter.annotate('invalid')	65	assert_equal [], @adapter.diff(nil, 12345678)
81	end	66	assert_equal [], @adapter.diff(nil, 12345678, 87654321)
		67	end
82		68
83	def test_annotate~~_revision_invalid~~	69	def test_annotate
84	~~assert_nil~~ @adapter.annotate('doc-mkdir.txt', ~~'12345678'~~)	70	annotate = @adapter.annotate('doc-mkdir.txt')
85	end	71	assert_equal 17, annotate.lines.size
		72	assert_equal '1', annotate.revisions[0].identifier
		73	assert_equal 'jsmith@', annotate.revisions[0].author
		74	assert_equal 'mkdir', annotate.lines[0]
		75	end
86		76
87	def test_~~branch_conf_path~~	77	def test_annotate_path_invalid
88	p = "c:\\test\\test\\"	78	assert_nil @adapter.annotate('invalid')
89	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)	79	end
90	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
91	p = "c:\\test\\test\\.bzr"
92	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
93	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
94	p = "c:\\test\\test\\.bzr\\"
95	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
96	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
97	p = "c:\\test\\test"
98	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
99	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
100	p = "\\\\server\\test\\test\\"
101	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
102	assert_equal File.join("\\\\server\\test\\test", ".bzr", "branch", "branch.conf"), bcp
103	end
104		80
105	def test_a~~ppend_revisions_only_true~~	81	def test_annotate_revision_invalid
106	assert_equal true, @adapter.append_revisions_only	82	assert_nil @adapter.annotate('doc-mkdir.txt', '12345678')
107	end	83	end
108		84
109	def test_append_revisions_only_false	85	def test_branch_conf_path
110	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(	86	p = "c:\\test\\test\\"
111	File.join(REPOSITORY_PATH, "empty-branch")	87	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
112	)	88	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
113	assert_equal false, adpt.append_revisions_only	89	p = "c:\\test\\test\\.bzr"
114	end	90	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
		91	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
		92	p = "c:\\test\\test\\.bzr\\"
		93	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
		94	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
		95	p = "c:\\test\\test"
		96	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
		97	assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
		98	p = "\\\\server\\test\\test\\"
		99	bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
		100	assert_equal File.join("\\\\server\\test\\test", ".bzr", "branch", "branch.conf"), bcp
		101	end
115		102
116	def test_append_revisions_only_~~shared_repo~~	103	def test_append_revisions_only_true
117	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(	104	assert_equal true, @adapter.append_revisions_only
118	REPOSITORY_PATH	105	end
119	)
120	assert_equal false, adpt.append_revisions_only
121	end
122		106
123	def test_info_not_nil	107	def test_append_revisions_only_false
124	assert_not_nil @adapter.info	108	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(
125	end	109	File.join(REPOSITORY_PATH, "empty-branch")
		110	)
		111	assert_equal false, adpt.append_revisions_only
		112	end
126		113
127	def test_info_nil	114	def test_append_revisions_only_shared_repo
128	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(	115	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(
129	"/invalid/invalid/"	116	REPOSITORY_PATH
130	)	117	)
131	assert_nil adpt.info	118	assert_equal false, adpt.append_revisions_only
132	end	119	end
133		120
134	def test_info	121	def test_info_not_nil
135	~~info~~ = @adapter.info	122	assert_not_nil @adapter.info
136	assert_equal 4, info.lastrev.identifier.to_i	123	end
137	end
138		124
139	def test_info_~~emtpy~~	125	def test_info_nil
140	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(	126	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(
141	File.join(REPOSITORY_PATH, "empty-branch")	127	"/invalid/invalid/"
142	)	128	)
143	assert_equal 0, adpt.info.lastrev.identifier.to_i	129	assert_nil adpt.info
144	end	130	end
145		131
146	def test_entries_path_invalid	132	def test_info
147	assert_equal [], @adapter.entries('invalid')	133	info = @adapter.info
148	end	134	assert_equal 4, info.lastrev.identifier.to_i
		135	end
149		136
150	def test_entries_revision_invalid	137	def test_info_emtpy
151	assert_nil @adapter.entries(nil, 12345678)	138	adpt = Redmine::Scm::Adapters::BazaarAdapter.new(
152	end	139	File.join(REPOSITORY_PATH, "empty-branch")
		140	)
		141	assert_equal 0, adpt.info.lastrev.identifier.to_i
		142	end
153		143
154	def test_revisions	144	def test_entries_path_invalid
155	revisions = @adapter.revisions(nil, 4, 2)	145	assert_equal [], @adapter.entries('invalid')
156	assert_equal 3, revisions.size	146	end
157	assert_equal 2, revisions[2].identifier
158	assert_equal 'jsmith@foo.bar-20071203175224-v0eog5d5wrgdrshg', revisions[2].scmid
159	assert_equal 4, revisions[0].identifier
160	assert_equal 'jsmith@foo.bar-20071203175422-t40bf8li5zz0c4cg', revisions[0].scmid
161	assert_equal 2, revisions[0].paths.size
162	assert_equal 'D', revisions[0].paths[0][:action]
163	assert_equal '/doc-deleted.txt', revisions[0].paths[0][:path]
164	assert_equal 'docdeleted.txt-20071203175320-iwwj561ojuubs3gt-1', revisions[0].paths[0][:revision]
165	assert_equal 'M', revisions[0].paths[1][:action]
166	assert_equal '/directory/doc-ls.txt', revisions[0].paths[1][:path]
167	assert_equal 'docls.txt-20071203175005-a3hyc3mn0shl7cgu-1', revisions[0].paths[1][:revision]
168	end
169		147
170	def test_revision~~s_path~~_invalid	148	def test_entries_revision_invalid
171	assert_nil @adapter.re~~visio~~ns(~~'invalid'~~)	149	assert_nil @adapter.entries(nil, 12345678)
172	end	150	end
173		151
174	def test_revisions~~_revision_invalid~~	152	def test_revisions
175	~~assert_nil~~ @adapter.revisions(nil, ~~12345678~~)	153	revisions = @adapter.revisions(nil, 4, 2)
176	assert_nil @adapter.revisions(nil, 12345678, 87654321)	154	assert_equal 3, revisions.size
177	end	155	assert_equal 2, revisions[2].identifier
		156	assert_equal 'jsmith@foo.bar-20071203175224-v0eog5d5wrgdrshg', revisions[2].scmid
		157	assert_equal 4, revisions[0].identifier
		158	assert_equal 'jsmith@foo.bar-20071203175422-t40bf8li5zz0c4cg', revisions[0].scmid
		159	assert_equal 2, revisions[0].paths.size
		160	assert_equal 'D', revisions[0].paths[0][:action]
		161	assert_equal '/doc-deleted.txt', revisions[0].paths[0][:path]
		162	assert_equal 'docdeleted.txt-20071203175320-iwwj561ojuubs3gt-1', revisions[0].paths[0][:revision]
		163	assert_equal 'M', revisions[0].paths[1][:action]
		164	assert_equal '/directory/doc-ls.txt', revisions[0].paths[1][:path]
		165	assert_equal 'docls.txt-20071203175005-a3hyc3mn0shl7cgu-1', revisions[0].paths[1][:revision]
		166	end
178		167
179	def test_entry	168	def test_revisions_path_invalid
180	entry = @adapter.entry()	169	assert_nil @adapter.revisions('invalid')
181	assert_equal "", entry.path	170	end
182	assert_equal "dir", entry.kind	171
183	entry = @adapter.entry('')	172	def test_revisions_revision_invalid
184	assert_equal "", entry.path	173	assert_nil @adapter.revisions(nil, 12345678)
		174	assert_nil @adapter.revisions(nil, 12345678, 87654321)
		175	end
		176
		177	def test_entry
		178	entry = @adapter.entry()
		179	assert_equal "", entry.path
		180	assert_equal "dir", entry.kind
		181	entry = @adapter.entry('')
		182	assert_equal "", entry.path
		183	assert_equal "dir", entry.kind
		184	assert_nil @adapter.entry('invalid')
		185	assert_nil @adapter.entry('/invalid')
		186	assert_nil @adapter.entry('/invalid/')
		187	assert_nil @adapter.entry('invalid/invalid')
		188	assert_nil @adapter.entry('invalid/invalid/')
		189	assert_nil @adapter.entry('/invalid/invalid')
		190	assert_nil @adapter.entry('/invalid/invalid/')
		191	["doc-ls.txt", "/doc-ls.txt"].each do \|path\|
		192	entry = @adapter.entry(path, 2)
		193	assert_equal "doc-ls.txt", entry.path
		194	assert_equal "file", entry.kind
		195	end
		196	["directory", "/directory", "/directory/"].each do \|path\|
		197	entry = @adapter.entry(path, 2)
		198	assert_equal "directory", entry.path
185	assert_equal "dir", entry.kind	199	assert_equal "dir", entry.kind
186	assert_nil @adapter.entry('invalid')
187	assert_nil @adapter.entry('/invalid')
188	assert_nil @adapter.entry('/invalid/')
189	assert_nil @adapter.entry('invalid/invalid')
190	assert_nil @adapter.entry('invalid/invalid/')
191	assert_nil @adapter.entry('/invalid/invalid')
192	assert_nil @adapter.entry('/invalid/invalid/')
193	["doc-ls.txt", "/doc-ls.txt"].each do \|path\|
194	entry = @adapter.entry(path, 2)
195	assert_equal "doc-ls.txt", entry.path
196	assert_equal "file", entry.kind
197	end
198	["directory", "/directory", "/directory/"].each do \|path\|
199	entry = @adapter.entry(path, 2)
200	assert_equal "directory", entry.path
201	assert_equal "dir", entry.kind
202	end
203	["directory/document.txt", "/directory/document.txt"].each do \|path\|
204	entry = @adapter.entry(path, 2)
205	assert_equal "directory/document.txt", entry.path
206	assert_equal "file", entry.kind
207	end
208	end	200	end
		201	["directory/document.txt", "/directory/document.txt"].each do \|path\|
		202	entry = @adapter.entry(path, 2)
		203	assert_equal "directory/document.txt", entry.path
		204	assert_equal "file", entry.kind
		205	end
		206	end
209		207
210	private	208	private
211		209
212	def test_scm_version_for(scm_command_version, version)	210	def test_scm_version_for(scm_command_version, version)
213	@adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)	211	@adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)
214	assert_equal version, @adapter.class.scm_command_version	212	assert_equal version, @adapter.class.scm_command_version
215	end
216	else
217	puts "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
218	def test_fake; assert true end
219	end	213	end
220	end	214	else
221	rescue LoadError	215	puts "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
222	class BazaarMochaFake < ActiveSupport::TestCase	216	def test_fake; assert true end
223	def test_fake; assert(false, "Requires mocha to run those tests") end
224	end	217	end
225	end	218	end

test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb +70 -79

@@ -16,100 +16,91
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	require File.expand_path('../../../../../../test_helper', __FILE__)	18	require File.expand_path('../../../../../../test_helper', __FILE__)
19	begin
20	require 'mocha/setup'
21		19
22	class CvsAdapterTest < ActiveSupport::TestCase	20	class CvsAdapterTest < ActiveSupport::TestCase
23	REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s	21	REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
24	REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?	22	REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
25	MODULE_NAME = 'test'	23	MODULE_NAME = 'test'
26		24
27	if File.directory?(REPOSITORY_PATH)	25	if File.directory?(REPOSITORY_PATH)
28	def setup	26	def setup
29	@adapter = Redmine::Scm::Adapters::CvsAdapter.new(MODULE_NAME, REPOSITORY_PATH)	27	@adapter = Redmine::Scm::Adapters::CvsAdapter.new(MODULE_NAME, REPOSITORY_PATH)
30	end	28	end
31		29
32	def test_scm_version	30	def test_scm_version
33	to_test = { "\nConcurrent Versions System (CVS) 1.12.13 (client/server)\n" => [1,12,13],	31	to_test = { "\nConcurrent Versions System (CVS) 1.12.13 (client/server)\n" => [1,12,13],
34	"\r\n1.12.12\r\n1.12.11" => [1,12,12],	32	"\r\n1.12.12\r\n1.12.11" => [1,12,12],
35	"1.12.11\r\n1.12.10\r\n" => [1,12,11]}	33	"1.12.11\r\n1.12.10\r\n" => [1,12,11]}
36	to_test.each do \|s, v\|	34	to_test.each do \|s, v\|
37	test_scm_version_for(s, v)	35	test_scm_version_for(s, v)
38	end
39	end	36	end
		37	end
40		38
41	def test_revisions_all	39	def test_revisions_all
42	cnt = 0	40	cnt = 0
43	@adapter.revisions('', nil, nil, :log_encoding => 'UTF-8') do \|revision\|	41	@adapter.revisions('', nil, nil, :log_encoding => 'UTF-8') do \|revision\|
44	cnt += 1	42	cnt += 1
45	end
46	assert_equal 16, cnt
47	end	43	end
		44	assert_equal 16, cnt
		45	end
48		46
49	def test_revisions_from_rev3	47	def test_revisions_from_rev3
50	rev3_committed_on = Time.gm(2007, 12, 13, 16, 27, 22)	48	rev3_committed_on = Time.gm(2007, 12, 13, 16, 27, 22)
51	cnt = 0	49	cnt = 0
52	@adapter.revisions('', rev3_committed_on, nil, :log_encoding => 'UTF-8') do \|revision\|	50	@adapter.revisions('', rev3_committed_on, nil, :log_encoding => 'UTF-8') do \|revision\|
53	cnt += 1	51	cnt += 1
54	end
55	assert_equal 4, cnt
56	end	52	end
		53	assert_equal 4, cnt
		54	end
57		55
58	def test_entries_rev3	56	def test_entries_rev3
59	rev3_committed_on = Time.gm(2007, 12, 13, 16, 27, 22)	57	rev3_committed_on = Time.gm(2007, 12, 13, 16, 27, 22)
60	entries = @adapter.entries('sources', rev3_committed_on)	58	entries = @adapter.entries('sources', rev3_committed_on)
61	assert_equal 2, entries.size	59	assert_equal 2, entries.size
62	assert_equal entries[0].name, "watchers_controller.rb"	60	assert_equal entries[0].name, "watchers_controller.rb"
63	assert_equal entries[0].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22)	61	assert_equal entries[0].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22)
64	end	62	end
65		63
66	def test_path_encoding_default_utf8	64	def test_path_encoding_default_utf8
67	adpt1 = Redmine::Scm::Adapters::CvsAdapter.new(	65	adpt1 = Redmine::Scm::Adapters::CvsAdapter.new(
68	MODULE_NAME,	66	MODULE_NAME,
69	REPOSITORY_PATH	67	REPOSITORY_PATH
70	)	68	)
71	assert_equal "UTF-8", adpt1.path_encoding	69	assert_equal "UTF-8", adpt1.path_encoding
72	adpt2 = Redmine::Scm::Adapters::CvsAdapter.new(	70	adpt2 = Redmine::Scm::Adapters::CvsAdapter.new(
73	MODULE_NAME,	71	MODULE_NAME,
74	REPOSITORY_PATH,	72	REPOSITORY_PATH,
75	nil,	73	nil,
76	nil,	74	nil,
77	""	75	""
78	)	76	)
79	assert_equal "UTF-8", adpt2.path_encoding	77	assert_equal "UTF-8", adpt2.path_encoding
80	end	78	end
81		79
82	def test_root_url_path	80	def test_root_url_path
83	to_test = {	81	to_test = {
84	':pserver:cvs_user:cvs_password@123.456.789.123:9876/repo' => '/repo',	82	':pserver:cvs_user:cvs_password@123.456.789.123:9876/repo' => '/repo',
85	':pserver:cvs_user:cvs_password@123.456.789.123/repo' => '/repo',	83	':pserver:cvs_user:cvs_password@123.456.789.123/repo' => '/repo',
86	':pserver:cvs_user:cvs_password@cvs_server:/repo' => '/repo',	84	':pserver:cvs_user:cvs_password@cvs_server:/repo' => '/repo',
87	':pserver:cvs_user:cvs_password@cvs_server:9876/repo' => '/repo',	85	':pserver:cvs_user:cvs_password@cvs_server:9876/repo' => '/repo',
88	':pserver:cvs_user:cvs_password@cvs_server/repo' => '/repo',	86	':pserver:cvs_user:cvs_password@cvs_server/repo' => '/repo',
89	':pserver:cvs_user:cvs_password@cvs_server/path/repo' => '/path/repo',	87	':pserver:cvs_user:cvs_password@cvs_server/path/repo' => '/path/repo',
90	':ext:cvsservername:/path' => '/path'	88	':ext:cvsservername:/path' => '/path'
91	}	89	}
92		90
93	to_test.each do \|string, expected\|	91	to_test.each do \|string, expected\|
94	assert_equal expected, Redmine::Scm::Adapters::CvsAdapter.new('foo', string).send(:root_url_path), "#{string} failed"	92	assert_equal expected, Redmine::Scm::Adapters::CvsAdapter.new('foo', string).send(:root_url_path), "#{string} failed"
95	end
96	end	93	end
		94	end
97		95
98	private	96	private
99		97
100	def test_scm_version_for(scm_command_version, version)	98	def test_scm_version_for(scm_command_version, version)
101	@adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)	99	@adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)
102	assert_equal version, @adapter.class.scm_command_version	100	assert_equal version, @adapter.class.scm_command_version
103	end
104	else
105	puts "Cvs test repository NOT FOUND. Skipping unit tests !!!"
106	def test_fake; assert true end
107	end	101	end
108	end	102	else
109		103	puts "Cvs test repository NOT FOUND. Skipping unit tests !!!"
110	rescue LoadError	104	def test_fake; assert true end
111	class CvsMochaFake < ActiveSupport::TestCase
112	def test_fake; assert(false, "Requires mocha to run those tests") end
113	end	105	end
114	end	106	end
115

test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb +31 -40

@@ -16,54 +16,45
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	require File.expand_path('../../../../../../test_helper', __FILE__)	18	require File.expand_path('../../../../../../test_helper', __FILE__)
19	begin
20	require 'mocha/setup'
21		19
22	class DarcsAdapterTest < ActiveSupport::TestCase	20	class DarcsAdapterTest < ActiveSupport::TestCase
23	REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s	21	REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s
24		22
25	if File.directory?(REPOSITORY_PATH)	23	if File.directory?(REPOSITORY_PATH)
26	def setup	24	def setup
27	@adapter = Redmine::Scm::Adapters::DarcsAdapter.new(REPOSITORY_PATH)	25	@adapter = Redmine::Scm::Adapters::DarcsAdapter.new(REPOSITORY_PATH)
28	end	26	end
29
30	def test_darcsversion
31	to_test = { "1.0.9 (release)\n" => [1,0,9] ,
32	"2.2.0 (release)\n" => [2,2,0] }
33	to_test.each do \|s, v\|
34	test_darcsversion_for(s, v)
35	end
36	end
37		27
38	def test_~~revisions~~	28	def test_darcsversion
39	id1 = '20080308225258-98289-761f654d669045eabee90b91b53a21ce5593cadf.gz'	29	to_test = { "1.0.9 (release)\n" => [1,0,9] ,
40	revs = @adapter.revisions('', nil, nil, {:with_path => true})	30	"2.2.0 (release)\n" => [2,2,0] }
41	assert_equal 6, revs.size	31	to_test.each do \|s, v\|
42	assert_equal id1, revs[5].scmid	32	test_darcsversion_for(s, v)
43	paths = revs[5].paths
44	assert_equal 5, paths.size
45	assert_equal 'A', paths[0][:action]
46	assert_equal '/README', paths[0][:path]
47	assert_equal 'A', paths[1][:action]
48	assert_equal '/images', paths[1][:path]
49	end	33	end
		34	end
50		35
51	private	36	def test_revisions
		37	id1 = '20080308225258-98289-761f654d669045eabee90b91b53a21ce5593cadf.gz'
		38	revs = @adapter.revisions('', nil, nil, {:with_path => true})
		39	assert_equal 6, revs.size
		40	assert_equal id1, revs[5].scmid
		41	paths = revs[5].paths
		42	assert_equal 5, paths.size
		43	assert_equal 'A', paths[0][:action]
		44	assert_equal '/README', paths[0][:path]
		45	assert_equal 'A', paths[1][:action]
		46	assert_equal '/images', paths[1][:path]
		47	end
52		48
53	def test_darcsversion_for(darcsversion, version)	49	private
54	@adapter.class.expects(:darcs_binary_version_from_command_line).returns(darcsversion)
55	assert_equal version, @adapter.class.darcs_binary_version
56	end
57		50
58	else	51	def test_darcsversion_for(darcsversion, version)
59	puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"	52	@adapter.class.expects(:darcs_binary_version_from_command_line).returns(darcsversion)
60	def test_fake; assert true end	53	assert_equal version, @adapter.class.darcs_binary_version
61	end	54	end
62	end
63		55
64	rescue LoadError	56	else
65	class DarcsMochaFake < ActiveSupport::TestCase	57	puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
66	def test_fake; assert(~~false~~, ~~"Requires mocha~~ to ru~~n thos~~e ~~tests"~~) end	58	def test_fake; assert true end
67	end	59	end
68	end	60	end
69

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +508 -520

This diff has been collapsed as it changes many lines, (1028 lines changed) Show them Hide them
	@@ -16,594 +16,582
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17		17
	18	require File.expand_path('../../../../../../test_helper', __FILE__)	18	require File.expand_path('../../../../../../test_helper', __FILE__)
	19	begin
	20	require 'mocha/setup'
	21
	22	class GitAdapterTest < ActiveSupport::TestCase
	23	REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
	24
	25	FELIX_HEX = "Felix Sch\xC3\xA4fer"
	26	CHAR_1_HEX = "\xc3\x9c"
	27
	28	## Git, Mercurial and CVS path encodings are binary.
	29	## Subversion supports URL encoding for path.
	30	## Redmine Mercurial adapter and extension use URL encoding.
	31	## Git accepts only binary path in command line parameter.
	32	## So, there is no way to use binary command line parameter in JRuby.
	33	JRUBY_SKIP = (RUBY_PLATFORM == 'java')
	34	JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
	35
	36	if File.directory?(REPOSITORY_PATH)
	37	## Ruby uses ANSI api to fork a process on Windows.
	38	## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
	39	## and these are incompatible with ASCII.
	40	## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
	41	## http://code.google.com/p/msysgit/issues/detail?id=80
	42	## So, Latin-1 path tests fail on Japanese Windows
	43	WINDOWS_PASS = (Redmine::Platform.mswin? &&
	44	Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
	45	WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
	46
	47	def setup
	48	adapter_class = Redmine::Scm::Adapters::GitAdapter
	49	assert adapter_class
	50	assert adapter_class.client_command
	51	assert_equal true, adapter_class.client_available
	52	assert_equal true, adapter_class.client_version_above?([1])
	53	assert_equal true, adapter_class.client_version_above?([1, 0])
	54
	55	@adapter = Redmine::Scm::Adapters::GitAdapter.new(
	56	REPOSITORY_PATH,
	57	nil,
	58	nil,
	59	nil,
	60	'ISO-8859-1'
	61	)
	62	assert @adapter
	63	@char_1 = CHAR_1_HEX.dup
	64	@str_felix_hex = FELIX_HEX.dup
	65	if @char_1.respond_to?(:force_encoding)
	66	@char_1.force_encoding('UTF-8')
	67	@str_felix_hex.force_encoding('ASCII-8BIT')
	68	end
	69	end
	70		19
	71	def test_scm_version	20	class GitAdapterTest < ActiveSupport::TestCase
	72	to_test = { "git version 1.7.3.4\n" => [1,7,3,4],	21	REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
	73	"1.6.1\n1.7\n1.8" => [1,6,1],	22
	74	"1.6.2\r\n1.8.1\r\n1.9.1" => [1,6,2]}	23	FELIX_HEX = "Felix Sch\xC3\xA4fer"
	75	to_test.each do \|s, v\|	24	CHAR_1_HEX = "\xc3\x9c"
	76	test_scm_version_for(s, v)	25
	77	end	26	## Git, Mercurial and CVS path encodings are binary.
	78	end	27	## Subversion supports URL encoding for path.
			28	## Redmine Mercurial adapter and extension use URL encoding.
			29	## Git accepts only binary path in command line parameter.
			30	## So, there is no way to use binary command line parameter in JRuby.
			31	JRUBY_SKIP = (RUBY_PLATFORM == 'java')
			32	JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
			33
			34	if File.directory?(REPOSITORY_PATH)
			35	## Ruby uses ANSI api to fork a process on Windows.
			36	## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
			37	## and these are incompatible with ASCII.
			38	## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
			39	## http://code.google.com/p/msysgit/issues/detail?id=80
			40	## So, Latin-1 path tests fail on Japanese Windows
			41	WINDOWS_PASS = (Redmine::Platform.mswin? &&
			42	Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
			43	WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
			44
			45	def setup
			46	adapter_class = Redmine::Scm::Adapters::GitAdapter
			47	assert adapter_class
			48	assert adapter_class.client_command
			49	assert_equal true, adapter_class.client_available
			50	assert_equal true, adapter_class.client_version_above?([1])
			51	assert_equal true, adapter_class.client_version_above?([1, 0])
			52
			53	@adapter = Redmine::Scm::Adapters::GitAdapter.new(
			54	REPOSITORY_PATH,
			55	nil,
			56	nil,
			57	nil,
			58	'ISO-8859-1'
			59	)
			60	assert @adapter
			61	@char_1 = CHAR_1_HEX.dup.force_encoding('UTF-8')
			62	@str_felix_hex = FELIX_HEX.dup.force_encoding('ASCII-8BIT')
			63	end
	79		64
	80	def test_~~branches~~	65	def test_scm_version
	81	brs = []	66	to_test = { "git version 1.7.3.4\n" => [1,7,3,4],
	82	@adapter.branches.each do \|b\|	67	"1.6.1\n1.7\n1.8" => [1,6,1],
	83	brs << b	68	"1.6.2\r\n1.8.1\r\n1.9.1" => [1,6,2]}
	84	end	69	to_test.each do \|s, v\|
	85	assert_equal 6, brs.length	70	test_scm_version_for(s, v)
	86	br_issue_8857 = brs[0]
	87	assert_equal 'issue-8857', br_issue_8857.to_s
	88	assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision
	89	assert_equal br_issue_8857.scmid, br_issue_8857.revision
	90	assert_equal false, br_issue_8857.is_default
	91	br_latin_1_path = brs[1]
	92	assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s
	93	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision
	94	assert_equal br_latin_1_path.scmid, br_latin_1_path.revision
	95	assert_equal false, br_latin_1_path.is_default
	96	br_master = brs[2]
	97	assert_equal 'master', br_master.to_s
	98	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision
	99	assert_equal br_master.scmid, br_master.revision
	100	assert_equal false, br_master.is_default
	101	br_master_20120212 = brs[3]
	102	assert_equal 'master-20120212', br_master_20120212.to_s
	103	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision
	104	assert_equal br_master_20120212.scmid, br_master_20120212.revision
	105	assert_equal true, br_master_20120212.is_default
	106	br_latin_1 = brs[-2]
	107	assert_equal 'test-latin-1', br_latin_1.to_s
	108	assert_equal '67e7792ce20ccae2e4bb73eed09bb397819c8834', br_latin_1.revision
	109	assert_equal br_latin_1.scmid, br_latin_1.revision
	110	assert_equal false, br_latin_1.is_default
	111	br_test = brs[-1]
	112	assert_equal 'test_branch', br_test.to_s
	113	assert_equal 'fba357b886984ee71185ad2065e65fc0417d9b92', br_test.revision
	114	assert_equal br_test.scmid, br_test.revision
	115	assert_equal false, br_test.is_default
	116	end	71	end
			72	end
	117		73
	118	def test_~~default_~~branch	74	def test_branches
	119	assert_equal 'master-20120212', @adapter.default_branch	75	brs = []
	120	end	76	@adapter.branches.each do \|b\|
			77	brs << b
			78	end
			79	assert_equal 6, brs.length
			80	br_issue_8857 = brs[0]
			81	assert_equal 'issue-8857', br_issue_8857.to_s
			82	assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision
			83	assert_equal br_issue_8857.scmid, br_issue_8857.revision
			84	assert_equal false, br_issue_8857.is_default
			85	br_latin_1_path = brs[1]
			86	assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s
			87	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision
			88	assert_equal br_latin_1_path.scmid, br_latin_1_path.revision
			89	assert_equal false, br_latin_1_path.is_default
			90	br_master = brs[2]
			91	assert_equal 'master', br_master.to_s
			92	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision
			93	assert_equal br_master.scmid, br_master.revision
			94	assert_equal false, br_master.is_default
			95	br_master_20120212 = brs[3]
			96	assert_equal 'master-20120212', br_master_20120212.to_s
			97	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision
			98	assert_equal br_master_20120212.scmid, br_master_20120212.revision
			99	assert_equal true, br_master_20120212.is_default
			100	br_latin_1 = brs[-2]
			101	assert_equal 'test-latin-1', br_latin_1.to_s
			102	assert_equal '67e7792ce20ccae2e4bb73eed09bb397819c8834', br_latin_1.revision
			103	assert_equal br_latin_1.scmid, br_latin_1.revision
			104	assert_equal false, br_latin_1.is_default
			105	br_test = brs[-1]
			106	assert_equal 'test_branch', br_test.to_s
			107	assert_equal 'fba357b886984ee71185ad2065e65fc0417d9b92', br_test.revision
			108	assert_equal br_test.scmid, br_test.revision
			109	assert_equal false, br_test.is_default
			110	end
	121		111
	122	def test_~~tags~~	112	def test_default_branch
	123	assert_equal [	113	assert_equal 'master-20120212', @adapter.default_branch
	124	"tag00.lightweight",	114	end
	125	"tag01.annotated",
	126	], @adapter.tags
	127	end
	128		115
	129	def test_revisions_master_all	116	def test_tags
	130	revs1 = []	117	assert_equal [
	131	@adapter.revisions('', nil, "master",{}) do \|rev\|	118	"tag00.lightweight",
	132	revs1 << rev	119	"tag01.annotated",
	133	end	120	], @adapter.tags
	134	assert_equal 15, revs1.length	121	end
	135	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 0].identifier
	136	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[-1].identifier
	137
	138	revs2 = []
	139	@adapter.revisions('', nil, "master",
	140	{:reverse => true}) do \|rev\|
	141	revs2 << rev
	142	end
	143	assert_equal 15, revs2.length
	144	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier
	145	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs2[ 0].identifier
	146	end
	147		122
	148	def test_revisions_master_~~merged_rev~~	123	def test_revisions_master_all
	149	revs1 = []	124	revs1 = []
	150	@adapter.revisions('',	125	@adapter.revisions('', nil, "master",{}) do \|rev\|
	151	"713f4944648826f558cf548222f813dabe7cbb04",	126	revs1 << rev
	152	"master",
	153	{:reverse => true}) do \|rev\|
	154	revs1 << rev
	155	end
	156	assert_equal 8, revs1.length
	157	assert_equal 'fba357b886984ee71185ad2065e65fc0417d9b92', revs1[ 0].identifier
	158	assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs1[ 1].identifier
	159	# 4a07fe31b is not a child of 713f49446
	160	assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs1[ 2].identifier
	161	# Merged revision
	162	assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 3].identifier
	163	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
	164
	165	revs2 = []
	166	@adapter.revisions('',
	167	"fba357b886984ee71185ad2065e65fc0417d9b92",
	168	"master",
	169	{:reverse => true}) do \|rev\|
	170	revs2 << rev
	171	end
	172	assert_equal 7, revs2.length
	173	assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs2[ 0].identifier
	174	# 4a07fe31b is not a child of fba357b8869
	175	assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs2[ 1].identifier
	176	# Merged revision
	177	assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs2[ 2].identifier
	178	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier
	179	end	127	end
			128	assert_equal 15, revs1.length
			129	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 0].identifier
			130	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[-1].identifier
	180		131
	181	def test_revisions_branch_latin_1_path_encoding_all	132	revs2 = []
	182	revs1 = []	133	@adapter.revisions('', nil, "master",
	183	@adapter.revisions('', nil, "latin-1-path-encoding",{}) do \|rev\|	134	{:reverse => true}) do \|rev\|
	184	~~revs1~~ << rev	135	revs2 << rev
	185	end
	186	assert_equal 8, revs1.length
	187	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[ 0].identifier
	188	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[-1].identifier
	189
	190	revs2 = []
	191	@adapter.revisions('', nil, "latin-1-path-encoding",
	192	{:reverse => true}) do \|rev\|
	193	revs2 << rev
	194	end
	195	assert_equal 8, revs2.length
	196	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs2[-1].identifier
	197	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs2[ 0].identifier
	198	end	136	end
			137	assert_equal 15, revs2.length
			138	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier
			139	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs2[ 0].identifier
			140	end
	199		141
	200	def test_revisions_~~branch_latin_1_path_encoding_with~~_rev	142	def test_revisions_master_merged_rev
	201	revs1 = []	143	revs1 = []
	202	@adapter.revisions('',	144	@adapter.revisions('',
	203	'7234cb2750b63f47bff735edc50a1c0a433c2518',	145	"713f4944648826f558cf548222f813dabe7cbb04",
	204	"~~latin-1-path-encoding~~",	146	"master",
	205	{:reverse => true}) do \|rev\|	147	{:reverse => true}) do \|rev\|
	206	revs1 << rev	148	revs1 << rev
	207	end	149	end
	208	assert_equal 7, revs1.length	150	assert_equal 8, revs1.length
	209	assert_equal '~~899a15dba03a3b350b89c3f537e4bbe02a03cdc9~~', revs1[ 0].identifier	151	assert_equal 'fba357b886984ee71185ad2065e65fc0417d9b92', revs1[ 0].identifier
	210	assert_equal '~~1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127~~', revs1[-1].identifier	152	assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs1[ 1].identifier
			153	# 4a07fe31b is not a child of 713f49446
			154	assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs1[ 2].identifier
			155	# Merged revision
			156	assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 3].identifier
			157	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
			158
			159	revs2 = []
			160	@adapter.revisions('',
			161	"fba357b886984ee71185ad2065e65fc0417d9b92",
			162	"master",
			163	{:reverse => true}) do \|rev\|
			164	revs2 << rev
			165	end
			166	assert_equal 7, revs2.length
			167	assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs2[ 0].identifier
			168	# 4a07fe31b is not a child of fba357b8869
			169	assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs2[ 1].identifier
			170	# Merged revision
			171	assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs2[ 2].identifier
			172	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier
			173	end
	211		174
	212	revs2 = []	175	def test_revisions_branch_latin_1_path_encoding_all
	213	@adapter.revisions('',	176	revs1 = []
	214	'57ca437c0acbbcb749821fdf3726a1367056d364',	177	@adapter.revisions('', nil, "latin-1-path-encoding",{}) do \|rev\|
	215	"latin-1-path-encoding",	178	revs1 << rev
	216	{:reverse => true}) do \|rev\|
	217	revs2 << rev
	218	end
	219	assert_equal 3, revs2.length
	220	assert_equal '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', revs2[ 0].identifier
	221	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs2[-1].identifier
	222	end	179	end
			180	assert_equal 8, revs1.length
			181	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[ 0].identifier
			182	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[-1].identifier
	223		183
	224	def test_revisions_invalid_rev	184	revs2 = []
	225	assert_equal [], @adapter.revisions('', '1234abcd', "master")	185	@adapter.revisions('', nil, "latin-1-path-encoding",
	226	assert_raise Redmine::Scm::Adapters::CommandFailed do	186	{:reverse => true}) do \|rev\|
	227	~~revs1~~ = []	187	revs2 << rev
	228	@adapter.revisions('',
	229	'1234abcd',
	230	"master",
	231	{:reverse => true}) do \|rev\|
	232	revs1 << rev
	233	end
	234	end
	235	end	188	end
			189	assert_equal 8, revs2.length
			190	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs2[-1].identifier
			191	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs2[ 0].identifier
			192	end
	236		193
	237	def test_revisions_~~includes_master_two_revs~~	194	def test_revisions_branch_latin_1_path_encoding_with_rev
	238	revs1 = []	195	revs1 = []
	239	@adapter.revisions('', ~~nil~~, ~~nil~~,	196	@adapter.revisions('',
	240	{:reverse => true,	197	'7234cb2750b63f47bff735edc50a1c0a433c2518',
	241	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],	198	"latin-1-path-encoding",
	242	:excludes => ['4f26664364207fa8b1af9f8722647ab2d4ac5d43']}) do \|rev\|	199	{:reverse => true}) do \|rev\|
	243	revs1 << rev	200	revs1 << rev
	244	end	201	end
	245	assert_equal 2, revs1.length	202	assert_equal 7, revs1.length
	246	assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier	203	assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', revs1[ 0].identifier
	247	assert_equal '~~83ca5fd546063a3c7dc2e568ba3355661a9e2b2c~~', revs1[-1].identifier	204	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[-1].identifier
	248	end	205
			206	revs2 = []
			207	@adapter.revisions('',
			208	'57ca437c0acbbcb749821fdf3726a1367056d364',
			209	"latin-1-path-encoding",
			210	{:reverse => true}) do \|rev\|
			211	revs2 << rev
			212	end
			213	assert_equal 3, revs2.length
			214	assert_equal '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', revs2[ 0].identifier
			215	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs2[-1].identifier
			216	end
	249		217
	250	def test_revisions_in~~cludes_master_two_revs_from_origin~~	218	def test_revisions_invalid_rev
			219	assert_equal [], @adapter.revisions('', '1234abcd', "master")
			220	assert_raise Redmine::Scm::Adapters::CommandFailed do
	251	revs1 = []	221	revs1 = []
	252	@adapter.revisions('', ~~nil~~, ~~nil~~,	222	@adapter.revisions('',
	253	{~~:reverse~~ => ~~true~~,	223	'1234abcd',
	254	:includes => ['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'],	224	"master",
	255	~~:excludes~~ => []}) do \|rev\|	225	{:reverse => true}) do \|rev\|
	256	revs1 << rev	226	revs1 << rev
	257	end	227	end
	258	assert_equal 2, revs1.length
	259	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[ 0].identifier
	260	assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', revs1[ 1].identifier
	261	end	228	end
			229	end
	262		230
	263	def test_revisions_includes_m~~erged~~_revs	231	def test_revisions_includes_master_two_revs
	264	revs1 = []	232	revs1 = []
	265	@adapter.revisions('', nil, nil,	233	@adapter.revisions('', nil, nil,
	266	{:reverse => true,	234	{:reverse => true,
	267	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],	235	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
	268	:excludes => ['~~fba357b886984ee71185ad2065e65fc0417d9b92~~']}) do \|rev\|	236	:excludes => ['4f26664364207fa8b1af9f8722647ab2d4ac5d43']}) do \|rev\|
	269	revs1 << rev	237	revs1 << rev
	270	end	238	end
	271	assert_equal 7, revs1.length	239	assert_equal 2, revs1.length
	272	assert_equal '~~7e61ac704deecde634b51e59daa8110435dcb3da~~', revs1[ 0].identifier	240	assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
	273	assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs1[ 1].identifier	241	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
	274	assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 2].identifier	242	end
	275	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
	276	end
	277		243
	278	def test_revisions_includes_~~two_heads~~	244	def test_revisions_includes_master_two_revs_from_origin
	279	revs1 = []	245	revs1 = []
	280	@adapter.revisions('', nil, nil,	246	@adapter.revisions('', nil, nil,
	281	{:reverse => true,	247	{:reverse => true,
	282	:includes => ['8~~3ca5fd546063a3c7dc2e568ba3355661a9e2b2c'~~,	248	:includes => ['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'],
	283	'1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127'],	249	:excludes => []}) do \|rev\|
	284	:excludes => ['4f26664364207fa8b1af9f8722647ab2d4ac5d43',	250	revs1 << rev
	285	'4fc55c43bf3d3dc2efb66145365ddc17639ce81e']}) do \|rev\|	251	end
	286	revs1 << rev	252	assert_equal 2, revs1.length
	287	end	253	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[ 0].identifier
	288	assert_equal 4, revs1.length	254	assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', revs1[ 1].identifier
	289	assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier	255	end
	290	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 1].identifier
	291	assert_equal '64f1f3e89ad1cb57976ff0ad99a107012ba3481d', revs1[-2].identifier
	292	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[-1].identifier
	293	end
	294		256
	295	def test_revisions_~~disjointed_histories_revision~~s	257	def test_revisions_includes_merged_revs
			258	revs1 = []
			259	@adapter.revisions('', nil, nil,
			260	{:reverse => true,
			261	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
			262	:excludes => ['fba357b886984ee71185ad2065e65fc0417d9b92']}) do \|rev\|
			263	revs1 << rev
			264	end
			265	assert_equal 7, revs1.length
			266	assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs1[ 0].identifier
			267	assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs1[ 1].identifier
			268	assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 2].identifier
			269	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
			270	end
			271
			272	def test_revisions_includes_two_heads
			273	revs1 = []
			274	@adapter.revisions('', nil, nil,
			275	{:reverse => true,
			276	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c',
			277	'1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127'],
			278	:excludes => ['4f26664364207fa8b1af9f8722647ab2d4ac5d43',
			279	'4fc55c43bf3d3dc2efb66145365ddc17639ce81e']}) do \|rev\|
			280	revs1 << rev
			281	end
			282	assert_equal 4, revs1.length
			283	assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
			284	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 1].identifier
			285	assert_equal '64f1f3e89ad1cb57976ff0ad99a107012ba3481d', revs1[-2].identifier
			286	assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[-1].identifier
			287	end
			288
			289	def test_revisions_disjointed_histories_revisions
			290	revs1 = []
			291	@adapter.revisions('', nil, nil,
			292	{:reverse => true,
			293	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c',
			294	'92397af84d22f27389c822848ecd5b463c181583'],
			295	:excludes => ['95488a44bc25f7d1f97d775a31359539ff333a63',
			296	'4f26664364207fa8b1af9f8722647ab2d4ac5d43'] }) do \|rev\|
			297	revs1 << rev
			298	end
			299	assert_equal 4, revs1.length
			300	assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
			301	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 1].identifier
			302	assert_equal 'bc201c95999c4f10d018b0aa03b541cd6a2ff0ee', revs1[-2].identifier
			303	assert_equal '92397af84d22f27389c822848ecd5b463c181583', revs1[-1].identifier
			304	end
			305
			306	def test_revisions_invalid_rev_excludes
			307	assert_equal [],
			308	@adapter.revisions('', nil, nil,
			309	{:reverse => true,
			310	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
			311	:excludes => ['0123abcd4567']})
			312	assert_raise Redmine::Scm::Adapters::CommandFailed do
	296	revs1 = []	313	revs1 = []
	297	@adapter.revisions('', nil, nil,	314	@adapter.revisions('', nil, nil,
	298	{:reverse => true,	315	{:reverse => true,
	299	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c',	316	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
	300	'92397af84d22f27389c822848ecd5b463c181583'],	317	:excludes => ['0123abcd4567']}) do \|rev\|
	301	:excludes => ['95488a44bc25f7d1f97d775a31359539ff333a63',
	302	'4f26664364207fa8b1af9f8722647ab2d4ac5d43'] }) do \|rev\|
	303	revs1 << rev	318	revs1 << rev
	304	end	319	end
	305	assert_equal 4, revs1.length
	306	assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
	307	assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 1].identifier
	308	assert_equal 'bc201c95999c4f10d018b0aa03b541cd6a2ff0ee', revs1[-2].identifier
	309	assert_equal '92397af84d22f27389c822848ecd5b463c181583', revs1[-1].identifier
	310	end
	311
	312	def test_revisions_invalid_rev_excludes
	313	assert_equal [],
	314	@adapter.revisions('', nil, nil,
	315	{:reverse => true,
	316	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
	317	:excludes => ['0123abcd4567']})
	318	assert_raise Redmine::Scm::Adapters::CommandFailed do
	319	revs1 = []
	320	@adapter.revisions('', nil, nil,
	321	{:reverse => true,
	322	:includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
	323	:excludes => ['0123abcd4567']}) do \|rev\|
	324	revs1 << rev
	325	end
	326	end
	327	end	320	end
			321	end
	328		322
	329	def test_getting_revisions_with_spaces_in_filename	323	def test_getting_revisions_with_spaces_in_filename
	330	assert_equal 1, @adapter.revisions("filemane with spaces.txt",	324	assert_equal 1, @adapter.revisions("filemane with spaces.txt",
	331	nil, "master").length	325	nil, "master").length
	332	end	326	end
	333		327
	334	def test_parents	328	def test_parents
	335	revs1 = []	329	revs1 = []
	336	@adapter.revisions('',	330	@adapter.revisions('',
	337	nil,	331	nil,
	338	"master",	332	"master",
	339	{:reverse => true}) do \|rev\|	333	{:reverse => true}) do \|rev\|
	340	revs1 << rev	334	revs1 << rev
	341	end	335	end
	342	assert_equal 15, revs1.length	336	assert_equal 15, revs1.length
	343	assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",	337	assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
	344	revs1[0].identifier	338	revs1[0].identifier
	345	assert_equal nil, revs1[0].parents	339	assert_equal nil, revs1[0].parents
	346	assert_equal "899a15dba03a3b350b89c3f537e4bbe02a03cdc9",	340	assert_equal "899a15dba03a3b350b89c3f537e4bbe02a03cdc9",
	347	revs1[1].identifier	341	revs1[1].identifier
	348	assert_equal 1, revs1[1].parents.length	342	assert_equal 1, revs1[1].parents.length
	349	assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",	343	assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
	350	revs1[1].parents[0]	344	revs1[1].parents[0]
	351	assert_equal "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",	345	assert_equal "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
	352	revs1[10].identifier	346	revs1[10].identifier
	353	assert_equal 2, revs1[10].parents.length	347	assert_equal 2, revs1[10].parents.length
	354	assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",	348	assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
	355	revs1[10].parents[0]	349	revs1[10].parents[0]
	356	assert_equal "7e61ac704deecde634b51e59daa8110435dcb3da",	350	assert_equal "7e61ac704deecde634b51e59daa8110435dcb3da",
	357	revs1[10].parents[1]	351	revs1[10].parents[1]
	358	end	352	end
	359		353
	360	def test_getting_revisions_with_leading_and_trailing_spaces_in_filename	354	def test_getting_revisions_with_leading_and_trailing_spaces_in_filename
	361	assert_equal " filename with a leading space.txt ",	355	assert_equal " filename with a leading space.txt ",
	362	@adapter.revisions(" filename with a leading space.txt ",	356	@adapter.revisions(" filename with a leading space.txt ",
	363	nil, "master")[0].paths[0][:path]	357	nil, "master")[0].paths[0][:path]
	364	end	358	end
	365		359
	366	def test_getting_entries_with_leading_and_trailing_spaces_in_filename	360	def test_getting_entries_with_leading_and_trailing_spaces_in_filename
	367	assert_equal " filename with a leading space.txt ",	361	assert_equal " filename with a leading space.txt ",
	368	@adapter.entries('',	362	@adapter.entries('',
	369	'83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')[3].name	363	'83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')[3].name
	370	end	364	end
	371		365
	372	def test_annotate	366	def test_annotate
	373	annotate = @adapter.annotate('sources/watchers_controller.rb')	367	annotate = @adapter.annotate('sources/watchers_controller.rb')
	374	assert_kind_of Redmine::Scm::Adapters::Annotate, annotate	368	assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
	375	assert_equal 41, annotate.lines.size	369	assert_equal 41, annotate.lines.size
	376	assert_equal "# This program is free software; you can redistribute it and/or",	370	assert_equal "# This program is free software; you can redistribute it and/or",
	377	annotate.lines[4].strip	371	annotate.lines[4].strip
	378	assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",	372	assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
	379	annotate.revisions[4].identifier	373	annotate.revisions[4].identifier
	380	assert_equal "jsmith", annotate.revisions[4].author	374	assert_equal "jsmith", annotate.revisions[4].author
	381	end	375	end
	382		376
	383	def test_annotate_moved_file	377	def test_annotate_moved_file
	384	annotate = @adapter.annotate('renamed_test.txt')	378	annotate = @adapter.annotate('renamed_test.txt')
	385	assert_kind_of Redmine::Scm::Adapters::Annotate, annotate	379	assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
	386	assert_equal 2, annotate.lines.size	380	assert_equal 2, annotate.lines.size
	387	end	381	end
	388		382
	389	def test_last_rev	383	def test_last_rev
	390	last_rev = @adapter.lastrev("README",	384	last_rev = @adapter.lastrev("README",
	391	"4f26664364207fa8b1af9f8722647ab2d4ac5d43")	385	"4f26664364207fa8b1af9f8722647ab2d4ac5d43")
	392	assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.scmid	386	assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.scmid
	393	assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.identifier	387	assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.identifier
	394	assert_equal "Adam Soltys <asoltys@gmail.com>", last_rev.author	388	assert_equal "Adam Soltys <asoltys@gmail.com>", last_rev.author
	395	assert_equal Time.gm(2009, 6, 24, 5, 27, 38), last_rev.time	389	assert_equal Time.gm(2009, 6, 24, 5, 27, 38), last_rev.time
	396	end	390	end
	397		391
	398	def test_last_rev_with_spaces_in_filename	392	def test_last_rev_with_spaces_in_filename
	399	last_rev = @adapter.lastrev("filemane with spaces.txt",	393	last_rev = @adapter.lastrev("filemane with spaces.txt",
	400	"ed5bb786bbda2dee66a2d50faf51429dbc043a7b")	394	"ed5bb786bbda2dee66a2d50faf51429dbc043a7b")
	401	last_rev_author = last_rev.author	395	last_rev_author = last_rev.author
	402	assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.scmid	396	assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.scmid
	403	assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.identifier	397	assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.identifier
	404	assert_equal "#{@str_felix_hex} <felix@fachschaften.org>",	398	assert_equal "#{@str_felix_hex} <felix@fachschaften.org>",
	405	last_rev.author	399	last_rev.author
	406	assert_equal Time.gm(2010, 9, 18, 19, 59, 46), last_rev.time	400	assert_equal Time.gm(2010, 9, 18, 19, 59, 46), last_rev.time
	407	end	401	end
	408		402
	409	def test_latin_1_path	403	def test_latin_1_path
	410	if WINDOWS_PASS	404	if WINDOWS_PASS
	411	puts WINDOWS_SKIP_STR	405	puts WINDOWS_SKIP_STR
	412	elsif JRUBY_SKIP	406	elsif JRUBY_SKIP
	413	puts JRUBY_SKIP_STR	407	puts JRUBY_SKIP_STR
	414	else	408	else
	415	p2 = "latin-1-dir/test-#{@char_1}-2.txt"	409	p2 = "latin-1-dir/test-#{@char_1}-2.txt"
	416	['4fc55c43bf3d3dc2efb66145365ddc17639ce81e', '4fc55c43bf3'].each do \|r1\|	410	['4fc55c43bf3d3dc2efb66145365ddc17639ce81e', '4fc55c43bf3'].each do \|r1\|
	417	assert @adapter.diff(p2, r1)	411	assert @adapter.diff(p2, r1)
	418	assert @adapter.cat(p2, r1)	412	assert @adapter.cat(p2, r1)
	419	assert_equal 1, @adapter.annotate(p2, r1).lines.length	413	assert_equal 1, @adapter.annotate(p2, r1).lines.length
	420	['64f1f3e89ad1cb57976ff0ad99a107012ba3481d', '64f1f3e89ad1cb5797'].each do \|r2\|	414	['64f1f3e89ad1cb57976ff0ad99a107012ba3481d', '64f1f3e89ad1cb5797'].each do \|r2\|
	421	assert @adapter.diff(p2, r1, r2)	415	assert @adapter.diff(p2, r1, r2)
	422	end
	423	end	416	end
	424	end	417	end
	425	end	418	end
			419	end
	426		420
	427	def test_latin_1_user_annotate	421	def test_latin_1_user_annotate
	428	['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', '83ca5fd546063a'].each do \|r1\|	422	['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', '83ca5fd546063a'].each do \|r1\|
	429	annotate = @adapter.annotate(" filename with a leading space.txt ", r1)	423	annotate = @adapter.annotate(" filename with a leading space.txt ", r1)
	430	assert_kind_of Redmine::Scm::Adapters::Annotate, annotate	424	assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
	431	assert_equal 1, annotate.lines.size	425	assert_equal 1, annotate.lines.size
	432	assert_equal "And this is a file with a leading and trailing space...",	426	assert_equal "And this is a file with a leading and trailing space...",
	433	annotate.lines[0].strip	427	annotate.lines[0].strip
	434	assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",	428	assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
	435	annotate.revisions[0].identifier	429	annotate.revisions[0].identifier
	436	assert_equal @str_felix_hex, annotate.revisions[0].author	430	assert_equal @str_felix_hex, annotate.revisions[0].author
	437	end
	438	end	431	end
			432	end
	439		433
	440	def test_entries_tag	434	def test_entries_tag
	441	entries1 = @adapter.entries(nil, 'tag01.annotated',	435	entries1 = @adapter.entries(nil, 'tag01.annotated',
	442	options = {:report_last_commit => true})	436	options = {:report_last_commit => true})
	443	assert entries1	437	assert entries1
	444	assert_equal 3, entries1.size	438	assert_equal 3, entries1.size
	445	assert_equal 'sources', entries1[1].name	439	assert_equal 'sources', entries1[1].name
	446	assert_equal 'sources', entries1[1].path	440	assert_equal 'sources', entries1[1].path
	447	assert_equal 'dir', entries1[1].kind	441	assert_equal 'dir', entries1[1].kind
	448	readme = entries1[2]	442	readme = entries1[2]
	449	assert_equal 'README', readme.name	443	assert_equal 'README', readme.name
	450	assert_equal 'README', readme.path	444	assert_equal 'README', readme.path
	451	assert_equal 'file', readme.kind	445	assert_equal 'file', readme.kind
	452	assert_equal 27, readme.size	446	assert_equal 27, readme.size
	453	assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', readme.lastrev.identifier	447	assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', readme.lastrev.identifier
	454	assert_equal Time.gm(2007, 12, 14, 9, 24, 1), readme.lastrev.time	448	assert_equal Time.gm(2007, 12, 14, 9, 24, 1), readme.lastrev.time
	455	end	449	end
	456		450
	457	def test_entries_branch	451	def test_entries_branch
	458	entries1 = @adapter.entries(nil, 'test_branch',	452	entries1 = @adapter.entries(nil, 'test_branch',
	459	options = {:report_last_commit => true})	453	options = {:report_last_commit => true})
	460	assert entries1	454	assert entries1
	461	assert_equal 4, entries1.size	455	assert_equal 4, entries1.size
	462	assert_equal 'sources', entries1[1].name	456	assert_equal 'sources', entries1[1].name
	463	assert_equal 'sources', entries1[1].path	457	assert_equal 'sources', entries1[1].path
	464	assert_equal 'dir', entries1[1].kind	458	assert_equal 'dir', entries1[1].kind
	465	readme = entries1[2]	459	readme = entries1[2]
	466	assert_equal 'README', readme.name	460	assert_equal 'README', readme.name
	467	assert_equal 'README', readme.path	461	assert_equal 'README', readme.path
	468	assert_equal 'file', readme.kind	462	assert_equal 'file', readme.kind
	469	assert_equal 159, readme.size	463	assert_equal 159, readme.size
	470	assert_equal '713f4944648826f558cf548222f813dabe7cbb04', readme.lastrev.identifier	464	assert_equal '713f4944648826f558cf548222f813dabe7cbb04', readme.lastrev.identifier
	471	assert_equal Time.gm(2009, 6, 19, 4, 37, 23), readme.lastrev.time	465	assert_equal Time.gm(2009, 6, 19, 4, 37, 23), readme.lastrev.time
	472	end	466	end
	473		467
	474	def test_entries_wrong_path_encoding	468	def test_entries_wrong_path_encoding
	475	adpt = Redmine::Scm::Adapters::GitAdapter.new(	469	adpt = Redmine::Scm::Adapters::GitAdapter.new(
	476	REPOSITORY_PATH,	470	REPOSITORY_PATH,
	477	nil,	471	nil,
	478	nil,	472	nil,
	479	nil,	473	nil,
	480	'EUC-JP'	474	'EUC-JP'
	481	)	475	)
	482	entries1 = adpt.entries('latin-1-dir', '64f1f3e8')	476	entries1 = adpt.entries('latin-1-dir', '64f1f3e8')
	483	assert entries1	477	assert entries1
	484	assert_equal 3, entries1.size	478	assert_equal 3, entries1.size
	485	f1 = entries1[1]	479	f1 = entries1[1]
	486	assert_equal nil, f1.name	480	assert_equal nil, f1.name
	487	assert_equal nil, f1.path	481	assert_equal nil, f1.path
	488	assert_equal 'file', f1.kind	482	assert_equal 'file', f1.kind
	489	end	483	end
			484
			485	def test_entries_latin_1_files
			486	entries1 = @adapter.entries('latin-1-dir', '64f1f3e8')
			487	assert entries1
			488	assert_equal 3, entries1.size
			489	f1 = entries1[1]
			490	assert_equal "test-#{@char_1}-2.txt", f1.name
			491	assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path
			492	assert_equal 'file', f1.kind
			493	end
	490		494
	491	def test_entries_latin_1_~~files~~	495	def test_entries_latin_1_dir
	492	entries1 = @adapter.entries('latin-1-dir', '64f1f3e8')	496	if WINDOWS_PASS
			497	puts WINDOWS_SKIP_STR
			498	elsif JRUBY_SKIP
			499	puts JRUBY_SKIP_STR
			500	else
			501	entries1 = @adapter.entries("latin-1-dir/test-#{@char_1}-subdir",
			502	'1ca7f5ed')
	493	assert entries1	503	assert entries1
	494	assert_equal 3, entries1.size	504	assert_equal 3, entries1.size
	495	f1 = entries1[1]	505	f1 = entries1[1]
	496	assert_equal "test-#{@char_1}-2.txt", f1.name	506	assert_equal "test-#{@char_1}-2.txt", f1.name
	497	assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path	507	assert_equal "latin-1-dir/test-#{@char_1}-subdir/test-#{@char_1}-2.txt", f1.path
	498	assert_equal 'file', f1.kind	508	assert_equal 'file', f1.kind
	499	end	509	end
			510	end
	500		511
	501	def test_entr~~ies_latin_1_dir~~	512	def test_entry
	502	if WINDOWS_PASS	513	entry = @adapter.entry()
	503	puts WINDOWS_SKIP_STR	514	assert_equal "", entry.path
	504	elsif JRUBY_SKIP	515	assert_equal "dir", entry.kind
	505	puts JRUBY_SKIP_STR	516	entry = @adapter.entry('')
	506	else	517	assert_equal "", entry.path
	507	entries1 = @adapter.entries("latin-1-dir/test-#{@char_1}-subdir",	518	assert_equal "dir", entry.kind
	508	'1ca7f5ed')	519	assert_nil @adapter.entry('invalid')
	509	assert entries1	520	assert_nil @adapter.entry('/invalid')
	510	assert_equal 3, entries1.size	521	assert_nil @adapter.entry('/invalid/')
	511	f1 = entries1[1]	522	assert_nil @adapter.entry('invalid/invalid')
	512	assert_equal "test-#{@char_1}-2.txt", f1.name	523	assert_nil @adapter.entry('invalid/invalid/')
	513	assert_equal "latin-1-dir/test-#{@char_1}-subdir/test-#{@char_1}-2.txt", f1.path	524	assert_nil @adapter.entry('/invalid/invalid')
	514	assert_equal 'file', f1.kind	525	assert_nil @adapter.entry('/invalid/invalid/')
	515	end	526	["README", "/README"].each do \|path\|
	516	end	527	entry = @adapter.entry(path, '7234cb2750b63f')
	517		528	assert_equal "README", entry.path
	518	def test_entry	529	assert_equal "file", entry.kind
	519	entry = @adapter.entry()	530	end
	520	assert_equal "", entry.path	531	["sources", "/sources", "/sources/"].each do \|path\|
			532	entry = @adapter.entry(path, '7234cb2750b63f')
			533	assert_equal "sources", entry.path
	521	assert_equal "dir", entry.kind	534	assert_equal "dir", entry.kind
	522	entry = @adapter.entry('')
	523	assert_equal "", entry.path
	524	assert_equal "dir", entry.kind
	525	assert_nil @adapter.entry('invalid')
	526	assert_nil @adapter.entry('/invalid')
	527	assert_nil @adapter.entry('/invalid/')
	528	assert_nil @adapter.entry('invalid/invalid')
	529	assert_nil @adapter.entry('invalid/invalid/')
	530	assert_nil @adapter.entry('/invalid/invalid')
	531	assert_nil @adapter.entry('/invalid/invalid/')
	532	["README", "/README"].each do \|path\|
	533	entry = @adapter.entry(path, '7234cb2750b63f')
	534	assert_equal "README", entry.path
	535	assert_equal "file", entry.kind
	536	end
	537	["sources", "/sources", "/sources/"].each do \|path\|
	538	entry = @adapter.entry(path, '7234cb2750b63f')
	539	assert_equal "sources", entry.path
	540	assert_equal "dir", entry.kind
	541	end
	542	["sources/watchers_controller.rb", "/sources/watchers_controller.rb"].each do \|path\|
	543	entry = @adapter.entry(path, '7234cb2750b63f')
	544	assert_equal "sources/watchers_controller.rb", entry.path
	545	assert_equal "file", entry.kind
	546	end
	547	end	535	end
	548		536	["sources/watchers_controller.rb", "/sources/watchers_controller.rb"].each do \|path\|
	549	def test_path_encoding_default_utf8	537	entry = @adapter.entry(path, '7234cb2750b63f')
	550	adpt1 = Redmine::Scm::Adapters::GitAdapter.new(	538	assert_equal "sources/watchers_controller.rb", entry.path
	551	REPOSITORY_PATH	539	assert_equal "file", entry.kind
	552	)
	553	assert_equal "UTF-8", adpt1.path_encoding
	554	adpt2 = Redmine::Scm::Adapters::GitAdapter.new(
	555	REPOSITORY_PATH,
	556	nil,
	557	nil,
	558	nil,
	559	""
	560	)
	561	assert_equal "UTF-8", adpt2.path_encoding
	562	end	540	end
			541	end
	563		542
	564	def test_~~cat_path_invalid~~	543	def test_path_encoding_default_utf8
	565	assert_nil @adapter.cat('invalid')	544	adpt1 = Redmine::Scm::Adapters::GitAdapter.new(
	566	end	545	REPOSITORY_PATH
			546	)
			547	assert_equal "UTF-8", adpt1.path_encoding
			548	adpt2 = Redmine::Scm::Adapters::GitAdapter.new(
			549	REPOSITORY_PATH,
			550	nil,
			551	nil,
			552	nil,
			553	""
			554	)
			555	assert_equal "UTF-8", adpt2.path_encoding
			556	end
	567		557
	568	def test_cat_~~revision~~_invalid	558	def test_cat_path_invalid
	569	assert @adapter.cat('~~README~~')	559	assert_nil @adapter.cat('invalid')
	570	assert_nil @adapter.cat('README', '1234abcd5678')	560	end
	571	end
	572		561
	573	def test_~~diff_path~~_invalid	562	def test_cat_revision_invalid
	574	assert_equal [], @adapter.diff('invalid', '713f4944648826f5')	563	assert @adapter.cat('README')
	575	end	564	assert_nil @adapter.cat('README', '1234abcd5678')
			565	end
	576		566
	577	def test_diff_~~revision~~_invalid	567	def test_diff_path_invalid
	578	assert_~~nil~~ @adapter.diff(~~nil~~, '~~1234abcd5678~~')	568	assert_equal [], @adapter.diff('invalid', '713f4944648826f5')
	579	assert_nil @adapter.diff(nil, '713f4944648826f5', '1234abcd5678')	569	end
	580	assert_nil @adapter.diff(nil, '1234abcd5678', '713f4944648826f5')
	581	end
	582		570
	583	def test_~~annotate_path~~_invalid	571	def test_diff_revision_invalid
	584	assert_nil @adapter.~~annotate~~('in~~val~~id')	572	assert_nil @adapter.diff(nil, '1234abcd5678')
	585	end	573	assert_nil @adapter.diff(nil, '713f4944648826f5', '1234abcd5678')
			574	assert_nil @adapter.diff(nil, '1234abcd5678', '713f4944648826f5')
			575	end
	586		576
	587	def test_annotate_~~revision~~_invalid	577	def test_annotate_path_invalid
	588	assert @adapter.annotate('~~README~~')	578	assert_nil @adapter.annotate('invalid')
	589	assert_nil @adapter.annotate('README', '1234abcd5678')	579	end
	590	end
	591		580
	592	private	581	def test_annotate_revision_invalid
			582	assert @adapter.annotate('README')
			583	assert_nil @adapter.annotate('README', '1234abcd5678')
			584	end
	593		585
	594	def test_scm_version_for(scm_command_version, version)	586	private
	595	@adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)
	596	assert_equal version, @adapter.class.scm_command_version
	597	end
	598		587
	599	else	588	def test_scm_version_for(scm_command_version, version)
	600	puts "Git test repository NOT FOUND. Skipping unit tests !!!"	589	@adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)
	601	def test_fake; assert true end	590	assert_equal version, @adapter.class.scm_command_version
	602	end	591	end
	603	end
	604		592
	605	rescue LoadError	593	else
	606	class GitMochaFake < ActiveSupport::TestCase	594	puts "Git test repository NOT FOUND. Skipping unit tests !!!"
	607	def test_fake; assert(~~false~~, ~~"Requires mocha~~ to ru~~n thos~~e ~~tests"~~) end	595	def test_fake; assert true end
	608	end	596	end
	609	end	597	end

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/lib/redmine/unified_diff_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/lib/redmine/wiki_formatting/macros_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/mail_handler_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/mailer_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/member_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/principal_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/project_copy_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/project_nested_set_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/project_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/query_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_bazaar_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_cvs_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_darcs_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_filesystem_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_git_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_mercurial_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_subversion_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/role_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/tracker_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/user_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/version_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/wiki_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

config/preinitializer.rb removed 0 -20

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/.autotest removed 0 -13

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/.gitignore removed 0 -8

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/.travis.yml removed 0 -18

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/CHANGELOG removed 0 -57

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/CONTRIBUTING.md removed 0 -14

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/Gemfile removed 0 -38

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/MIT-LICENSE removed 0 -20

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/README.md removed 0 -163

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/Rakefile removed 0 -32

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/awesome_nested_set.gemspec removed 0 -24

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.0.rb removed 0 -4

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.1.rb removed 0 -4

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.2.rb removed 0 -4

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/init.rb removed 0 -1

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set.rb removed 0 -8

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb removed 0 -135

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/columns.rb removed 0 -72

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/helper.rb removed 0 -44

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/iterator.rb removed 0 -29

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb removed 0 -204

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/movable.rb removed 0 -137

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/prunable.rb removed 0 -61

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/rebuildable.rb removed 0 -43

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/relatable.rb removed 0 -121

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/transactable.rb removed 0 -27

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/validatable.rb removed 0 -69

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/move.rb removed 0 -130

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/set_validator.rb removed 0 -63

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/tree.rb removed 0 -63

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/lib/awesome_nested_set/version.rb removed 0 -3

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/awesome_nested_set/helper_spec.rb removed 0 -102

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb removed 0 -1098

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1098 lines changed) Show them Hide them

lib/plugins/awesome_nested_set/spec/db/database.yml removed 0 -27

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/db/schema.rb removed 0 -74

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/fixtures/brokens.yml removed 0 -3

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/fixtures/categories.yml removed 0 -34

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/fixtures/departments.yml removed 0 -3

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/fixtures/notes.yml removed 0 -38

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/fixtures/things.yml removed 0 -27

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/spec_helper.rb removed 0 -35

NO CONTENT: file was removed

lib/plugins/awesome_nested_set/spec/support/models.rb removed 0 -96

NO CONTENT: file was removed

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