jro_apps/redmine Commit - r13100:2d1866d966d9

0

.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}

0

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

0

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')

0

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'

0

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

0

.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

0

Gemfile +13 -17

             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 "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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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') }

0

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

0

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

0

app/controllers/issues_controller.rb +12 -7

               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)
+                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

0

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)

0

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?

0

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?

0

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

0

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

0

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)

0

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

0

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

0

app/controllers/reports_controller.rb +1 -1

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

0

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? }

0

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|

0

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

0

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|

0

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

0

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

0

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

0

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

0

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?

0

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

0

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

0

app/helpers/application_helper.rb +6 -20

                 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*)?}, '-')
-                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

0

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')

0

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

0

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')

0

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

0

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},

0

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

0

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

0

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

0

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

0

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

0

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

0

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'

0

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)

0

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

0

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

0

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

0

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

0

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'

0

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

0

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

0

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

0

app/models/group_anonymous.rb 0 -4

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

0

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

0

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

0

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'").

0

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'

0

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}))"

0

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]

0

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
                   []

0

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)
               }

0

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'

0

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|

0

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

0

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?

0

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'

0

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

0

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)

0

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

0

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

0

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

0

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

0

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

0

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?

0

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

0

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,

0

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

0

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

0

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)

0

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

0

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

0

app/models/user.rb +23 -6

                                       :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?

0

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

0

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)

0

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'

0

app/models/wiki_content.rb +6 -5

               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}.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 #{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

0

app/models/wiki_page.rb +5 -6

                             :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
-                  if new_record?
-                    # Rails automatically saves associated content
                   ret = save
-                  else
+                  if content.text_changed?
-                    ret = save && (content.text_changed? ? content.save : true)
+                    self.content = content
+                    ret = ret && content.changed?
                   end
                   raise ActiveRecord::Rollback unless ret
                 end

0

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

0

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|

0

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|

0

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>

0

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? %>

0

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? %>

0

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>

0

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? %>

0

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 %>

0

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>

0

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"

0

config/boot.rb 0 -2

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

0

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).

0

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!

0

config/environments/development.rb +7 -5

+            Rails.application.configure do
               # Settings specified here will take precedence over those in config/application.rb
-            RedmineApp::Application.configure do
               # 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
-              # 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
-              # 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

0

config/environments/production.rb +12 -20

@@ -1,33 +1,25
		1	Rails.application.configure do
1	# Settings specified here will take precedence over those in config/application.rb	2	# Settings specified here will take precedence over those in config/application.rb
2	RedmineApp::Application.configure do	3
3	# The production environment is meant for finished, "live" apps.	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

0

config/environments/test.rb +9 -6

+            Rails.application.configure do
               # Settings specified here will take precedence over those in config/application.rb
-            RedmineApp::Application.configure do
               # 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'

0

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'))

0

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'))

0

config/initializers/10-patches.rb +3 -36

@@ -54,47 +54,13 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
		63	class Base
98	private	64	private
99	def add_options_with_non_empty_blank_option(option_tags, options, value = nil)	65	def add_options_with_non_empty_blank_option(option_tags, options, value = nil)
100	if options[:include_blank] == true	66	if options[:include_blank] == true
@@ -105,6 +71,7 module ActionView
105	end	71	end
106	alias_method_chain :add_options, :non_empty_blank_option	72	alias_method_chain :add_options, :non_empty_blank_option
107	end	73	end
		74	end
108		75
109	module FormTagHelper	76	module FormTagHelper
110	def select_tag_with_non_empty_blank_option(name, option_tags = nil, options = {})	77	def select_tag_with_non_empty_blank_option(name, option_tags = nil, options = {})

0

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

0

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: 整数

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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").

0

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)}

0

lib/redmine.rb 0 -5

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

0

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

0

lib/redmine/codeset_util.rb +4 -93

@@ -1,51 +1,25
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)
11	str.force_encoding('UTF-8')	7	str.force_encoding('UTF-8')
12	if ! str.valid_encoding?	8	if ! str.valid_encoding?
13	str = str.encode("US-ASCII", :invalid => :replace,	9	str = str.encode("US-ASCII", :invalid => :replace,
14	:undef => :replace, :replace => '?').encode("UTF-8")	10	:undef => :replace, :replace => '?').encode("UTF-8")
15	end	11	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
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)
49	if enc.upcase != "UTF-8"	23	if enc.upcase != "UTF-8"
50	str.force_encoding(enc)	24	str.force_encoding(enc)
51	str = str.encode("UTF-8", :invalid => :replace,	25	str = str.encode("UTF-8", :invalid => :replace,
@@ -57,52 +31,22 module Redmine
57	:undef => :replace, :replace => '?').encode("UTF-8")	31	:undef => :replace, :replace => '?').encode("UTF-8")
58	end	32	end
59	end	33	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
68	ic = Iconv.new('UTF-8', enc)
69	txtar = ""
70	begin
71	txtar += ic.iconv(str)
72	rescue Iconv::IllegalSequence
73	txtar += $!.success
74	str = '?' + $!.failed[1,$!.failed.length]
75	retry
76	rescue
77	txtar += $!.success
78	end
79	str = txtar
80	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)
96	str.force_encoding('ASCII-8BIT')	44	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)
101	str.force_encoding('UTF-8')	47	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)
106	begin	50	begin
107	str.force_encoding(encoding)	51	str.force_encoding(encoding)
108	utf8 = str.encode('UTF-8')	52	utf8 = str.encode('UTF-8')
@@ -110,24 +54,12 module Redmine
110	rescue	54	rescue
111	# do nothing here and try the next encoding	55	# do nothing here and try the next encoding
112	end	56	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
120	end
121	str = self.replace_invalid_utf8(str)
122	if str.respond_to?(:force_encoding)
123	str.force_encoding('UTF-8')
124	end	57	end
125	str	58	self.replace_invalid_utf8(str).force_encoding('UTF-8')
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)
131	str.force_encoding('UTF-8')	63	str.force_encoding('UTF-8')
132	if encoding.upcase != 'UTF-8'	64	if encoding.upcase != 'UTF-8'
133	str = str.encode(encoding, :invalid => :replace,	65	str = str.encode(encoding, :invalid => :replace,
@@ -135,27 +67,6 module Redmine
135	else	67	else
136	str = self.replace_invalid_utf8(str)	68	str = self.replace_invalid_utf8(str)
137	end	69	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
146	ic = Iconv.new(encoding, 'UTF-8')
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
159	end	70	end
160	end	71	end
161	end	72	end

0

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

0

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

0

lib/redmine/export/pdf.rb 0 -2

                     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')
-                      end
                       txt
                     end

0

lib/redmine/field_format.rb +1 -6

                     @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

0

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

0

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)

0

lib/redmine/scm/adapters/abstract_adapter.rb +1 -14

             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)
                       begin
                         str.encode(to)
                         logger.error("failed to convert from #{from} to #{to}. #{err}")
                         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
                     def parse_xml(xml)

0

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

0

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

0

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

0

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)

0

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)

0

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|

0

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

0

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']

0

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)

0

lib/tasks/migrate_from_mantis.rake 0 -6

             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'
-                    @ic ||= Iconv.new('UTF-8', @charset)
-                    @ic.iconv text
-                  else
                   text.to_s.force_encoding(@charset).encode('UTF-8')
                 end
               end
-              end
               puts
               if Redmine::DefaultData::Loader.no_data?

0

lib/tasks/migrate_from_trac.rake +1 -7

             # 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'
-                      @ic ||= Iconv.new('UTF-8', @charset)
-                      @ic.iconv text
-                    else
                     text.to_s.force_encoding(@charset).encode('UTF-8')
                   end
                 end
-                end
                 puts
                 if Redmine::DefaultData::Loader.no_data?

0

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

0

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'

0

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

0

test/functional/activities_controller_test.rb +2 0

               end
               def test_index_atom_feed_with_one_item_type
+                with_settings :default_language => 'en' do
                   get :index, :format => 'atom', :show_issues => '1'
                   assert_response :success
                   assert_template 'common/feed'
                   assert_select 'title', :text => /Issues/
                 end
+              end
               def test_index_should_show_private_notes_with_permission_only
                 journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes with searchkeyword', :private_notes => true)

0

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

0

test/functional/calendars_controller_test.rb +4 -3

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

0

test/functional/context_menus_controller_test.rb +2 0

               end
               def test_context_menu_one_issue_by_anonymous
+                with_settings :default_language => 'en' do
                   get :issues, :ids => [1]
                   assert_response :success
                   assert_template 'context_menus/issues'
                                           :attributes => { :href => '#',
                                                            :class => 'icon-del disabled' }
                 end
+              end
               def test_context_menu_multiple_issues_of_same_project
                 @request.session[:user_id] = 2

0

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

0

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

0

test/functional/issues_controller_test.rb +9 -34

               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
-                    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
+                with_settings :attachment_max_size => 0 do
                   put :update,
                        :id => 1,
                        :issue => {:notes => ''},
                   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
                 issue = Issue.find(1)
                 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'

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'})

0

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

0

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

0

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',

0

test/functional/repositories_bazaar_controller_test.rb +2 -8

               REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
               REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
               PRJ_ID = 3
-              CHAR_1_UTF8_HEX   = "\xc3\x9c"
+              CHAR_1_UTF8_HEX   = "\xc3\x9c".dup.force_encoding('UTF-8')
               def setup
                 User.current = nil
                                 :url          => REPOSITORY_PATH_TRUNK,
                                 :log_encoding => 'UTF-8')
                 assert @repository
-                @char_1_utf8 = CHAR_1_UTF8_HEX.dup
-                if @char_1_utf8.respond_to?(:force_encoding)
-                  @char_1_utf8.force_encoding('UTF-8')
-                end
               end
               if File.directory?(REPOSITORY_PATH)
                   end
                 end
-                if REPOSITORY_PATH.respond_to?(:force_encoding)
                 def test_annotate_author_non_ascii
                   log_encoding = nil
                   if Encoding.locale_charmap == "UTF-8" ||
                     assert_select "th.line-num", :text => '1' do
                       assert_select "+ td.revision" do
                         assert_select "a", :text => '2'
-                          assert_select "+ td.author", :text => "test #{@char_1_utf8}" do
+                        assert_select "+ td.author", :text => "test #{CHAR_1_UTF8_HEX}" do
                           assert_select "+ td",
                                         :text => "author non ASCII test"
                         end
                     end
                   end
                 end
-                end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin

0

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]

0

test/functional/repositories_git_controller_test.rb +14 -19

               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
+                  with_settings :default_language => 'en' do
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['images', 'edit.png'])[:param]
                     assert_response 500
                     assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /cannot be annotated/
                   end
+                end
                 def test_annotate_error_when_too_big
                   with_settings :file_max_size_displayed => 1 do
                     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

0

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)

0

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][]',

0

test/functional/search_controller_test.rb +2 0

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

0

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)

0

test/functional/timelog_controller_test.rb +4 -2

               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'
                   assert_response :success
                   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'
                   assert_response :success
                   assert_equal 'text/csv; header=present', response.content_type
                 end
               end
+            end

0

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

0

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

0

test/functional/wiki_controller_test.rb +4 0

               end
               def test_show_old_version
+                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
+                with_settings :default_language => 'en' do
                   get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '1'
+                end
                 assert_response :success
                 assert_template 'show'

0

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

0

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

0

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,

0

test/integration/api_test/authentication_test.rb +1 -4

               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)
-                  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

0

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

0

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

               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
                     post '/projects.xml',
                       {:project => {:name => 'API test', :identifier => 'api-test'}},
                       credentials('admin')
                   end
+                end
                 project = Project.order('id DESC').first
                 assert_equal 'API test', project.name

0

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,

0

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,

0

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,

0

test/integration/issues_test.rb +7 -7

             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'
                   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'
                   assert_tag :a, :content => '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!

0

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,

0

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 %>

0

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,

0

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

0

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

0

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

0

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(

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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(

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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(

0

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" },

0

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(

0

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" },

0

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" },

0

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" },

0

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" },

0

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]

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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" },

0

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(

0

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" },

0

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 => "/" },

0

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

0

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(

0

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" },

0

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

0

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

0

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

0

test/unit/changeset_test.rb +7 -22

               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
                 s1.force_encoding('ASCII-8BIT')
                 s2.force_encoding('ASCII-8BIT')
                 s3.force_encoding('ISO-8859-1')
                 s4.force_encoding('UTF-8')
                 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
               end
-              end
               def test_comments_empty
                 proj = Project.find(3)
                 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.committer.encoding.to_s
               end
-              end
               def test_comments_should_accept_more_than_64k
                 c = Changeset.new(:repository   => Repository.first,

0

test/unit/custom_field_test.rb 0 -2

                 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
                 field = CustomField.find(11)
                 assert_kind_of Array, field.possible_values
                   assert_equal "UTF-8", value.encoding.name
                 end
               end
-              end
               def test_destroy
                 field = CustomField.find(1)

0

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

0

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

0

test/unit/helpers/application_helper_test.rb +3 -20

               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
                 to_test = {
                   "http://foo.bar/#{@russian_test}" =>
                 }
                 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 = {
                 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
                 to_test = {
                   %|This is a "link":http://foo.bar/#{@russian_test}| =>
                 }
                 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
                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
                 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?

0

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

0

test/unit/initializers/patches_test.rb 0 -4

               end
               # https://github.com/rails/rails/pull/14198/files
-              if RUBY_VERSION >= "1.9"
               def test_indifferent_select
                 hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { |_ ,v| v == 1 }
                 assert_equal({ 'a' => 1 }, hash)
                 assert_equal({ 'a' => 1 }, indifferent_strings)
                 assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
               end
-              end
               def test_indifferent_reject
                 hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).reject { |_, v| v != 1 }
                 assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
               end
-              if RUBY_VERSION >= "1.9"
               def test_select
                 assert_equal @keys, @ordered_hash.select { true }.map(&:first)
                 new_ordered_hash = @ordered_hash.select { true }
                                       Hash : ActiveSupport::OrderedHash),
                                     new_ordered_hash
               end
-              end
               def test_reject
                 copy = @ordered_hash.dup

0

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

0

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

0

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

0

test/unit/issue_test.rb +24 -15

               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
+                with_settings :date_format => '%m/%d/%Y' do
                   child = Issue.new(:parent_issue_id => issue2.id, :start_date => '2012-10-16',
                     :project_id => 1, :tracker_id => 1, :status_id => 1, :subject => 'Child', :author_id => 1)
                   assert !child.valid?
                   child.start_date = '2012-10-18'
                   assert child.save
                 end
+              end
               def test_setting_parent_to_a_dependent_issue_should_not_validate
                 set_language_if_valid 'en'

0

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?}

0

test/unit/lib/redmine/codeset_util_test.rb +13 -40

               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", 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_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_equal "UTF-8", str.encoding.to_s
-                  end
                   assert_equal "test??test??", str
                 end
               end

0

test/unit/lib/redmine/export/pdf_test.rb +9 -33

               end
               def test_rdm_pdf_iconv_cannot_convert_ja_cp932
-                encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
                 utf8_txt_1  = "\xe7\x8b\x80\xe6\x85\x8b"
                 utf8_txt_2  = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
                 utf8_txt_3  = "\xe7\x8b\x80\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
-                if utf8_txt_1.respond_to?(:force_encoding)
+                ["CP932", "SJIS"].each do |encoding|
                   txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
                   txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
                   txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
                   assert_equal "ASCII-8BIT", txt_1.encoding.to_s
                   assert_equal "ASCII-8BIT", txt_2.encoding.to_s
                   assert_equal "ASCII-8BIT", txt_3.encoding.to_s
-                elsif RUBY_PLATFORM == 'java'
-                  assert_equal "??",
-                               Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
-                  assert_equal "???",
-                               Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
-                  assert_equal "????",
-                               Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
-                else
-                  assert_equal "???\x91\xd4",
-                               Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
-                  assert_equal "???\x91\xd4???",
-                               Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
-                  assert_equal "??????\x91\xd4???",
-                               Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
                 end
               end
               def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_en
-                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)
                 txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, 'UTF-8')
                 txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, 'UTF-8')
-                if txt_1.respond_to?(:force_encoding)
                 assert_equal "ASCII-8BIT", txt_1.encoding.to_s
                 assert_equal "ASCII-8BIT", txt_2.encoding.to_s
-                end
                 assert_equal "Texte encod? en ISO-8859-1", txt_1
                 assert_equal "?a?b?c?d?e test", txt_2
               end
               def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja
-                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)
                 encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
                 txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, encoding)
                 txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, encoding)
-                if txt_1.respond_to?(:force_encoding)
                 assert_equal "ASCII-8BIT", txt_1.encoding.to_s
                 assert_equal "ASCII-8BIT", txt_2.encoding.to_s
-                end
                 assert_equal "Texte encod? en ISO-8859-1", txt_1
                 assert_equal "?a?b?c?d?e test", txt_2
               end
               def test_attach
+                ["CP932", "SJIS"].each do |encoding|
                   set_fixtures_attachments_directory
-                str2 = "\x83e\x83X\x83g"
+                  str2 = "\x83e\x83X\x83g".force_encoding("ASCII-8BIT")
-                str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
-                encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
                   a1 = Attachment.find(17)
                   a2 = Attachment.find(19)
                   User.current = User.find(1)
                   assert a1.readable?
                   assert a1.visible?
                   aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
                   assert_not_nil aa1
                   assert_equal 17, aa1.id
                   aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
                   assert_not_nil aa2
                   assert_equal 19, aa2.id
                   assert (! a1.visible?)
                   assert a2.readable?
                   assert (! a2.visible?)
                   aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
                   assert_equal nil, aa1
                   aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
                   set_tmp_attachments_directory
                 end
               end
+            end

0

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

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

0

test/unit/lib/redmine/i18n_test.rb +17 -25

               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)
                 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)
                 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'
-                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)
                   User.current.language = nil
                   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|
                     set_language_if_valid lang
                     assert_nothing_raised "#{lang} failure" do
                     assert_equal 13, l('date.month_names').size
                   end
                 end
+              end
               def test_time_for_each_zone
                 ActiveSupport::TimeZone.all.each do |zone|
               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('%H %M'), format_time(now.utc, false)
                 end
+              end
               def test_number_to_human_size_for_each_language
                 valid_languages.each do |lang|
                 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

0

test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb 0 -7

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
-            begin
-              require 'mocha/setup'
             class BazaarAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
                 def test_fake; assert true end
               end
             end
-            rescue LoadError
-              class BazaarMochaFake < ActiveSupport::TestCase
-                def test_fake; assert(false, "Requires mocha to run those tests")  end
-              end
-            end

0

test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb 0 -9

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
-            begin
-              require 'mocha/setup'
             class CvsAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
                 def test_fake; assert true end
               end
             end
-            rescue LoadError
-              class CvsMochaFake < ActiveSupport::TestCase
-                def test_fake; assert(false, "Requires mocha to run those tests")  end
-              end
-            end

0

test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb 0 -9

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
-            begin
-              require 'mocha/setup'
             class DarcsAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s
                 def test_fake; assert true end
               end
             end
-            rescue LoadError
-              class DarcsMochaFake < ActiveSupport::TestCase
-                def test_fake; assert(false, "Requires mocha to run those tests")  end
-              end
-            end

0

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +2 -14

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
-            begin
-              require 'mocha/setup'
             class GitAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
                                 'ISO-8859-1'
                              )
                   assert @adapter
-                    @char_1 = CHAR_1_HEX.dup
+                  @char_1 = CHAR_1_HEX.dup.force_encoding('UTF-8')
-                    @str_felix_hex  = FELIX_HEX.dup
+                  @str_felix_hex  = FELIX_HEX.dup.force_encoding('ASCII-8BIT')
-                    if @char_1.respond_to?(:force_encoding)
-                      @char_1.force_encoding('UTF-8')
-                      @str_felix_hex.force_encoding('ASCII-8BIT')
-                    end
                 end
                 def test_scm_version
                 def test_fake; assert true end
               end
             end
-            rescue LoadError
-              class GitMochaFake < ActiveSupport::TestCase
-                def test_fake; assert(false, "Requires mocha to run those tests")  end
-              end
-            end

0

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +5 -18

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
-            begin
-              require 'mocha/setup'
             class MercurialAdapterTest < ActiveSupport::TestCase
               HELPERS_DIR        = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR
               TEMPLATE_NAME      = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME
               TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION
-                REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
+              REPOSITORY_PATH = repository_path('mercurial')
               CHAR_1_HEX = "\xc3\x9c"
               if File.directory?(REPOSITORY_PATH)
                                         nil,
                                        'ISO-8859-1')
                   @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 @tag_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
                 def test_hgversion
                 def test_fake; assert true end
               end
             end
-            rescue LoadError
-              class MercurialMochaFake < ActiveSupport::TestCase
-                def test_fake; assert(false, "Requires mocha to run those tests")  end
-              end
-            end

0

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

             require File.expand_path('../../../../../../test_helper', __FILE__)
-            begin
-              require 'mocha/setup'
             class SubversionAdapterTest < ActiveSupport::TestCase
               if repository_configured?('subversion')
                 def test_fake; assert true end
               end
             end
-            rescue LoadError
-              class SubversionMochaFake < ActiveSupport::TestCase
-                def test_fake; assert(false, "Requires mocha to run those tests")  end
-              end
-            end

0

test/unit/lib/redmine/unified_diff_test.rb +12 -24

               def test_utf8_ja
                 ja = "  text_tip_issue_end_day: "
-                ja += "\xe3\x81\x93\xe3\x81\xae\xe6\x97\xa5\xe3\x81\xab\xe7\xb5\x82\xe4\xba\x86\xe3\x81\x99\xe3\x82\x8b<span>\xe3\x82\xbf\xe3\x82\xb9\xe3\x82\xaf</span>"
+                ja += "\xe3\x81\x93\xe3\x81\xae\xe6\x97\xa5\xe3\x81\xab\xe7\xb5\x82\xe4\xba\x86\xe3\x81\x99\xe3\x82\x8b<span>\xe3\x82\xbf\xe3\x82\xb9\xe3\x82\xaf</span>".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ja.diff'), :type => 'inline')
                   assert_equal 1, diff.size
               end
               def test_utf8_ru
-                ru = "        other: &quot;\xd0\xbe\xd0\xba\xd0\xbe\xd0\xbb\xd0\xbe %{count} \xd1\x87\xd0\xb0\xd1\x81<span>\xd0\xb0</span>&quot;"
+                ru = "        other: &quot;\xd0\xbe\xd0\xba\xd0\xbe\xd0\xbb\xd0\xbe %{count} \xd1\x87\xd0\xb0\xd1\x81<span>\xd0\xb0</span>&quot;".force_encoding('UTF-8')
-                ru.force_encoding('UTF-8') if ru.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ru.diff'), :type => 'inline')
                   assert_equal 1, diff.size
               end
               def test_offset_range_japanese_1
-                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span></span>"
+                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span></span>".force_encoding('UTF-8')
-                ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
+                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x9e</span>".force_encoding('UTF-8')
-                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x9e</span>"
-                ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(
                            read_diff_fixture('issue-13644-1.diff'), :type => 'sbs')
               end
               def test_offset_range_japanese_2
-                ja1 = "<span></span>\xe6\x97\xa5\xe6\x9c\xac"
+                ja1 = "<span></span>\xe6\x97\xa5\xe6\x9c\xac".force_encoding('UTF-8')
-                ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
+                ja2 = "<span>\xe3\x81\xab\xe3\x81\xa3\xe3\x81\xbd\xe3\x82\x93</span>\xe6\x97\xa5\xe6\x9c\xac".force_encoding('UTF-8')
-                ja2 = "<span>\xe3\x81\xab\xe3\x81\xa3\xe3\x81\xbd\xe3\x82\x93</span>\xe6\x97\xa5\xe6\x9c\xac"
-                ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(
                            read_diff_fixture('issue-13644-2.diff'), :type => 'sbs')
               def test_offset_range_japanese_3
                 # UTF-8 The 1st byte differs.
-                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>"
+                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>".force_encoding('UTF-8')
-                ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
+                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe5\xa8\x98</span>".force_encoding('UTF-8')
-                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe5\xa8\x98</span>"
-                ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(
                            read_diff_fixture('issue-13644-3.diff'), :type => 'sbs')
               def test_offset_range_japanese_4
                 # UTF-8 The 2nd byte differs.
-                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>"
+                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>".force_encoding('UTF-8')
-                ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
+                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>".force_encoding('UTF-8')
-                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>"
-                ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(
                            read_diff_fixture('issue-13644-4.diff'), :type => 'sbs')
               def test_offset_range_japanese_5
                 # UTF-8 The 2nd byte differs.
-                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>ok"
+                ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>ok".force_encoding('UTF-8')
-                ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
+                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>ok".force_encoding('UTF-8')
-                ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>ok"
-                ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
                 with_settings :repositories_encodings => '' do
                   diff = Redmine::UnifiedDiff.new(
                            read_diff_fixture('issue-13644-5.diff'), :type => 'sbs')

0

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

               def test_macro_collapse
                 text = "{{collapse\n*Collapsed* block of text\n}}"
+                with_locale 'en' do
                   result = textilizable(text)
                   assert_select_in result, 'div.collapsed-text'
                   assert_select_in result, 'a.collapsible.collapsed', :text => 'Show'
                   assert_select_in result, 'a.collapsible', :text => 'Hide'
                 end
+              end
               def test_macro_collapse_with_one_arg
                 text = "{{collapse(Example)\n*Collapsed* block of text\n}}"

0

test/unit/mail_handler_test.rb +15 -34

               end
               def test_add_issue_with_japanese_keywords
-                ja_dev = "\xe9\x96\x8b\xe7\x99\xba"
+                ja_dev = "\xe9\x96\x8b\xe7\x99\xba".force_encoding('UTF-8')
-                ja_dev.force_encoding('UTF-8') if ja_dev.respond_to?(:force_encoding)
                 tracker = Tracker.create!(:name => ja_dev)
                 Project.find(1).trackers << tracker
                 issue = submit_email(
                         )
                 assert_kind_of Issue, issue
                 assert_equal 1, issue.attachments.size
-                ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88.txt"
+                ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88.txt".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 attachment = issue.attachments.first
                 assert_equal ja, attachment.filename
                 assert_equal 5, attachment.filesize
                         )
                 assert_kind_of Issue, issue
                 assert_equal 1, issue.attachments.size
-                ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88.txt"
+                ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88.txt".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 attachment = issue.attachments.first
                 assert_equal ja, attachment.filename
                 assert_equal 5, attachment.filesize
                         )
                 assert_kind_of Issue, issue
                 assert_equal 1, issue.attachments.size
-                u = ""
+                u = "".force_encoding('UTF-8')
-                u.force_encoding('UTF-8') if u.respond_to?(:force_encoding)
+                u1 = "\xc3\x84\xc3\xa4\xc3\x96\xc3\xb6\xc3\x9c\xc3\xbc".force_encoding('UTF-8')
-                u1 = "\xc3\x84\xc3\xa4\xc3\x96\xc3\xb6\xc3\x9c\xc3\xbc"
-                u1.force_encoding('UTF-8') if u1.respond_to?(:force_encoding)
 .times { u << u1 }
                 attachment = issue.attachments.first
                 assert_equal "#{u}.png", attachment.filename
                         )
                 assert_kind_of Issue, issue
                 assert_equal 1, issue.attachments.size
-                u = ""
+                u = "".force_encoding('UTF-8')
-                u.force_encoding('UTF-8') if u.respond_to?(:force_encoding)
+                u1 = "\xc3\x84\xc3\xa4\xc3\x96\xc3\xb6\xc3\x9c\xc3\xbc".force_encoding('UTF-8')
-                u1 = "\xc3\x84\xc3\xa4\xc3\x96\xc3\xb6\xc3\x9c\xc3\xbc"
-                u1.force_encoding('UTF-8') if u1.respond_to?(:force_encoding)
 .times { u << u1 }
                 attachment = issue.attachments.first
                 assert_equal "#{u}.txt", attachment.filename
                           'subject_as_iso-8859-1.eml',
                           :issue => {:project => 'ecookbook'}
                         )
-                str = "Testmail from Webmail: \xc3\xa4 \xc3\xb6 \xc3\xbc..."
+                str = "Testmail from Webmail: \xc3\xa4 \xc3\xb6 \xc3\xbc...".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 assert_kind_of Issue, issue
                 assert_equal str, issue.subject
               end
                           :issue => {:project => 'ecookbook'}
                         )
                 assert_kind_of Issue, issue
-                str = "Freundliche Gr\xc3\xbcsse"
+                str = "Freundliche Gr\xc3\xbcsse".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 assert_equal str, issue.description
               end
                           :issue => {:project => 'ecookbook'}
                         )
                 assert_kind_of Issue, issue
-                str = "Na \xc5\xa1triku se su\xc5\xa1i \xc5\xa1osi\xc4\x87."
+                str = "Na \xc5\xa1triku se su\xc5\xa1i \xc5\xa1osi\xc4\x87.".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 assert issue.description.include?(str)
               end
                           :issue => {:project => 'ecookbook'}
                         )
                 assert_kind_of Issue, issue
-                ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
+                ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 assert_equal ja, issue.subject
               end
               def test_add_issue_with_korean_body
                 # Make sure mail bodies with a charset unknown to Ruby
                 # but known to the Mail gem 2.5.4 are handled correctly
-                kr = "\xEA\xB3\xA0\xEB\xA7\x99\xEC\x8A\xB5\xEB\x8B\x88\xEB\x8B\xA4."
+                kr = "\xEA\xB3\xA0\xEB\xA7\x99\xEC\x8A\xB5\xEB\x8B\x88\xEB\x8B\xA4.".force_encoding('UTF-8')
-                if !kr.respond_to?(:force_encoding)
-                  puts "\nOn Ruby 1.8, skip Korean encoding mail body test"
-                else
-                  kr.force_encoding('UTF-8')
                 issue = submit_email(
                         'body_ks_c_5601-1987.eml',
                         :issue => {:project => 'ecookbook'}
                 assert_kind_of Issue, issue
                 assert_equal kr, issue.description
               end
-              end
               def test_add_issue_with_no_subject_header
                 issue = submit_email(
                           :issue => {:project => 'ecookbook'}
                         )
                 assert_kind_of Issue, issue
-                ja = "Re: \xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
+                ja = "Re: \xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88".force_encoding('UTF-8')
-                ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
                 assert_equal ja, issue.subject
               end
                 end
                 user = User.order('id DESC').first
                 assert_equal "foo@example.org", user.mail
-                str1 = "\xc3\x84\xc3\xa4"
+                str1 = "\xc3\x84\xc3\xa4".force_encoding('UTF-8')
-                str2 = "\xc3\x96\xc3\xb6"
+                str2 = "\xc3\x96\xc3\xb6".force_encoding('UTF-8')
-                str1.force_encoding('UTF-8') if str1.respond_to?(:force_encoding)
-                str2.force_encoding('UTF-8') if str2.respond_to?(:force_encoding)
                 assert_equal str1, user.firstname
                 assert_equal str2, user.lastname
               end

0

test/unit/mailer_test.rb +1 0

                 Setting.host_name = 'mydomain.foo'
                 Setting.protocol = 'http'
                 Setting.plain_text_mail = '0'
+                User.current = nil
               end
               def test_generated_links_in_emails

0

test/unit/member_test.rb +3 -4

                 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [])
                 assert !member.save
                 assert_include I18n.translate('activerecord.errors.messages.empty'), member.errors[:role]
-                str = "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)"
+                assert_equal "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8'),
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
+                	[member.errors.full_messages].flatten.join
-                assert_equal str, [member.errors.full_messages].flatten.join
               end
               def test_validate_member_role
                 end
                 assert m.destroyed?
               ensure
-                Member._destroy_callbacks.reject! {|c| c.filter==:destroy_test_callback}
+                Member._destroy_callbacks.delete(:destroy_test_callback)
               end
               def test_sort_without_roles

0

test/unit/principal_test.rb +1 -1

               fixtures :users, :projects, :members, :member_roles
               def test_active_scope_should_return_groups_and_active_users
-                result = Principal.active.all
+                result = Principal.active.to_a
                 assert_include Group.first, result
                 assert_not_nil result.detect {|p| p.is_a?(User)}
                 assert_nil result.detect {|p| p.is_a?(User) && !p.active?}

0

test/unit/project_copy_test.rb 0 -11

@@ -222,17 +222,6 class ProjectCopyTest < ActiveSupport::TestCase
222	assert_equal @source_project.queries.map(&:user_id).sort, @project.queries.map(&:user_id).sort	222	assert_equal @source_project.queries.map(&:user_id).sort, @project.queries.map(&:user_id).sort
223	end	223	end
224		224
225	def test_copy_should_copy_queries_roles_visibility
226	source = Project.generate!
227	target = Project.new(:name => 'Copy Test', :identifier => 'copy-test')
228	IssueQuery.generate!(:project => source, :visibility => Query::VISIBILITY_ROLES, :roles => Role.where(:id => [1, 3]).to_a)
229
230	assert target.copy(source)
231	assert_equal 1, target.queries.size
232	query = target.queries.first
233	assert_equal [1, 3], query.role_ids.sort
234	end
235
236	test "#copy should copy versions" do	225	test "#copy should copy versions" do
237	@source_project.versions << Version.generate!	226	@source_project.versions << Version.generate!
238	@source_project.versions << Version.generate!	227	@source_project.versions << Version.generate!

0

test/unit/project_nested_set_test.rb +5 0

                 assert_valid_nested_set
               end
+              def test_rebuild_without_projects_should_not_fail
+                Project.delete_all
+                assert Project.rebuild_tree!
+              end
               def test_moving_a_child_to_a_different_parent_should_keep_valid_tree
                 assert_no_difference 'Project.count' do
                   Project.find_by_name('B1').set_parent!(Project.find_by_name('A2'))

0

test/unit/project_test.rb +8 -2

                 parent.reload
                 assert_equal 4, parent.children.size
-                assert_equal parent.children.all.sort_by(&:name), parent.children.all
+                assert_equal parent.children.sort_by(&:name), parent.children.to_a
               end
               def test_set_parent_should_update_issue_fixed_version_associations_when_a_fixed_version_is_moved_out_of_the_hierarchy
               def test_activities_should_use_the_system_activities
                 project = Project.find(1)
-                assert_equal project.activities, TimeEntryActivity.where(:active => true).all
+                assert_equal project.activities.to_a, TimeEntryActivity.where(:active => true).to_a
                 assert_kind_of ActiveRecord::Relation, project.activities
               end
                 assert !project.notified_users.include?(only_assigned_user), "should not include users with the 'only_assigned' notification option"
                 assert !project.notified_users.include?(only_owned_user), "should not include users with the 'only_owner' notification option"
               end
+              def test_override_roles_without_builtin_group_memberships
+                project = Project.generate!
+                assert_equal [Role.anonymous], project.override_roles(Role.anonymous)
+                assert_equal [Role.non_member], project.override_roles(Role.non_member)
+              end
             end

0

test/unit/query_test.rb +3 -5

               end
               def find_issues_with_query(query)
-                Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
+                Issue.joins(:status, :tracker, :project, :priority).where(
                      query.statement
-                   ).all
+                   ).references([:assigned_to, :status, :tracker, :project, :priority]).to_a
               end
               def assert_find_issues_with_query_is_successful(query)
               def test_label_for_fr
                 set_language_if_valid 'fr'
                 q = IssueQuery.new
-                s = "Assign\xc3\xa9 \xc3\xa0"
+                assert_equal "Assign\xc3\xa9 \xc3\xa0".force_encoding('UTF-8'), q.label_for('assigned_to_id')
-                s.force_encoding('UTF-8') if s.respond_to?(:force_encoding)
-                assert_equal s, q.label_for('assigned_to_id')
               end
               def test_editable_by

0

test/unit/repository_bazaar_test.rb +32 -42

               include Redmine::I18n
-              REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
+              REPOSITORY_PATH = repository_path('bazaar')
               REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
               NUM_REV = 4
               # you cannot run Bazaar non ASCII path tests.
               #
               RUN_LATIN1_OUTPUT_TEST = (RUBY_PLATFORM != 'java' &&
-                                         REPOSITORY_PATH.respond_to?(:force_encoding) &&
                                          Encoding.locale_charmap == "ISO-8859-1")
-              CHAR_1_UTF8_HEX   = "\xc3\x9c"
+              CHAR_1_UTF8_HEX   = "\xc3\x9c".force_encoding('UTF-8')
-              CHAR_1_LATIN1_HEX = "\xdc"
+              CHAR_1_LATIN1_HEX = "\xdc".force_encoding('ASCII-8BIT')
               def setup
                 @project = Project.find(3)
                           :project => @project, :url => REPOSITORY_PATH_TRUNK,
                           :log_encoding => 'UTF-8')
                 assert @repository
-                @char_1_utf8      = CHAR_1_UTF8_HEX.dup
-                @char_1_ascii8bit = CHAR_1_LATIN1_HEX.dup
-                if @char_1_utf8.respond_to?(:force_encoding)
-                  @char_1_utf8.force_encoding('UTF-8')
-                  @char_1_ascii8bit.force_encoding('ASCII-8BIT')
-                end
               end
               def test_blank_path_to_repository_error_message
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
-                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Bazaar.new(
                                       :project      => @project,
                                       :url          => "",
                   def test_cat_latin1_path
                     latin1_repo = create_latin1_repo
                     buf = latin1_repo.cat(
-                             "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-2.txt", 2)
+                             "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-2.txt", 2)
                     assert buf
                     lines = buf.split("\n")
                     assert_equal 2, lines.length
                     assert_equal 'It is written in Python.', lines[1]
                     buf = latin1_repo.cat(
-                             "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt", 2)
+                             "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt", 2)
                     assert buf
                     lines = buf.split("\n")
                     assert_equal 1, lines.length
-                    assert_equal "test-#{@char_1_ascii8bit}.txt", lines[0]
+                    assert_equal "test-#{CHAR_1_LATIN1_HEX}.txt", lines[0]
                   end
                   def test_annotate_latin1_path
                     latin1_repo = create_latin1_repo
                     ann1 = latin1_repo.annotate(
-                               "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-2.txt", 2)
+                               "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-2.txt", 2)
                     assert_equal 2, ann1.lines.size
                     assert_equal '2', ann1.revisions[0].identifier
                     assert_equal 'test00@', ann1.revisions[0].author
                     assert_equal 'It is written in Python.', ann1.lines[1]
                     ann2 = latin1_repo.annotate(
-                               "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt", 2)
+                               "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt", 2)
                     assert_equal 1, ann2.lines.size
                     assert_equal '2', ann2.revisions[0].identifier
                     assert_equal 'test00@', ann2.revisions[0].author
-                    assert_equal "test-#{@char_1_ascii8bit}.txt", ann2.lines[0]
+                    assert_equal "test-#{CHAR_1_LATIN1_HEX}.txt", ann2.lines[0]
                   end
                   def test_diff_latin1_path
                     latin1_repo = create_latin1_repo
                     diff1 = latin1_repo.diff(
-                              "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt", 2, 1)
+                              "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt", 2, 1)
                     assert_equal 7, diff1.size
                     buf =  diff1[5].gsub(/\r\n|\r|\n/, "")
-                    assert_equal "+test-#{@char_1_ascii8bit}.txt", buf
+                    assert_equal "+test-#{CHAR_1_LATIN1_HEX}.txt", buf
                   end
                   def test_entries_latin1_path
                     latin1_repo = create_latin1_repo
-                    entries = latin1_repo.entries("test-#{@char_1_utf8}-dir", 2)
+                    entries = latin1_repo.entries("test-#{CHAR_1_UTF8_HEX}-dir", 2)
                     assert_kind_of Redmine::Scm::Adapters::Entries, entries
                     assert_equal 3, entries.size
                     assert_equal 'file', entries[1].kind
-                    assert_equal "test-#{@char_1_utf8}-1.txt", entries[0].name
+                    assert_equal "test-#{CHAR_1_UTF8_HEX}-1.txt", entries[0].name
-                    assert_equal "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt", entries[0].path
+                    assert_equal "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt", entries[0].path
                   end
                   def test_entry_latin1_path
                     latin1_repo = create_latin1_repo
-                    ["test-#{@char_1_utf8}-dir",
+                    ["test-#{CHAR_1_UTF8_HEX}-dir",
-                      "/test-#{@char_1_utf8}-dir",
+                      "/test-#{CHAR_1_UTF8_HEX}-dir",
-                      "/test-#{@char_1_utf8}-dir/"
+                      "/test-#{CHAR_1_UTF8_HEX}-dir/"
                     ].each do |path|
                       entry = latin1_repo.entry(path, 2)
-                      assert_equal "test-#{@char_1_utf8}-dir", entry.path
+                      assert_equal "test-#{CHAR_1_UTF8_HEX}-dir", entry.path
                       assert_equal "dir", entry.kind
                     end
-                    ["test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt",
+                    ["test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt",
-                      "/test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt"
+                      "/test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt"
                     ].each do |path|
                       entry = latin1_repo.entry(path, 2)
-                      assert_equal "test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt",
+                      assert_equal "test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt",
                                    entry.path
                       assert_equal "file", entry.kind
                     end
                     cs2 = latin1_repo.changesets.find_by_revision('2')
                     assert_not_nil cs2
-                    assert_equal "test-#{@char_1_utf8}", cs2.comments
+                    assert_equal "test-#{CHAR_1_UTF8_HEX}", cs2.comments
                     c2  = cs2.filechanges.sort_by(&:path)
                     assert_equal 4, c2.size
                     assert_equal 'A', c2[0].action
-                    assert_equal "/test-#{@char_1_utf8}-dir/", c2[0].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-dir/", c2[0].path
                     assert_equal 'A', c2[1].action
-                    assert_equal "/test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-1.txt", c2[1].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-1.txt", c2[1].path
                     assert_equal 'A', c2[2].action
-                    assert_equal "/test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-2.txt", c2[2].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-2.txt", c2[2].path
                     assert_equal 'A', c2[3].action
-                    assert_equal "/test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}.txt", c2[3].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}.txt", c2[3].path
                     cs3 = latin1_repo.changesets.find_by_revision('3')
                     assert_not_nil cs3
-                    assert_equal "modify, move and delete #{@char_1_utf8} files", cs3.comments
+                    assert_equal "modify, move and delete #{CHAR_1_UTF8_HEX} files", cs3.comments
                     c3  = cs3.filechanges.sort_by(&:path)
                     assert_equal 3, c3.size
                     assert_equal 'M', c3[0].action
-                    assert_equal "/test-#{@char_1_utf8}-1.txt", c3[0].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-1.txt", c3[0].path
                     assert_equal 'D', c3[1].action
-                    assert_equal "/test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}-2.txt", c3[1].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}-2.txt", c3[1].path
                     assert_equal 'M', c3[2].action
-                    assert_equal "/test-#{@char_1_utf8}-dir/test-#{@char_1_utf8}.txt", c3[2].path
+                    assert_equal "/test-#{CHAR_1_UTF8_HEX}-dir/test-#{CHAR_1_UTF8_HEX}.txt", c3[2].path
                   end
                 else
-                  msg = "Bazaar non ASCII output test cannot run this environment." + "\n"
+                  msg = "Bazaar non ASCII output test cannot run this environment.\n"
-                  if msg.respond_to?(:force_encoding)
                   msg += "Encoding.locale_charmap: " + Encoding.locale_charmap + "\n"
-                  end
                   puts msg
                 end

0

test/unit/repository_cvs_test.rb +3 -5

               include Redmine::I18n
-              REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
+              REPOSITORY_PATH = repository_path('cvs')
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               # CVS module
               MODULE_NAME    = 'test'
               def test_blank_module_error_message_fr
                 set_language_if_valid 'fr'
-                str = "Module doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "Module doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Cvs.new(
                                       :project       => @project,
                                       :identifier    => 'test',
               def test_blank_cvsroot_error_message_fr
                 set_language_if_valid 'fr'
-                str = "CVSROOT doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "CVSROOT doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Cvs.new(
                                       :project       => @project,
                                       :identifier    => 'test',

0

test/unit/repository_darcs_test.rb +1 -2

               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
-                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Darcs.new(
                                       :project      => @project,
                                       :url          => "",

0

test/unit/repository_filesystem_test.rb +1 -2

               def test_blank_root_directory_error_message_fr
                 set_language_if_valid 'fr'
-                str = "R\xc3\xa9pertoire racine doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "R\xc3\xa9pertoire racine doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Filesystem.new(
                                       :project      => @project,
                                       :url          => "",

0

test/unit/repository_git_test.rb +7 -16

               NUM_REV = 28
               NUM_HEAD = 6
-              FELIX_HEX  = "Felix Sch\xC3\xA4fer"
+              FELIX_HEX  = "Felix Sch\xC3\xA4fer".force_encoding('UTF-8')
-              CHAR_1_HEX = "\xc3\x9c"
+              CHAR_1_HEX = "\xc3\x9c".force_encoding('UTF-8')
               ## Git, Mercurial and CVS path encodings are binary.
               ## Subversion supports URL encoding for path.
                                     :path_encoding => 'ISO-8859-1'
                                     )
                 assert @repository
-                @char_1        = CHAR_1_HEX.dup
-                if @char_1.respond_to?(:force_encoding)
-                  @char_1.force_encoding('UTF-8')
-                end
               end
               def test_blank_path_to_repository_error_message
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
-                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Git.new(
                                       :project      => @project,
                                       :url          => "",
                   else
                     # latin-1 encoding path
                     changesets = @repository.latest_changesets(
-                                  "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89')
+                                  "latin-1-dir/test-#{CHAR_1_HEX}-2.txt", '64f1f3e89')
                     assert_equal [
                           '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
                           '4fc55c43bf3d3dc2efb66145365ddc17639ce81e',
                       ], changesets.collect(&:revision)
                     changesets = @repository.latest_changesets(
-                                "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89', 1)
+                                "latin-1-dir/test-#{CHAR_1_HEX}-2.txt", '64f1f3e89', 1)
                     assert_equal [
                           '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
                       ], changesets.collect(&:revision)
                     @project.reload
                     assert_equal NUM_REV, @repository.changesets.count
                     changesets = @repository.latest_changesets(
-                                "latin-1-dir/test-#{@char_1}-subdir", '1ca7f5ed')
+                                "latin-1-dir/test-#{CHAR_1_HEX}-subdir", '1ca7f5ed')
                     assert_equal [
                           '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127',
                       ], changesets.collect(&:revision)
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  str_felix_hex  = FELIX_HEX.dup
-                  if str_felix_hex.respond_to?(:force_encoding)
-                      str_felix_hex.force_encoding('UTF-8')
-                  end
                   c = @repository.changesets.find_by_revision(
                                     'ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
-                  assert_equal "#{str_felix_hex} <felix@fachschaften.org>", c.committer
+                  assert_equal "#{FELIX_HEX} <felix@fachschaften.org>", c.committer
                 end
                 def test_previous

0

test/unit/repository_mercurial_test.rb +8 -17

               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               NUM_REV = 34
-              CHAR_1_HEX = "\xc3\x9c"
+              CHAR_1_HEX = "\xc3\x9c".force_encoding('UTF-8')
+              BRANCH_CHAR_1 = "branch-#{CHAR_1_HEX}-01".force_encoding('UTF-8')
               def setup
                 @project    = Project.find(3)
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
-                @char_1        = CHAR_1_HEX.dup
-                @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
-                @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
-                @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
-                if @char_1.respond_to?(:force_encoding)
-                  @char_1.force_encoding('UTF-8')
-                  @tag_char_1.force_encoding('UTF-8')
-                  @branch_char_0.force_encoding('UTF-8')
-                  @branch_char_1.force_encoding('UTF-8')
-                end
               end
               def test_blank_path_to_repository_error_message
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
-                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Mercurial.new(
                                       :project      => @project,
                                       :url          => "",
                   assert_equal NUM_REV, @repository.changesets.count
                   if @repository.scm.class.client_version_above?([1, 6])
-                    changesets = @repository.latest_changesets('', @branch_char_1)
+                    changesets = @repository.latest_changesets('', BRANCH_CHAR_1)
                     assert_equal %w|27 26|, changesets.collect(&:revision)
                   end
-                  changesets = @repository.latest_changesets("latin-1-dir/test-#{@char_1}-subdir", @branch_char_1)
+                  changesets = @repository.latest_changesets("latin-1-dir/test-#{CHAR_1_HEX}-subdir", BRANCH_CHAR_1)
                   assert_equal %w|27|, changesets.collect(&:revision)
                 end
                   scmid3 = scmid_for_assert(hex3, is_short_scmid)
                   assert_equal 1, c3.size
                   assert_equal 'A', c3[0].action
-                  assert_equal "/latin-1-dir/test-#{@char_1}-1.txt",  c3[0].path
+                  assert_equal "/latin-1-dir/test-#{CHAR_1_HEX}-1.txt",  c3[0].path
-                  assert_equal "/latin-1-dir/test-#{@char_1}.txt",    c3[0].from_path
+                  assert_equal "/latin-1-dir/test-#{CHAR_1_HEX}.txt",    c3[0].from_path
                   assert_equal scmid3, c3[0].from_revision
                 end
                 private :assert_copied_files

0

test/unit/repository_subversion_test.rb +1 -7

                 def test_log_encoding_ignore_setting
                   with_settings :commit_logs_encoding => 'windows-1252' do
-                    s1 = "\xC2\x80"
+                    s2 = "\xc3\x82\xc2\x80".force_encoding('UTF-8')
-                    s2 = "\xc3\x82\xc2\x80"
-                    if s1.respond_to?(:force_encoding)
-                      s1.force_encoding('ISO-8859-1')
-                      s2.force_encoding('UTF-8')
-                      assert_equal s1.encode('UTF-8'), s2
-                    end
                     c = Changeset.new(:repository => @repository,
                                       :comments   => s2,
                                       :revision   => '123',

0

test/unit/repository_test.rb +3 -4

               def test_blank_log_encoding_error_message_fr
                 set_language_if_valid 'fr'
-                str = "Encodage des messages de commit doit \xc3\xaatre renseign\xc3\xa9(e)"
+                str = "Encodage des messages de commit doit \xc3\xaatre renseign\xc3\xa9(e)".force_encoding('UTF-8')
-                str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Bazaar.new(
                                     :project      => Project.find(3),
                                     :url          => "/test"
               def test_destroy_should_delete_parents_associations
                 changeset = Changeset.find(102)
-                changeset.parents = Changeset.where(:id => [100, 101]).all
+                changeset.parents = Changeset.where(:id => [100, 101]).to_a
                 assert_difference 'Changeset.connection.select_all("select * from changeset_parents").count', -2 do
                   Repository.find(10).destroy
                 end
               def test_destroy_should_delete_issues_associations
                 changeset = Changeset.find(102)
-                changeset.issues = Issue.where(:id => [1, 2]).all
+                changeset.issues = Issue.where(:id => [1, 2]).to_a
                 assert_difference 'Changeset.connection.select_all("select * from changesets_issues").count', -2 do
                   Repository.find(10).destroy
                 end

0

test/unit/role_test.rb +4 -4

               fixtures :roles, :workflows, :trackers
               def test_sorted_scope
-                assert_equal Role.all.sort, Role.sorted.all
+                assert_equal Role.all.sort, Role.sorted.to_a
               end
               def test_givable_scope
-                assert_equal Role.all.reject(&:builtin?).sort, Role.givable.all
+                assert_equal Role.all.reject(&:builtin?).sort, Role.givable.to_a
               end
               def test_builtin_scope
-                assert_equal Role.all.select(&:builtin?).sort, Role.builtin(true).all.sort
+                assert_equal Role.all.select(&:builtin?).sort, Role.builtin(true).to_a.sort
-                assert_equal Role.all.reject(&:builtin?).sort, Role.builtin(false).all.sort
+                assert_equal Role.all.reject(&:builtin?).sort, Role.builtin(false).to_a.sort
               end
               def test_copy_from

0

test/unit/tracker_test.rb +1 -1

               fixtures :trackers, :workflows, :issue_statuses, :roles, :issues
               def test_sorted_scope
-                assert_equal Tracker.all.sort, Tracker.sorted.all
+                assert_equal Tracker.all.sort, Tracker.sorted.to_a
               end
               def test_named_scope

0

test/unit/user_test.rb +43 -8

                         :groups_users,
                         :enabled_modules
+              include Redmine::I18n
               def setup
                 @admin = User.find(1)
                 @jsmith = User.find(2)
               end
               def test_sorted_scope_should_sort_user_by_display_name
-                assert_equal User.all.map(&:name).map(&:downcase).sort,
+                # Use .active to ignore anonymous with localized display name
-                             User.sorted.map(&:name).map(&:downcase)
+                assert_equal User.active.map(&:name).map(&:downcase).sort,
+                             User.active.sorted.map(&:name).map(&:downcase)
               end
               def test_generate
               end
               def test_roles_for_project_with_non_member_with_public_project_should_return_non_member
+                set_language_if_valid 'en'
                 roles = User.find(8).roles_for_project(Project.find(1))
                 assert_equal ["Non member"], roles.map(&:name)
               end
-              def test_roles_for_project_with_non_member_with_public_project_should_return_no_roles
+              def test_roles_for_project_with_non_member_with_public_project_and_override_should_return_override_roles
+                project = Project.find(1)
+                Member.create!(:project => project, :principal => Group.non_member, :role_ids => [1, 2])
+                roles = User.find(8).roles_for_project(project)
+                assert_equal ["Developer", "Manager"], roles.map(&:name).sort
+              end
+              def test_roles_for_project_with_non_member_with_private_project_should_return_no_roles
                 Project.find(1).update_attribute :is_public, false
                 roles = User.find(8).roles_for_project(Project.find(1))
                 assert_equal [], roles.map(&:name)
               end
+              def test_roles_for_project_with_non_member_with_private_project_and_override_should_return_no_roles
+                project = Project.find(1)
+                project.update_attribute :is_public, false
+                Member.create!(:project => project, :principal => Group.non_member, :role_ids => [1, 2])
+                roles = User.find(8).roles_for_project(project)
+                assert_equal [], roles.map(&:name).sort
+              end
               def test_roles_for_project_with_anonymous_with_public_project_should_return_anonymous
+                set_language_if_valid 'en'
                 roles = User.anonymous.roles_for_project(Project.find(1))
                 assert_equal ["Anonymous"], roles.map(&:name)
               end
-              def test_roles_for_project_with_anonymous_with_public_project_should_return_no_roles
+              def test_roles_for_project_with_anonymous_with_public_project_and_override_should_return_override_roles
+                project = Project.find(1)
+                Member.create!(:project => project, :principal => Group.anonymous, :role_ids => [1, 2])
+                roles = User.anonymous.roles_for_project(project)
+                assert_equal ["Developer", "Manager"], roles.map(&:name).sort
+              end
+              def test_roles_for_project_with_anonymous_with_private_project_should_return_no_roles
                 Project.find(1).update_attribute :is_public, false
                 roles = User.anonymous.roles_for_project(Project.find(1))
                 assert_equal [], roles.map(&:name)
               end
+              def test_roles_for_project_with_anonymous_with_private_project_and_override_should_return_no_roles
+                project = Project.find(1)
+                project.update_attribute :is_public, false
+                Member.create!(:project => project, :principal => Group.anonymous, :role_ids => [1, 2])
+                roles = User.anonymous.roles_for_project(project)
+                assert_equal [], roles.map(&:name).sort
+              end
               def test_projects_by_role_for_user_with_role
                 user = User.find(2)
                 assert_kind_of Hash, user.projects_by_role
                   end
                   should "return true only if user has permission on all these projects" do
-                    assert_equal true, @admin.allowed_to?(:view_project, Project.all)
+                    assert_equal true, @admin.allowed_to?(:view_project, Project.all.to_a)
-                    assert_equal false, @dlopper.allowed_to?(:view_project, Project.all) #cannot see Project(2)
+                    assert_equal false, @dlopper.allowed_to?(:view_project, Project.all.to_a) #cannot see Project(2)
-                    assert_equal true, @jsmith.allowed_to?(:edit_issues, @jsmith.projects) #Manager or Developer everywhere
+                    assert_equal true, @jsmith.allowed_to?(:edit_issues, @jsmith.projects.to_a) #Manager or Developer everywhere
-                    assert_equal false, @jsmith.allowed_to?(:delete_issue_watchers, @jsmith.projects) #Dev cannot delete_issue_watchers
+                    assert_equal false, @jsmith.allowed_to?(:delete_issue_watchers, @jsmith.projects.to_a) #Dev cannot delete_issue_watchers
                   end
                   should "behave correctly with arrays of 1 project" do

0

test/unit/version_test.rb +1 -1

                 v5 = Version.create!(:project_id => 1, :name => 'v5', :effective_date => '2012-07-02')
                 assert_equal [v5, v3, v1, v2, v4], [v1, v2, v3, v4, v5].sort
-                assert_equal [v5, v3, v1, v2, v4], Version.sorted.all
+                assert_equal [v5, v3, v1, v2, v4], Version.sorted.to_a
               end
               def test_completed_should_be_false_when_due_today

0

test/unit/wiki_test.rb +1 -2

               end
               def test_titleize
-                ja_test = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
+                ja_test = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88".force_encoding('UTF-8')
-                ja_test.force_encoding('UTF-8') if ja_test.respond_to?(:force_encoding)
                 assert_equal 'Page_title_with_CAPITALES', Wiki.titleize('page title with CAPITALES')
                 assert_equal ja_test, Wiki.titleize(ja_test)
               end

0

config/preinitializer.rb removed 0 -20

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

lib/plugins/awesome_nested_set/CHANGELOG removed 0 -57

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

lib/plugins/awesome_nested_set/Gemfile removed 0 -38

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

lib/plugins/awesome_nested_set/Rakefile removed 0 -32

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

	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