jro_apps/redmine Commit - r2773:7b0cb6aba871

0

config/initializers/backtrace_silencers.rb created 644 +7 0

@@ -0,0 +1,7
	1	# Be sure to restart your server when you modify this file.
	2
	3	# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
	4	# Rails.backtrace_cleaner.add_silencer { \|line\| line =~ /my_noisy_library/ }
	5
	6	# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
	7	# Rails.backtrace_cleaner.remove_silencers! No newline at end of file

0

config/initializers/inflections.rb created 644 +10 0

@@ -0,0 +1,10
	1	# Be sure to restart your server when you modify this file.
	2
	3	# Add new inflection rules using the following format
	4	# (all these examples are active by default):
	5	# ActiveSupport::Inflector.inflections do \|inflect\|
	6	# inflect.plural /^(ox)$/i, '\1en'
	7	# inflect.singular /^(ox)en/i, '\1'
	8	# inflect.irregular 'person', 'people'
	9	# inflect.uncountable %w( fish sheep )
	10	# end

0

vendor/plugins/engines/test/app/controllers/app_and_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class AppAndPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from app'
	4	end
	5	end

0

vendor/plugins/engines/test/app/controllers/namespace/app_and_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class Namespace::AppAndPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from app'
	4	end
	5	end

0

vendor/plugins/engines/test/app/helpers/mail_helper.rb created 644 +5 0

@@ -0,0 +1,5
	1	module MailHelper
	2	def do_something_helpful(var)
	3	var.to_s.reverse
	4	end
	5	end No newline at end of file

0

vendor/plugins/engines/test/app/models/app_and_plugin_model.rb created 644 +3 0

@@ -0,0 +1,3
	1	class AppAndPluginModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/app/models/notify_mail.rb created 644 +26 0

@@ -0,0 +1,26
	1	class NotifyMail < ActionMailer::Base
	2
	3	helper :mail
	4
	5	def signup(txt)
	6	body(:name => txt)
	7	end
	8
	9	def multipart
	10	recipients 'some_address@email.com'
	11	subject 'multi part email'
	12	from "another_user@email.com"
	13	content_type 'multipart/alternative'
	14
	15	part :content_type => "text/html", :body => render_message("multipart_html", {})
	16	part "text/plain" do \|p\|
	17	p.body = render_message("multipart_plain", {})
	18	end
	19	end
	20
	21	def implicit_multipart
	22	recipients 'some_address@email.com'
	23	subject 'multi part email'
	24	from "another_user@email.com"
	25	end
	26	end No newline at end of file

0

vendor/plugins/engines/test/app/things/thing.rb created 644 +3 0

@@ -0,0 +1,3
	1	class Thing
	2	def self.from_app; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/app/views/app_and_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from app) No newline at end of file

0

vendor/plugins/engines/test/app/views/namespace/app_and_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from app) No newline at end of file

0

vendor/plugins/engines/test/app/views/notify_mail/implicit_multipart.text.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	the implicit html part of the email <%= do_something_helpful("semaj") %> No newline at end of file

0

vendor/plugins/engines/test/app/views/notify_mail/implicit_multipart.text.plain.erb created 644 +1 0

	@@ -0,0 +1,1
				1	the implicit plaintext part of the email No newline at end of file

0

vendor/plugins/engines/test/app/views/notify_mail/multipart_html.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	the html part of the email <%= do_something_helpful("semaj") %> No newline at end of file

0

vendor/plugins/engines/test/app/views/notify_mail/multipart_plain.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	the plaintext part of the email No newline at end of file

0

vendor/plugins/engines/test/app/views/notify_mail/signup.text.plain.erb created 644 +5 0

@@ -0,0 +1,5
	1	Signup template from application
	2
	3	Here's a local variable set in the Mail object: <%= @name %>.
	4
	5	And here's a method called in a mail helper: <%= do_something_helpful(@name) %>

0

vendor/plugins/engines/test/app/views/plugin_mail/mail_from_plugin_with_application_template.text.plain.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= @note %> (from application) No newline at end of file

0

vendor/plugins/engines/test/app/views/plugin_mail/multipart_from_plugin_with_application_template_plain.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	plugin mail template loaded from application No newline at end of file

0

vendor/plugins/engines/test/functional/controller_loading_test.rb created 644 +51 0

@@ -0,0 +1,51
	1	# Tests in this file ensure that:
	2	#
	3	# * plugin controller actions are found
	4	# * actions defined in application controllers take precedence over those in plugins
	5	# * actions in controllers in subsequently loaded plugins take precendence over those in previously loaded plugins
	6	# * this works for actions in namespaced controllers accordingly
	7
	8	require File.dirname(__FILE__) + '/../test_helper'
	9
	10	class ControllerLoadingTest < ActionController::TestCase
	11	def setup
	12	@request = ActionController::TestRequest.new
	13	@response = ActionController::TestResponse.new
	14	end
	15
	16	# plugin controller actions should be found
	17
	18	def test_WITH_an_action_defined_only_in_a_plugin_IT_should_use_this_action
	19	get_action_on_controller :an_action, :alpha_plugin
	20	assert_response_body 'rendered in AlphaPluginController#an_action'
	21	end
	22
	23	def test_WITH_an_action_defined_only_in_a_namespaced_plugin_controller_IT_should_use_this_action
	24	get_action_on_controller :an_action, :alpha_plugin, :namespace
	25	assert_response_body 'rendered in Namespace::AlphaPluginController#an_action'
	26	end
	27
	28	# app takes precedence over plugins
	29
	30	def test_WITH_an_action_defined_in_both_app_and_plugin_IT_should_use_the_one_in_app
	31	get_action_on_controller :an_action, :app_and_plugin
	32	assert_response_body 'rendered in AppAndPluginController#an_action (from app)'
	33	end
	34
	35	def test_WITH_an_action_defined_in_namespaced_controllers_in_both_app_and_plugin_IT_should_use_the_one_in_app
	36	get_action_on_controller :an_action, :app_and_plugin, :namespace
	37	assert_response_body 'rendered in Namespace::AppAndPluginController#an_action (from app)'
	38	end
	39
	40	# subsequently loaded plugins take precendence over previously loaded plugins
	41
	42	def test_WITH_an_action_defined_in_two_plugin_controllers_IT_should_use_the_latter_of_both
	43	get_action_on_controller :an_action, :shared_plugin
	44	assert_response_body 'rendered in SharedPluginController#an_action (from beta_plugin)'
	45	end
	46
	47	def test_WITH_an_action_defined_in_two_namespaced_plugin_controllers_IT_should_use_the_latter_of_both
	48	get_action_on_controller :an_action, :shared_plugin, :namespace
	49	assert_response_body 'rendered in Namespace::SharedPluginController#an_action (from beta_plugin)'
	50	end
	51	end

0

vendor/plugins/engines/test/functional/exception_notification_compatibility_test.rb created 644 +29 0

@@ -0,0 +1,29
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class ExceptionNotificationCompatibilityTest < ActionController::TestCase
	4	ExceptionNotifier.exception_recipients = %w(joe@schmoe.com bill@schmoe.com)
	5	class SimpleController < ApplicationController
	6	include ExceptionNotifiable
	7	local_addresses.clear
	8	consider_all_requests_local = false
	9	def index
	10	begin
	11	raise "Fail!"
	12	rescue Exception => e
	13	rescue_action_in_public(e)
	14	end
	15	end
	16	end
	17
	18	def setup
	19	@controller = SimpleController.new
	20	@request = ActionController::TestRequest.new
	21	@response = ActionController::TestResponse.new
	22	end
	23
	24	def test_should_work
	25	assert_nothing_raised do
	26	get :index
	27	end
	28	end
	29	end No newline at end of file

0

vendor/plugins/engines/test/functional/locale_loading_test.rb created 644 +26 0

@@ -0,0 +1,26
	1	# Tests in this file ensure that:
	2	#
	3	# * translations in the application take precedence over those in plugins
	4	# * translations in subsequently loaded plugins take precendence over those in previously loaded plugins
	5
	6	require File.dirname(__FILE__) + '/../test_helper'
	7
	8	class LocaleLoadingTest < ActionController::TestCase
	9	def setup
	10	@request = ActionController::TestRequest.new
	11	@response = ActionController::TestResponse.new
	12	end
	13
	14	# app takes precedence over plugins
	15
	16	def test_WITH_a_translation_defined_in_both_app_and_plugin_IT_should_find_the_one_in_app
	17	assert_equal I18n.t('hello'), 'Hello world'
	18	end
	19
	20	# subsequently loaded plugins take precendence over previously loaded plugins
	21
	22	def test_WITH_a_translation_defined_in_two_plugins_IT_should_find_the_latter_of_both
	23	assert_equal I18n.t('plugin'), 'beta'
	24	end
	25	end
	26

0

vendor/plugins/engines/test/functional/routes_test.rb created 644 +29 0

@@ -0,0 +1,29
	1	# Tests in this file ensure that:
	2	#
	3	# * Routes from plugins can be routed to
	4	# * Named routes can be defined within a plugin
	5
	6	require File.dirname(__FILE__) + '/../test_helper'
	7
	8	class RoutesTest < ActionController::TestCase
	9	tests TestRoutingController
	10
	11	def test_WITH_a_route_defined_in_a_plugin_IT_should_route_it
	12	path = '/routes/an_action'
	13	opts = {:controller => 'test_routing', :action => 'an_action'}
	14	assert_routing path, opts
	15	assert_recognizes opts, path # not sure what exactly the difference is, but it won't hurt either
	16	end
	17
	18	def test_WITH_a_route_for_a_namespaced_controller_defined_in_a_plugin_IT_should_route_it
	19	path = 'somespace/routes/an_action'
	20	opts = {:controller => 'namespace/test_routing', :action => 'an_action'}
	21	assert_routing path, opts
	22	assert_recognizes opts, path
	23	end
	24
	25	def test_should_properly_generate_named_routes
	26	get :test_named_routes_from_plugin
	27	assert_response_body '/somespace/routes'
	28	end
	29	end No newline at end of file

0

vendor/plugins/engines/test/functional/view_helpers_test.rb created 644 +37 0

@@ -0,0 +1,37
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class ViewHelpersTest < ActionController::TestCase
	4	tests AssetsController
	5
	6	def setup
	7	get :index
	8	end
	9
	10	def test_plugin_javascript_helpers
	11	base_selector = "script[type='text/javascript']"
	12	js_dir = "/plugin_assets/test_assets/javascripts"
	13	assert_select "#{base_selector}[src='#{js_dir}/file.1.js']"
	14	assert_select "#{base_selector}[src='#{js_dir}/file2.js']"
	15	end
	16
	17	def test_plugin_stylesheet_helpers
	18	base_selector = "link[media='screen'][rel='stylesheet'][type='text/css']"
	19	css_dir = "/plugin_assets/test_assets/stylesheets"
	20	assert_select "#{base_selector}[href='#{css_dir}/file.1.css']"
	21	assert_select "#{base_selector}[href='#{css_dir}/file2.css']"
	22	end
	23
	24	def test_plugin_image_helpers
	25	assert_select "img[src='/plugin_assets/test_assets/images/image.png'][alt='Image']"
	26	end
	27
	28	def test_plugin_layouts
	29	get :index
	30	assert_select "div[id='assets_layout']"
	31	end
	32
	33	def test_plugin_image_submit_helpers
	34	assert_select "input[src='/plugin_assets/test_assets/images/image.png'][type='image']"
	35	end
	36
	37	end

0

vendor/plugins/engines/test/functional/view_loading_test.rb created 644 +60 0

@@ -0,0 +1,60
	1	# Tests in this file ensure that:
	2	#
	3	# * plugin views are found
	4	# * views in the application take precedence over those in plugins
	5	# * views in subsequently loaded plugins take precendence over those in previously loaded plugins
	6	# * this works for namespaced views accordingly
	7
	8	require File.dirname(__FILE__) + '/../test_helper'
	9
	10	class ViewLoadingTest < ActionController::TestCase
	11	def setup
	12	@request = ActionController::TestRequest.new
	13	@response = ActionController::TestResponse.new
	14	end
	15
	16	# plugin views should be found
	17
	18	def test_WITH_a_view_defined_only_in_a_plugin_IT_should_find_the_view
	19	get_action_on_controller :a_view, :alpha_plugin
	20	assert_response_body 'alpha_plugin/a_view'
	21	end
	22
	23	def test_WITH_a_namespaced_view_defined_only_in_a_plugin_IT_should_find_the_view
	24	get_action_on_controller :a_view, :alpha_plugin, :namespace
	25	assert_response_body 'namespace/alpha_plugin/a_view'
	26	end
	27
	28	# app takes precedence over plugins
	29
	30	def test_WITH_a_view_defined_in_both_app_and_plugin_IT_should_find_the_one_in_app
	31	get_action_on_controller :a_view, :app_and_plugin
	32	assert_response_body 'app_and_plugin/a_view (from app)'
	33	end
	34
	35	def test_WITH_a_namespaced_view_defined_in_both_app_and_plugin_IT_should_find_the_one_in_app
	36	get_action_on_controller :a_view, :app_and_plugin, :namespace
	37	assert_response_body 'namespace/app_and_plugin/a_view (from app)'
	38	end
	39
	40	# subsequently loaded plugins take precendence over previously loaded plugins
	41
	42	def test_WITH_a_view_defined_in_two_plugins_IT_should_find_the_latter_of_both
	43	get_action_on_controller :a_view, :shared_plugin
	44	assert_response_body 'shared_plugin/a_view (from beta_plugin)'
	45	end
	46
	47	def test_WITH_a_namespaced_view_defined_in_two_plugins_IT_should_find_the_latter_of_both
	48	get_action_on_controller :a_view, :shared_plugin, :namespace
	49	assert_response_body 'namespace/shared_plugin/a_view (from beta_plugin)'
	50	end
	51
	52	# layouts loaded from plugins
	53
	54	def test_should_be_able_to_load_a_layout_from_a_plugin
	55	get_action_on_controller :action_with_layout, :alpha_plugin
	56	assert_response_body 'rendered in AlphaPluginController#action_with_layout (with plugin layout)'
	57	end
	58
	59	end
	60	No newline at end of file

0

vendor/plugins/engines/test/lib/app_and_plugin_lib_model.rb created 644 +3 0

@@ -0,0 +1,3
	1	class AppAndPluginLibModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/lib/engines_test_helper.rb created 644 +42 0

@@ -0,0 +1,42
	1	module TestHelper
	2	def self.report_location(path)
	3	[RAILS_ROOT + '/', 'vendor/plugins/'].each { \|part\| path.sub! part, ''}
	4	path = path.split('/')
	5	location, subject = path.first, path.last
	6	if subject.sub! '.rb', ''
	7	subject = subject.classify
	8	else
	9	subject.sub! '.html.erb', ''
	10	end
	11	"#{subject} (from #{location})"
	12	end
	13
	14	def self.view_path_for path
	15	[RAILS_ROOT + '/', 'vendor/plugins/', '.html.erb'].each { \|part\| path.sub! part, ''}
	16	parts = path.split('/')
	17	parts[(parts.index('views')+1)..-1].join('/')
	18	end
	19	end
	20
	21	class Test::Unit::TestCase
	22	# Add more helper methods to be used by all tests here...
	23	def get_action_on_controller(*args)
	24	action = args.shift
	25	with_controller *args
	26	get action
	27	end
	28
	29	def with_controller(controller, namespace = nil)
	30	classname = controller.to_s.classify + 'Controller'
	31	classname = namespace.to_s.classify + '::' + classname unless namespace.nil?
	32	@controller = classname.constantize.new
	33	end
	34
	35	def assert_response_body(expected)
	36	assert_equal expected, @response.body
	37	end
	38	end
	39
	40	# Because we're testing this behaviour, we actually want these features on!
	41	Engines.disable_application_view_loading = false
	42	Engines.disable_application_code_loading = false

0

vendor/plugins/engines/test/lib/render_information.rb created 644 +7 0

@@ -0,0 +1,7
	1	module RenderInformation
	2	def render_class_and_action(note = nil, options={})
	3	text = "rendered in #{self.class.name}##{params[:action]}"
	4	text += " (#{note})" unless note.nil?
	5	render options.update(:text => text)
	6	end
	7	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/alpha_plugin_controller.rb created 644 +8 0

@@ -0,0 +1,8
	1	class AlphaPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action
	4	end
	5	def action_with_layout
	6	render_class_and_action(nil, :layout => "plugin_layout")
	7	end
	8	end

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/app_and_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class AppAndPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from alpha_plugin'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/namespace/alpha_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class Namespace::AlphaPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action
	4	end
	5	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/namespace/app_and_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class Namespace::AppAndPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from alpha_plugin'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/namespace/shared_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class Namespace::SharedPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from alpha_plugin'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/controllers/shared_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class SharedEngineController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from alpha_engine'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/models/alpha_plugin_model.rb created 644 +3 0

@@ -0,0 +1,3
	1	class AlphaPluginModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/models/app_and_plugin_model.rb created 644 +7 0

@@ -0,0 +1,7
	1	class AppAndPluginModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3
	4	def defined_only_in_alpha_plugin_version
	5	# should not be defined as the model in app/models takes precedence
	6	end
	7	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/models/shared_plugin_model.rb created 644 +3 0

@@ -0,0 +1,3
	1	class SharedPluginModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/alpha_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/app_and_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from a_view) No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/layouts/plugin_layout.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= yield %> (with plugin layout) No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/alpha_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/app_and_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/shared_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from alpha_plugin) No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/app/views/shared_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from alpha_plugin) No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/lib/alpha_plugin_lib_model.rb created 644 +3 0

@@ -0,0 +1,3
	1	class AlphaPluginLibModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/lib/app_and_plugin_lib_model.rb created 644 +7 0

@@ -0,0 +1,7
	1	class AppAndPluginLibModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3
	4	def defined_only_in_alpha_plugin_version
	5	# should not be defined
	6	end
	7	end No newline at end of file

0

vendor/plugins/engines/test/plugins/alpha_plugin/locales/en.yml created 644 +3 0

@@ -0,0 +1,3
	1	en:
	2	hello: "Hello from alfa"
	3	plugin: "alfa"

0

vendor/plugins/engines/test/plugins/beta_plugin/app/controllers/app_and_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class AppAndPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from beta_plugin'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/beta_plugin/app/controllers/namespace/shared_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class Namespace::SharedPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from beta_plugin'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/beta_plugin/app/controllers/shared_plugin_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class SharedPluginController < ApplicationController
	2	def an_action
	3	render_class_and_action 'from beta_plugin'
	4	end
	5	end

0

vendor/plugins/engines/test/plugins/beta_plugin/app/models/shared_plugin_model.rb created 644 +3 0

@@ -0,0 +1,3
	1	class SharedPluginModel < ActiveRecord::Base
	2	def self.report_location; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/plugins/beta_plugin/app/views/namespace/shared_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from beta_plugin) No newline at end of file

0

vendor/plugins/engines/test/plugins/beta_plugin/app/views/shared_plugin/a_view.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= TestHelper.view_path_for __FILE__ %> (from beta_plugin) No newline at end of file

0

vendor/plugins/engines/test/plugins/beta_plugin/init.rb created 644 +1 0

	@@ -0,0 +1,1
				1	# just here so that Rails recognizes this as a plugin No newline at end of file

0

vendor/plugins/engines/test/plugins/beta_plugin/locales/en.yml created 644 +3 0

@@ -0,0 +1,3
	1	en:
	2	hello: "Hello from beta"
	3	plugin: "beta"

0

vendor/plugins/engines/test/plugins/not_a_plugin/public/should_not_be_copied.txt created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets/app/controllers/assets_controller.rb created 644 +2 0

@@ -0,0 +1,2
	1	class AssetsController < ApplicationController
	2	end No newline at end of file

0

vendor/plugins/engines/test/plugins/test_assets/app/views/assets/index.html.erb created 644 +4 0

@@ -0,0 +1,4
	1	<%= image_tag 'image.png', :plugin => 'test_assets' %>
	2	<%= javascript_include_tag 'file.1.js', 'file2', :plugin => "test_assets" %>
	3	<%= stylesheet_link_tag 'file.1.css', 'file2', :plugin => "test_assets" %>
	4	<%= image_submit_tag 'image.png', :plugin => "test_assets" %>

0

vendor/plugins/engines/test/plugins/test_assets/app/views/layouts/assets.html.erb created 644 +3 0

@@ -0,0 +1,3
	1	<div id="assets_layout">
	2	<%= yield %>
	3	</div> No newline at end of file

0

vendor/plugins/engines/test/plugins/test_assets/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets/public/file.txt created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets/public/subfolder/file_in_subfolder.txt created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets_with_assets_directory/assets/file.txt created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets_with_assets_directory/assets/subfolder/file_in_subfolder.txt created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets_with_assets_directory/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets_with_no_subdirectory/assets/file.txt created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_assets_with_no_subdirectory/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_code_mixing/app/things/thing.rb created 644 +3 0

@@ -0,0 +1,3
	1	class Thing
	2	def self.from_plugin; TestHelper::report_location(__FILE__); end
	3	end No newline at end of file

0

vendor/plugins/engines/test/plugins/test_code_mixing/init.rb created 644 +1 0

	@@ -0,0 +1,1
				1	# just here so that Rails recognizes this as a plugin No newline at end of file

0

vendor/plugins/engines/test/plugins/test_load_path/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_migration/db/migrate/001_create_tests.rb created 644 +11 0

@@ -0,0 +1,11
	1	class CreateTests < ActiveRecord::Migration
	2	def self.up
	3	create_table 'tests' do \|t\|
	4	t.column 'name', :string
	5	end
	6	end
	7
	8	def self.down
	9	drop_table 'tests'
	10	end
	11	end

0

vendor/plugins/engines/test/plugins/test_migration/db/migrate/002_create_others.rb created 644 +11 0

@@ -0,0 +1,11
	1	class CreateOthers < ActiveRecord::Migration
	2	def self.up
	3	create_table 'others' do \|t\|
	4	t.column 'name', :string
	5	end
	6	end
	7
	8	def self.down
	9	drop_table 'others'
	10	end
	11	end

0

vendor/plugins/engines/test/plugins/test_migration/db/migrate/003_create_extras.rb created 644 +11 0

@@ -0,0 +1,11
	1	class CreateExtras < ActiveRecord::Migration
	2	def self.up
	3	create_table 'extras' do \|t\|
	4	t.column 'name', :string
	5	end
	6	end
	7
	8	def self.down
	9	drop_table 'extras'
	10	end
	11	end

0

vendor/plugins/engines/test/plugins/test_migration/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/models/plugin_mail.rb created 644 +26 0

@@ -0,0 +1,26
	1	class PluginMail < ActionMailer::Base
	2	def mail_from_plugin(note=nil)
	3	body(:note => note)
	4	end
	5
	6	def mail_from_plugin_with_application_template(note=nil)
	7	body(:note => note)
	8	end
	9
	10	def multipart_from_plugin
	11	content_type 'multipart/alternative'
	12	part :content_type => "text/html", :body => render_message("multipart_from_plugin_html", {})
	13	part "text/plain" do \|p\|
	14	p.body = render_message("multipart_from_plugin_plain", {})
	15	end
	16	end
	17
	18	def multipart_from_plugin_with_application_template
	19	content_type 'multipart/alternative'
	20	part :content_type => "text/html", :body => render_message("multipart_from_plugin_with_application_template_html", {})
	21	part "text/plain" do \|p\|
	22	p.body = render_message("multipart_from_plugin_with_application_template_plain", {})
	23	end
	24	end
	25
	26	end No newline at end of file

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/mail_from_plugin.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= @note %> No newline at end of file

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_html.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	html template No newline at end of file

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_plain.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	plain template No newline at end of file

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_with_application_template_html.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	template from plugin No newline at end of file

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/app/views/plugin_mail/multipart_from_plugin_with_application_template_plain.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	template from plugin No newline at end of file

0

vendor/plugins/engines/test/plugins/test_plugin_mailing/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_routing/app/controllers/namespace/test_routing_controller.rb created 644 +5 0

@@ -0,0 +1,5
	1	class Namespace::TestRoutingController < ApplicationController
	2	def routed_action
	3	render_class_and_action
	4	end
	5	end No newline at end of file

0

vendor/plugins/engines/test/plugins/test_routing/app/controllers/test_routing_controller.rb created 644 +9 0

@@ -0,0 +1,9
	1	class TestRoutingController < ApplicationController
	2	def routed_action
	3	render_class_and_action
	4	end
	5
	6	def test_named_routes_from_plugin
	7	render :text => plugin_route_path(:action => "index")
	8	end
	9	end No newline at end of file

0

vendor/plugins/engines/test/plugins/test_routing/config/routes.rb created 644 +4 0

@@ -0,0 +1,4
	1	ActionController::Routing::Routes.draw do \|map\|
	2	map.connect 'routes/:action', :controller => "test_routing"
	3	map.plugin_route 'somespace/routes/:action', :controller => "namespace/test_routing"
	4	end No newline at end of file

0

vendor/plugins/engines/test/plugins/test_routing/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_testing/app/README.txt created 644 +1 0

	@@ -0,0 +1,1
				1	Fixtures are only copied from plugins with an +app+ directory, but git needs this directory to be non-empty No newline at end of file

0

vendor/plugins/engines/test/plugins/test_testing/init.rb created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_testing/test/fixtures/testing_fixtures.yml created 644 0 0

1

NO CONTENT: new file 100644

0

vendor/plugins/engines/test/plugins/test_testing/test/unit/override_test.rb created 644 +13 0

@@ -0,0 +1,13
	1	require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. .. .. .. test test_helper]))
	2
	3	class OverrideTest < ActiveSupport::TestCase
	4	def test_overrides_from_the_application_should_work
	5	flunk "this test should be overridden by the app"
	6	end
	7
	8	def test_tests_within_the_plugin_should_still_run
	9	assert true, "non-overridden plugin tests should still run"
	10	end
	11	end
	12
	13	Engines::Testing.override_tests_from_app No newline at end of file

0

vendor/plugins/engines/test/unit/action_mailer_test.rb created 644 +54 0

@@ -0,0 +1,54
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class ActionMailerWithinApplicationTest < Test::Unit::TestCase
	4
	5	def test_normal_implicit_template
	6	m = NotifyMail.create_signup("hello")
	7	assert m.body =~ /^Signup template from application/
	8	end
	9
	10	def test_action_mailer_can_get_helper
	11	m = NotifyMail.create_signup('James')
	12	assert m.body =~ /James/
	13	assert m.body =~ /semaJ/ # from the helper
	14	end
	15
	16	def test_multipart_mails_with_explicit_templates
	17	m = NotifyMail.create_multipart
	18	assert_equal 2, m.parts.length
	19	assert_equal 'the html part of the email james', m.parts[0].body
	20	assert_equal 'the plaintext part of the email', m.parts[1].body
	21	end
	22
	23	def test_multipart_mails_with_implicit_templates
	24	m = NotifyMail.create_implicit_multipart
	25	assert_equal 2, m.parts.length
	26	assert_equal 'the implicit plaintext part of the email', m.parts[0].body
	27	assert_equal 'the implicit html part of the email james', m.parts[1].body
	28	end
	29	end
	30
	31
	32	class ActionMailerWithinPluginsTest < Test::Unit::TestCase
	33	def test_should_be_able_to_create_mails_from_plugin
	34	m = PluginMail.create_mail_from_plugin("from_plugin")
	35	assert_equal "from_plugin", m.body
	36	end
	37
	38	def test_should_be_able_to_overload_views_within_the_application
	39	m = PluginMail.create_mail_from_plugin_with_application_template("from_plugin")
	40	assert_equal "from_plugin (from application)", m.body
	41	end
	42
	43	def test_should_be_able_to_create_a_multipart_mail_from_within_plugin
	44	m = PluginMail.create_multipart_from_plugin
	45	assert_equal 2, m.parts.length
	46	assert_equal 'html template', m.parts[0].body
	47	assert_equal 'plain template', m.parts[1].body
	48	end
	49
	50	def test_plugin_mailer_template_overriding
	51	m = PluginMail.create_multipart_from_plugin_with_application_template
	52	assert_equal 'plugin mail template loaded from application', m.parts[1].body
	53	end
	54	end No newline at end of file

0

vendor/plugins/engines/test/unit/arbitrary_code_mixing_test.rb created 644 +41 0

@@ -0,0 +1,41
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class ArbitraryCodeMixingTest < Test::Unit::TestCase
	4	def setup
	5	Engines.code_mixing_file_types = %w(controller helper)
	6	end
	7
	8	def test_should_allow_setting_of_different_code_mixing_file_types
	9	assert_nothing_raised {
	10	Engines.mix_code_from :things
	11	}
	12	end
	13
	14	def test_should_add_new_types_to_existing_code_mixing_file_types
	15	Engines.mix_code_from :things
	16	assert_equal ["controller", "helper", "thing"], Engines.code_mixing_file_types
	17	Engines.mix_code_from :other
	18	assert_equal ["controller", "helper", "thing", "other"], Engines.code_mixing_file_types
	19	end
	20
	21	def test_should_allow_setting_of_multiple_types_at_once
	22	Engines.mix_code_from :things, :other
	23	assert_equal ["controller", "helper", "thing", "other"], Engines.code_mixing_file_types
	24	end
	25
	26	def test_should_singularize_elements_to_be_mixed
	27	# this is the only test using mocha, so let's try to work around it
	28	# also, this seems to be already tested with the :things in the tests above
	29	# arg = stub(:to_s => stub(:singularize => "element"))
	30	Engines.mix_code_from :elements
	31	assert Engines.code_mixing_file_types.include?("element")
	32	end
	33
	34	# TODO doesn't seem to work as expected?
	35
	36	# def test_should_successfully_mix_custom_types
	37	# Engines.mix_code_from :things
	38	# assert_equal 'Thing (from app)', Thing.from_app
	39	# assert_equal 'Thing (from test_code_mixing)', Thing.from_plugin
	40	# end
	41	end No newline at end of file

0

vendor/plugins/engines/test/unit/assets_test.rb created 644 +52 0

@@ -0,0 +1,52
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class AssetsTest < Test::Unit::TestCase
	4	def setup
	5	Engines::Assets.mirror_files_for Engines.plugins[:test_assets]
	6	end
	7
	8	def teardown
	9	FileUtils.rm_r(Engines.public_directory) if File.exist?(Engines.public_directory)
	10	end
	11
	12	def test_engines_has_created_base_public_file
	13	assert File.exist?(Engines.public_directory)
	14	end
	15
	16	def test_engines_has_created_README_in_public_directory
	17	assert File.exist?(File.join(Engines.public_directory, 'README'))
	18	end
	19
	20	def test_public_files_have_been_copied_from_test_assets_plugin
	21	assert File.exist?(File.join(Engines.public_directory, 'test_assets'))
	22	assert File.exist?(File.join(Engines.public_directory, 'test_assets', 'file.txt'))
	23	assert File.exist?(File.join(Engines.public_directory, 'test_assets', 'subfolder'))
	24	assert File.exist?(File.join(Engines.public_directory, 'test_assets', 'subfolder', 'file_in_subfolder.txt'))
	25	end
	26
	27	def test_engines_has_not_created_duplicated_file_structure
	28	assert !File.exists?(File.join(Engines.public_directory, "test_assets", RAILS_ROOT))
	29	end
	30
	31	def test_public_files_have_been_copied_from_test_assets_with_assets_dir_plugin
	32	Engines::Assets.mirror_files_for Engines.plugins[:test_assets_with_assets_directory]
	33
	34	assert File.exist?(File.join(Engines.public_directory, 'test_assets_with_assets_directory'))
	35	assert File.exist?(File.join(Engines.public_directory, 'test_assets_with_assets_directory', 'file.txt'))
	36	assert File.exist?(File.join(Engines.public_directory, 'test_assets_with_assets_directory', 'subfolder'))
	37	assert File.exist?(File.join(Engines.public_directory, 'test_assets_with_assets_directory', 'subfolder', 'file_in_subfolder.txt'))
	38	end
	39
	40	def test_public_files_have_been_copied_from_test_assets_with_no_subdirectory_plugin
	41	Engines::Assets.mirror_files_for Engines.plugins[:test_assets_with_no_subdirectory]
	42
	43	assert File.exist?(File.join(Engines.public_directory, 'test_assets_with_no_subdirectory'))
	44	assert File.exist?(File.join(Engines.public_directory, 'test_assets_with_no_subdirectory', 'file.txt'))
	45	end
	46
	47	def test_public_files_have_NOT_been_copied_from_plugins_without_public_or_asset_directories
	48	Engines::Assets.mirror_files_for Engines.plugins[:alpha_plugin]
	49
	50	assert !File.exist?(File.join(Engines.public_directory, 'alpha_plugin'))
	51	end
	52	end No newline at end of file

0

vendor/plugins/engines/test/unit/backwards_compat_test.rb created 644 +8 0

@@ -0,0 +1,8
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class BackwardsCompatibilityTest < Test::Unit::TestCase
	4	def test_rails_module_plugin_method_should_delegate_to_engines_plugins
	5	assert_nothing_raised { Rails.plugins }
	6	assert_equal Engines.plugins, Rails.plugins
	7	end
	8	end No newline at end of file

0

vendor/plugins/engines/test/unit/load_path_test.rb created 644 +58 0

@@ -0,0 +1,58
	1	# Tests in this file ensure that:
	2	#
	3	# * the application /app/[controllers\|helpers\|models] and /lib
	4	# paths preceed the corresponding plugin paths
	5	# * the plugin paths are added to $LOAD_PATH in the order in which plugins are
	6	# loaded
	7
	8	require File.dirname(__FILE__) + '/../test_helper'
	9
	10	class LoadPathTest < Test::Unit::TestCase
	11	def setup
	12	@load_path = expand_paths($LOAD_PATH)
	13	end
	14
	15	# Not sure if these test actually make sense as this now essentially tests
	16	# Rails core functionality. On the other hand Engines relies on this to some
	17	# extend so this will choke if something important changes in Rails.
	18
	19	# the application app/... and lib/ directories should appear
	20	# before any plugin directories
	21
	22	def test_application_app_libs_should_precede_all_plugin_app_libs
	23	types = %w(app/controllers app/helpers app/models lib)
	24	types.each do \|t\|
	25	app_index = load_path_index(File.join(RAILS_ROOT, t))
	26	assert_not_nil app_index, "#{t} is missing in $LOAD_PATH"
	27	Engines.plugins.each do \|plugin\|
	28	first_plugin_index = load_path_index(File.join(plugin.directory, t))
	29	assert(app_index < first_plugin_index) unless first_plugin_index.nil?
	30	end
	31	end
	32	end
	33
	34	# the engine directories should appear in the proper order based on
	35	# the order they were started
	36
	37	def test_plugin_dirs_should_appear_in_reverse_plugin_loading_order
	38	app_paths = %w(app/controllers/ app app/models app/helpers lib)
	39	app_paths.map { \|p\| File.join(RAILS_ROOT, p)}
	40	plugin_paths = Engines.plugins.reverse.collect { \|plugin\| plugin.load_paths.reverse }.flatten
	41
	42	expected_paths = expand_paths(app_paths + plugin_paths)
	43	# only look at those paths that are also present in expected_paths so
	44	# the only difference would be in the order of the paths
	45	actual_paths = @load_path & expected_paths
	46
	47	assert_equal expected_paths, actual_paths
	48	end
	49
	50	protected
	51	def expand_paths(paths)
	52	paths.collect { \|p\| File.expand_path(p) }
	53	end
	54
	55	def load_path_index(dir)
	56	@load_path.index(File.expand_path(dir))
	57	end
	58	end No newline at end of file

0

vendor/plugins/engines/test/unit/migration_test.rb created 644 +63 0

@@ -0,0 +1,63
	1	require File.dirname(__FILE__) + '/../test_helper'
	2	require 'rails_generator'
	3	require 'rails_generator/scripts/generate'
	4
	5	class MigrationsTest < Test::Unit::TestCase
	6
	7	@@migration_dir = "#{RAILS_ROOT}/db/migrate"
	8
	9	def setup
	10	ActiveRecord::Migration.verbose = false
	11	Engines.plugins[:test_migration].migrate(0)
	12	end
	13
	14	def teardown
	15	FileUtils.rm_r(@@migration_dir) if File.exist?(@@migration_dir)
	16	end
	17
	18	def test_engine_migrations_can_run_down
	19	assert !table_exists?('tests'), ActiveRecord::Base.connection.tables.inspect
	20	assert !table_exists?('others'), ActiveRecord::Base.connection.tables.inspect
	21	assert !table_exists?('extras'), ActiveRecord::Base.connection.tables.inspect
	22	end
	23
	24	def test_engine_migrations_can_run_up
	25	Engines.plugins[:test_migration].migrate(3)
	26	assert table_exists?('tests')
	27	assert table_exists?('others')
	28	assert table_exists?('extras')
	29	end
	30
	31	def test_engine_migrations_can_upgrade_incrementally
	32	Engines.plugins[:test_migration].migrate(1)
	33	assert table_exists?('tests')
	34	assert !table_exists?('others')
	35	assert !table_exists?('extras')
	36	assert_equal 1, Engines::Plugin::Migrator.current_version(Engines.plugins[:test_migration])
	37
	38
	39	Engines.plugins[:test_migration].migrate(2)
	40	assert table_exists?('others')
	41	assert_equal 2, Engines::Plugin::Migrator.current_version(Engines.plugins[:test_migration])
	42
	43
	44	Engines.plugins[:test_migration].migrate(3)
	45	assert table_exists?('extras')
	46	assert_equal 3, Engines::Plugin::Migrator.current_version(Engines.plugins[:test_migration])
	47	end
	48
	49	def test_generator_creates_plugin_migration_file
	50	Rails::Generator::Scripts::Generate.new.run(['plugin_migration', 'test_migration'], :quiet => true)
	51	assert migration_file, "migration file is missing"
	52	end
	53
	54	private
	55
	56	def table_exists?(table)
	57	ActiveRecord::Base.connection.tables.include?(table)
	58	end
	59
	60	def migration_file
	61	Dir["#{@@migration_dir}/*test_migration_to_version_3.rb"][0]
	62	end
	63	end No newline at end of file

0

vendor/plugins/engines/test/unit/model_and_lib_test.rb created 644 +37 0

@@ -0,0 +1,37
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class ModelAndLibTest < Test::Unit::TestCase
	4
	5	def test_WITH_a_model_defined_only_in_a_plugin_IT_should_load_the_model
	6	assert_equal 'AlphaPluginModel (from alpha_plugin)', AlphaPluginModel.report_location
	7	end
	8
	9	def test_WITH_a_model_defined_only_in_a_plugin_lib_dir_IT_should_load_the_model
	10	assert_equal 'AlphaPluginLibModel (from alpha_plugin)', AlphaPluginLibModel.report_location
	11	end
	12
	13	# app takes precedence over plugins
	14
	15	def test_WITH_a_model_defined_in_both_app_and_plugin_IT_should_load_the_one_in_app
	16	assert_equal 'AppAndPluginModel (from app)', AppAndPluginModel.report_location
	17	assert_raises(NoMethodError) { AppAndPluginLibModel.defined_only_in_alpha_engine_version }
	18	end
	19
	20	def test_WITH_a_model_defined_in_both_app_and_plugin_lib_dirs_IT_should_load_the_one_in_app
	21	assert_equal 'AppAndPluginLibModel (from lib)', AppAndPluginLibModel.report_location
	22	assert_raises(NoMethodError) { AppAndPluginLibModel.defined_only_in_alpha_engine_version }
	23	end
	24
	25	# subsequently loaded plugins take precendence over previously loaded plugins
	26
	27	# TODO
	28	#
	29	# this does work when we rely on $LOAD_PATH while it won't work when we use
	30	# Dependency constant autoloading. This somewhat confusing difference has
	31	# been there since at least Rails 1.2.x. See http://www.ruby-forum.com/topic/134529
	32
	33	def test_WITH_a_model_defined_in_two_plugins_IT_should_load_the_latter_of_both
	34	require 'shared_plugin_model'
	35	assert_equal SharedPluginModel.report_location, 'SharedPluginModel (from beta_plugin)'
	36	end
	37	end No newline at end of file

0

vendor/plugins/engines/test/unit/plugins_test.rb created 644 +11 0

@@ -0,0 +1,11
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class PluginsTest < Test::Unit::TestCase
	4
	5	def test_should_allow_access_to_plugins_by_strings_or_symbols
	6	p = Engines.plugins["alpha_plugin"]
	7	q = Engines.plugins[:alpha_plugin]
	8	assert_kind_of Engines::Plugin, p
	9	assert_equal p, q
	10	end
	11	end No newline at end of file

0

vendor/plugins/engines/test/unit/test_testing/override_test.rb created 644 +7 0

@@ -0,0 +1,7
	1	require File.join(File.dirname(__FILE__), *%w[.. .. test_helper])
	2
	3	class OverrideTest < ActiveSupport::TestCase
	4	def test_overrides_from_the_application_should_work
	5	assert true, "overriding plugin tests from the application should work"
	6	end
	7	end No newline at end of file

0

vendor/plugins/engines/test/unit/testing_test.rb created 644 +19 0

@@ -0,0 +1,19
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class TestingTest < Test::Unit::TestCase
	4	def setup
	5	Engines::Testing.set_fixture_path
	6	@filename = File.join(Engines::Testing.temporary_fixtures_directory, 'testing_fixtures.yml')
	7	File.delete(@filename) if File.exists?(@filename)
	8	end
	9
	10	def teardown
	11	File.delete(@filename) if File.exists?(@filename)
	12	end
	13
	14	def test_should_copy_fixtures_files_to_tmp_directory
	15	assert !File.exists?(@filename)
	16	Engines::Testing.setup_plugin_fixtures
	17	assert File.exists?(@filename)
	18	end
	19	end No newline at end of file

0

vendor/plugins/prepend_engine_views/init.rb created 644 +21 0

@@ -0,0 +1,21
	1	module PrependEngineViews
	2	def self.included(base)
	3	base.send(:include, InstanceMethods)
	4	base.class_eval do
	5	alias_method_chain :add_engine_view_paths, :prepend
	6	end
	7	end
	8
	9	module InstanceMethods
	10	# Patch Rails so engine's views are prepended to the view_path,
	11	# thereby letting plugins override application views
	12	def add_engine_view_paths_with_prepend
	13	paths = ActionView::PathSet.new(engines.collect(&:view_path))
	14	ActionController::Base.view_paths.unshift(*paths)
	15	ActionMailer::Base.view_paths.unshift(*paths) if configuration.frameworks.include?(:action_mailer)
	16	end
	17	end
	18	end
	19
	20	Rails::Plugin::Loader.send :include, PrependEngineViews
	21

0

app/controllers/application_controller.rb ~~app/controllers/application.rb~~ renamed +1 -6

             class ApplicationController < ActionController::Base
               include Redmine::I18n
-              # In case the cookie store secret changes
-              rescue_from CGI::Session::CookieStore::TamperedWithCookie do |exception|
-                render :text => 'Your session was invalid and has been reset. Please, reload this page.', :status => 500
-              end
               layout 'base'
               before_filter :user_setup, :check_if_login_required, :set_localization

0

app/controllers/repositories_controller.rb +1 -1

               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
-                commits_by_author.sort! {|x, y| x.last <=> y.last}
+                commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}

0

app/models/mailer.rb +28 -20

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Mailer < ActionMailer::Base
+              layout 'mailer'
               helper :application
               helper :issues
               helper :custom_fields
                 subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
                 body :issue => issue,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
+                render_multipart('issue_add', body)
               end
               # Builds a tmail object used to email recipients of the edited issue.
                 body :issue => issue,
                      :journal => journal,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
+                render_multipart('issue_edit', body)
               end
               def reminder(user, issues, days)
                 body :issues => issues,
                      :days => days,
                      :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'due_date', :sort_order => 'asc')
+                render_multipart('reminder', body)
               end
               # Builds a tmail object used to email users belonging to the added document's project.
                 subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
                 body :document => document,
                      :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
+                render_multipart('document_added', body)
               end
               # Builds a tmail object used to email recipients of a project when an attachements are added.
                 body :attachments => attachments,
                      :added_to => added_to,
                      :added_to_url => added_to_url
+                render_multipart('attachments_added', body)
               end
               # Builds a tmail object used to email recipients of a news' project when a news item is added.
                 subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
                 body :news => news,
                      :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
+                render_multipart('news_added', body)
               end
               # Builds a tmail object used to email the specified recipients of the specified message that was posted.
                 subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
                 body :message => message,
                      :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
+                render_multipart('message_posted', body)
               end
               # Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
                 subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}"
                 body :wiki_content => wiki_content,
                      :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title)
+                render_multipart('wiki_content_added', body)
               end
               # Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
                 body :wiki_content => wiki_content,
                      :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title),
                      :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :page => wiki_content.page.title, :version => wiki_content.version)
+                render_multipart('wiki_content_updated', body)
               end
               # Builds a tmail object used to email the specified user their account information.
                 body :user => user,
                      :password => password,
                      :login_url => url_for(:controller => 'account', :action => 'login')
+                render_multipart('account_information', body)
               end
               # Builds a tmail object used to email all active administrators of an account activation request.
                 subject l(:mail_subject_account_activation_request, Setting.app_title)
                 body :user => user,
                      :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
+                render_multipart('account_activation_request', body)
               end
               # Builds a tmail object used to email the specified user that their account was activated by an administrator.
                 subject l(:mail_subject_register, Setting.app_title)
                 body :user => user,
                      :login_url => url_for(:controller => 'account', :action => 'login')
+                render_multipart('account_activated', body)
               end
               def lost_password(token)
                 subject l(:mail_subject_lost_password, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
+                render_multipart('lost_password', body)
               end
               def register(token)
                 subject l(:mail_subject_register, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
+                render_multipart('register', body)
               end
               def test(user)
                 recipients user.mail
                 subject 'Redmine test'
                 body :url => url_for(:controller => 'welcome')
+                render_multipart('test', body)
               end
               # Overrides default deliver! method to prevent from sending an email
                 super
               end
-              # Renders a message with the corresponding layout
+              # Rails 2.3 has problems rendering implicit multipart messages with
-              def render_message(method_name, body)
+              # layouts so this method will wrap an multipart messages with
-                layout = method_name.to_s.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
+              # explicit parts.
-                body[:content_for_layout] = render(:file => method_name, :body => body)
-                ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true)
+              # https://rails.lighthouseapp.com/projects/8994/tickets/2338-actionmailer-mailer-views-and-content-type
-              end
+              # https://rails.lighthouseapp.com/projects/8994/tickets/1799-actionmailer-doesnt-set-template_format-when-rendering-layouts
-              # for the case of plain text only
+              def render_multipart(method_name, body)
-              def body(*params)
+                content_type "multipart/alternative"
-                value = super(*params)
+                part :content_type => "text/plain", :body => render(:file => "#{method_name}.text.plain.rhtml", :body => body, :layout => 'mailer.text.plain.erb')
-                if Setting.plain_text_mail?
+                part :content_type => "text/html", :body => render_message("#{method_name}.text.html.rhtml", body) unless Setting.plain_text_mail?
-                  templates = Dir.glob("#{template_path}/#{@template}.text.plain.{rhtml,erb}")
-                  unless String === @body or templates.empty?
-                    template = File.basename(templates.first)
-                    @body[:content_for_layout] = render(:file => template, :body => @body)
-                    @body = ActionView::Base.new(template_root, @body, self).render(:file => "mailer/layout.text.plain.rhtml", :use_full_path => true)
-                    return @body
-                  end
-                end
-                return value
               end
               # Makes partial rendering work with Rails 1.2 (retro-compatibility)

0

app/views/layouts/mailer.text.html.erb ~~app/views/mailer/layout.text.html.rhtml~~ renamed 0 0

1

NO CONTENT: file renamed from app/views/mailer/layout.text.html.rhtml to app/views/layouts/mailer.text.html.erb

0

app/views/layouts/mailer.text.plain.erb ~~app/views/mailer/layout.text.plain.rhtml~~ renamed 0 0

1

NO CONTENT: file renamed from app/views/mailer/layout.text.plain.rhtml to app/views/layouts/mailer.text.plain.erb

0

app/views/settings/_authentication.rhtml +9 -3

             <div class="box tabular settings">
             <p><label><%= l(:setting_login_required) %></label>
-            <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
+            <%= hidden_field_tag 'settings[login_required]', 0 %>
+            <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %>
+            </p>
             <p><label><%= l(:setting_autologin) %></label>
             <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, Setting.autologin) %></p>
             <%= text_field_tag 'settings[password_min_length]', Setting.password_min_length, :size => 6 %></p>
             <p><label><%= l(:label_password_lost) %></label>
-            <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
+            <%= hidden_field_tag 'settings[lost_password]', 0 %>
+            <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %>
+            </p>
             <p><label><%= l(:setting_openid) %></label>
-            <%= check_box_tag 'settings[openid]', 1, Setting.openid?, :disabled => !Object.const_defined?(:OpenID) %><%= hidden_field_tag 'settings[openid]', 0 %></p>
+            <%= hidden_field_tag 'settings[openid]', 0 %>
+            <%= check_box_tag 'settings[openid]', 1, Setting.openid?, :disabled => !Object.const_defined?(:OpenID) %>
+            </p>
             </div>
             <div style="float:right;">

0

app/views/settings/_display.rhtml +3 -1

             <%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
             <p><label><%= l(:setting_gravatar_enabled) %></label>
-            <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
+            <%= hidden_field_tag 'settings[gravatar_enabled]', 0 %>
+            <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %>
+            </p>
             </div>
             <%= submit_tag l(:button_save) %>

0

app/views/settings/_issues.rhtml +6 -2

             <div class="box tabular settings">
             <p><label><%= l(:setting_cross_project_issue_relations) %></label>
-            <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
+            <%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %>
+            <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %>
+            </p>
             <p><label><%= l(:setting_display_subprojects_issues) %></label>
-            <%= check_box_tag 'settings[display_subprojects_issues]', 1, Setting.display_subprojects_issues? %><%= hidden_field_tag 'settings[display_subprojects_issues]', 0 %></p>
+            <%= hidden_field_tag 'settings[display_subprojects_issues]', 0 %>
+            <%= check_box_tag 'settings[display_subprojects_issues]', 1, Setting.display_subprojects_issues? %>
+            </p>
             <p><label><%= l(:setting_issues_export_limit) %></label>
             <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>

0

app/views/settings/_mail_handler.rhtml +2 -1

             <div class="box tabular settings">
             <p><label><%= l(:setting_mail_handler_api_enabled) %></label>
+            <%= hidden_field_tag 'settings[mail_handler_api_enabled]', 0 %>
             <%= check_box_tag 'settings[mail_handler_api_enabled]', 1, Setting.mail_handler_api_enabled?,
                               :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }" %>
-            <%= hidden_field_tag 'settings[mail_handler_api_enabled]', 0 %></p>
+            </p>
             <p><label><%= l(:setting_mail_handler_api_key) %></label>
             <%= text_field_tag 'settings[mail_handler_api_key]', Setting.mail_handler_api_key,

0

app/views/settings/_notifications.rhtml +4 -2

             <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
             <p><label><%= l(:setting_bcc_recipients) %></label>
+            <%= hidden_field_tag 'settings[bcc_recipients]', 0 %>
             <%= check_box_tag 'settings[bcc_recipients]', 1, Setting.bcc_recipients? %>
-            <%= hidden_field_tag 'settings[bcc_recipients]', 0 %></p>
+            </p>
             <p><label><%= l(:setting_plain_text_mail) %></label>
+            <%= hidden_field_tag 'settings[plain_text_mail]', 0 %>
             <%= check_box_tag 'settings[plain_text_mail]', 1, Setting.plain_text_mail? %>
-            <%= hidden_field_tag 'settings[plain_text_mail]', 0 %></p>
+            </p>
             </div>
             <fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>

0

app/views/settings/_projects.rhtml +6 -2

             <div class="box tabular settings">
             <p><label><%= l(:setting_default_projects_public) %></label>
-            <%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %><%= hidden_field_tag 'settings[default_projects_public]', 0 %></p>
+            <%= hidden_field_tag 'settings[default_projects_public]', 0 %>
+            <%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %>
+            </p>
             <p><label><%= l(:setting_sequential_project_identifiers) %></label>
-            <%= check_box_tag 'settings[sequential_project_identifiers]', 1, Setting.sequential_project_identifiers? %><%= hidden_field_tag 'settings[sequential_project_identifiers]', 0 %></p>
+            <%= hidden_field_tag 'settings[sequential_project_identifiers]', 0 %>
+            <%= check_box_tag 'settings[sequential_project_identifiers]', 1, Setting.sequential_project_identifiers? %>
+            </p>
             <p><label><%= l(:setting_new_project_user_role_id) %></label>
             <%= select_tag('settings[new_project_user_role_id]', options_for_select([["--- #{l(:actionview_instancetag_blank_option)} ---", '']] + Role.find_all_givable.collect {|r| [r.name, r.id]}, Setting.new_project_user_role_id.to_i)) %></p>

0

app/views/settings/_repositories.rhtml +6 -2

             <div class="box tabular settings">
             <p><label><%= l(:setting_autofetch_changesets) %></label>
-            <%= check_box_tag 'settings[autofetch_changesets]', 1, Setting.autofetch_changesets? %><%= hidden_field_tag 'settings[autofetch_changesets]', 0 %></p>
+            <%= hidden_field_tag 'settings[autofetch_changesets]', 0 %>
+            <%= check_box_tag 'settings[autofetch_changesets]', 1, Setting.autofetch_changesets? %>
+            </p>
             <p><label><%= l(:setting_sys_api_enabled) %></label>
-            <%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
+            <%= hidden_field_tag 'settings[sys_api_enabled]', 0 %>
+            <%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %>
+            </p>
             <p><label><%= l(:setting_enabled_scm) %></label>
             <% REDMINE_SUPPORTED_SCM.each do |scm| -%>

0

config/boot.rb +3 -2

             # Don't change this file!
             # Configure your app in config/environment.rb and config/environments/*.rb
-            RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..") unless defined?(RAILS_ROOT)
+            RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
             module Rails
               class << self
                 def load_initializer
                   require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
                   Rails::Initializer.run(:install_gem_spec_stubs)
+                  Rails::GemDependency.add_frozen_gem_path
                 end
               end
                   end
                   def load_rubygems
+                    min_version = '1.3.2'
                     require 'rubygems'
-                    min_version = '1.3.1'
                     unless rubygems_version >= min_version
                       $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
                       exit 1

0

config/environment.rb +1 -1

             # ENV['RAILS_ENV'] ||= 'production'
             # Specifies gem version of Rails to use when vendor/rails is not present
-            RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+            RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
             # Bootstrap the Rails environment, frameworks, and default configuration
             require File.join(File.dirname(__FILE__), 'boot')

0

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

                         end
                       else
                         attr_name = @base.class.human_attribute_name(attr)
-                        full_messages << attr_name + ' ' + message
+                        full_messages << attr_name + ' ' + message.to_s
                       end
                     end
                   end

0

config/locales/bg.yml +16 0

@@ -59,6 +59,22 bg:
59	over_x_years:	59	over_x_years:
60	one: "over 1 year"	60	one: "over 1 year"
61	other: "over {{count}} years"	61	other: "over {{count}} years"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: 'MB'
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/bs.yml +10 -3

@@ -83,9 +83,16 bs:
83	format:	83	format:
84	delimiter: ""	84	delimiter: ""
85	precision: 1	85	precision: 1
86		86	storage_units:
87		87	format: "%n %u"
88		88	units:
		89	byte:
		90	one: "Byte"
		91	other: "Bytes"
		92	kb: "KB"
		93	mb: "MB"
		94	gb: "GB"
		95	tb: "TB"
89		96
90	# Used in array.to_sentence.	97	# Used in array.to_sentence.
91	support:	98	support:

0

config/locales/ca.yml +16 0

@@ -59,6 +59,22 ca:
59	over_x_years:	59	over_x_years:
60	one: "més d'un any"	60	one: "més d'un any"
61	other: "més de {{count}} anys"	61	other: "més de {{count}} anys"
		62
		63	number:
		64	human:
		65	format:
		66	delimiter: ""
		67	precision: 1
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	byte:
		72	one: "Byte"
		73	other: "Bytes"
		74	kb: "KB"
		75	mb: "MB"
		76	gb: "GB"
		77	tb: "TB"
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/cs.yml +16 0

@@ -59,6 +59,22 cs:
59	over_x_years:	59	over_x_years:
60	one: "více než 1 rok"	60	one: "více než 1 rok"
61	other: "více než {{count}} roky"	61	other: "více než {{count}} roky"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: MB
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/da.yml +10 -1

@@ -85,7 +85,16 da:
85	# separator:	85	# separator:
86	delimiter: ""	86	delimiter: ""
87	precision: 1	87	precision: 1
88	storage_units: [~~Bytes~~, KB, MB, GB, TB]	88	storage_units:
		89	format: "%n %u"
		90	units:
		91	byte:
		92	one: "Byte"
		93	other: "Bytes"
		94	kb: "KB"
		95	mb: "MB"
		96	gb: "GB"
		97	tb: "TB"
89	percentage:	98	percentage:
90	format:	99	format:
91	# separator:	100	# separator:

0

config/locales/de.yml +10 0

@@ -83,6 +83,16 de:
83	format:	83	format:
84	delimiter: ""	84	delimiter: ""
85	precision: 1	85	precision: 1
		86	storage_units:
		87	format: "%n %u"
		88	units:
		89	byte:
		90	one: "Byte"
		91	other: "Bytes"
		92	kb: "KB"
		93	mb: "MB"
		94	gb: "GB"
		95	tb: "TB"
86		96
87	support:	97	support:
88	array:	98	array:

0

config/locales/el.yml +16 0

@@ -63,6 +63,22 el:
63	one: "πάνω από 1 χρόνο"	63	one: "πάνω από 1 χρόνο"
64	other: "πάνω από {{count}} χρόνια"	64	other: "πάνω από {{count}} χρόνια"
65		65
		66	number:
		67	human:
		68	format:
		69	precision: 1
		70	delimiter: ""
		71	storage_units:
		72	format: "%n %u"
		73	units:
		74	kb: KB
		75	tb: TB
		76	gb: GB
		77	byte:
		78	one: Byte
		79	other: Bytes
		80	mb: MB
		81
66	# Used in array.to_sentence.	82	# Used in array.to_sentence.
67	support:	83	support:
68	array:	84	array:

0

config/locales/en.yml +17 0

@@ -59,6 +59,23 en:
59	over_x_years:	59	over_x_years:
60	one: "over 1 year"	60	one: "over 1 year"
61	other: "over {{count}} years"	61	other: "over {{count}} years"
		62
		63	number:
		64	human:
		65	format:
		66	delimiter: ""
		67	precision: 1
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	byte:
		72	one: "Byte"
		73	other: "Bytes"
		74	kb: "KB"
		75	mb: "MB"
		76	gb: "GB"
		77	tb: "TB"
		78
62		79
63	# Used in array.to_sentence.	80	# Used in array.to_sentence.
64	support:	81	support:

0

config/locales/es.yml +10 0

@@ -47,6 +47,16 es:
47	# separator:	47	# separator:
48	delimiter: ""	48	delimiter: ""
49	precision: 1	49	precision: 1
		50	storage_units:
		51	format: "%n %u"
		52	units:
		53	byte:
		54	one: "Byte"
		55	other: "Bytes"
		56	kb: "KB"
		57	mb: "MB"
		58	gb: "GB"
		59	tb: "TB"
50		60
51	# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()	61	# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
52	datetime:	62	datetime:

0

config/locales/fi.yml +10 -1

@@ -61,7 +61,16 fi:
61	format:	61	format:
62	delimiter: ""	62	delimiter: ""
63	precision: 1	63	precision: 1
64	storage_units: [~~Tavua~~, KB, MB, GB, TB]	64	storage_units:
		65	format: "%n %u"
		66	units:
		67	byte:
		68	one: "Tavua"
		69	other: "Tavua"
		70	kb: "KB"
		71	mb: "MB"
		72	gb: "GB"
		73	tb: "TB"
65		74
66	datetime:	75	datetime:
67	distance_in_words:	76	distance_in_words:

0

config/locales/fr.yml +10 -1

@@ -84,7 +84,16 fr:
84	human:	84	human:
85	format:	85	format:
86	precision: 2	86	precision: 2
87	storage_units: [ ~~Octet~~, ko, Mo, Go, To ]	87	storage_units:
		88	format: "%n %u"
		89	units:
		90	byte:
		91	one: "Octet"
		92	other: "Octet"
		93	kb: "ko"
		94	mb: "Mo"
		95	gb: "Go"
		96	tb: "To"
88		97
89	support:	98	support:
90	array:	99	array:

0

config/locales/gl.yml +10 0

@@ -33,6 +33,16 gl:
33	# separator:	33	# separator:
34	delimiter: ""	34	delimiter: ""
35	precision: 1	35	precision: 1
		36	storage_units:
		37	format: "%n %u"
		38	units:
		39	byte:
		40	one: "Byte"
		41	other: "Bytes"
		42	kb: "KB"
		43	mb: "MB"
		44	gb: "GB"
		45	tb: "TB"
36		46
37		47
38	date:	48	date:

0

config/locales/he.yml +11 0

@@ -76,6 +76,17 he:
76	unit: 'שח'	76	unit: 'שח'
77	precision: 2	77	precision: 2
78	format: '%u %n'	78	format: '%u %n'
		79	human:
		80	storage_units:
		81	format: "%n %u"
		82	units:
		83	byte:
		84	one: "Byte"
		85	other: "Bytes"
		86	kb: "KB"
		87	mb: "MB"
		88	gb: "GB"
		89	tb: "TB"
79		90
80	support:	91	support:
81	array:	92	array:

0

config/locales/hu.yml +10 -1

@@ -90,7 +90,16
90	format:	90	format:
91	delimiter: ""	91	delimiter: ""
92	precision: 1	92	precision: 1
93	storage_units: [~~bájt~~, KB, MB, GB, TB]	93	storage_units:
		94	format: "%n %u"
		95	units:
		96	byte:
		97	one: "bájt"
		98	other: "bájt"
		99	kb: "KB"
		100	mb: "MB"
		101	gb: "GB"
		102	tb: "TB"
94		103
95	support:	104	support:
96	array:	105	array:

0

config/locales/it.yml +11 0

@@ -74,6 +74,17 it:
74	unit: '€'	74	unit: '€'
75	precision: 2	75	precision: 2
76	format: '%n %u'	76	format: '%n %u'
		77	human:
		78	storage_units:
		79	format: "%n %u"
		80	units:
		81	byte:
		82	one: "Byte"
		83	other: "Bytes"
		84	kb: "KB"
		85	mb: "MB"
		86	gb: "GB"
		87	tb: "TB"
77		88
78	support:	89	support:
79	array:	90	array:

0

config/locales/ja.yml +10 0

@@ -96,6 +96,16 ja:
96	format:	96	format:
97	delimiter: ""	97	delimiter: ""
98	precision: 1	98	precision: 1
		99	storage_units:
		100	format: "%n %u"
		101	units:
		102	byte:
		103	one: "Byte"
		104	other: "Bytes"
		105	kb: "KB"
		106	mb: "MB"
		107	gb: "GB"
		108	tb: "TB"
99		109
100	activerecord:	110	activerecord:
101	errors:	111	errors:

0

config/locales/ko.yml +10 -1

@@ -116,7 +116,16 ko:
116	# separator:	116	# separator:
117	delimiter: ""	117	delimiter: ""
118	precision: 1	118	precision: 1
119	storage_units: [~~Bytes~~, KB, MB, GB, TB]	119	storage_units:
		120	format: "%n %u"
		121	units:
		122	byte:
		123	one: "Byte"
		124	other: "Bytes"
		125	kb: "KB"
		126	mb: "MB"
		127	gb: "GB"
		128	tb: "TB"
120		129
121	# Used in array.to_sentence.	130	# Used in array.to_sentence.
122	support:	131	support:

0

config/locales/lt.yml +10 -1

@@ -28,7 +28,16 lt:
28	format:	28	format:
29	delimiter: ""	29	delimiter: ""
30	precision: 1	30	precision: 1
31	storage_units: [~~baitai~~, KB, MB, GB, TB]	31	storage_units:
		32	format: "%n %u"
		33	units:
		34	byte:
		35	one: "baitai"
		36	other: "baitai"
		37	kb: "KB"
		38	mb: "MB"
		39	gb: "GB"
		40	tb: "TB"
32		41
33	datetime:	42	datetime:
34	distance_in_words:	43	distance_in_words:

0

config/locales/nl.yml +16 0

@@ -59,6 +59,22 nl:
59	over_x_years:	59	over_x_years:
60	one: "over 1 jaar"	60	one: "over 1 jaar"
61	other: "over {{count}} jaren"	61	other: "over {{count}} jaren"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: MB
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/no.yml +12 0

@@ -67,6 +67,18
67	format:	67	format:
68	delimiter: ""	68	delimiter: ""
69	precision: 4	69	precision: 4
		70	human:
		71	storage_units:
		72	format: "%n %u"
		73	units:
		74	byte:
		75	one: "Byte"
		76	other: "Bytes"
		77	kb: "KB"
		78	mb: "MB"
		79	gb: "GB"
		80	tb: "TB"
		81
70	activerecord:	82	activerecord:
71	errors:	83	errors:
72	template:	84	template:

0

config/locales/pl.yml +10 -1

@@ -21,7 +21,16 pl:
21	format:	21	format:
22	delimiter: ""	22	delimiter: ""
23	precision: 1	23	precision: 1
24	storage_units: [B, KB, MB, GB, TB]	24	storage_units:
		25	format: "%n %u"
		26	units:
		27	byte:
		28	one: "B"
		29	other: "B"
		30	kb: "KB"
		31	mb: "MB"
		32	gb: "GB"
		33	tb: "TB"
25		34
26	date:	35	date:
27	formats:	36	formats:

0

config/locales/pt-BR.yml +10 0

@@ -93,6 +93,16 pt-BR:
93	format:	93	format:
94	precision: 1	94	precision: 1
95	delimiter: '.'	95	delimiter: '.'
		96	storage_units:
		97	format: "%n %u"
		98	units:
		99	byte:
		100	one: "Byte"
		101	other: "Bytes"
		102	kb: "KB"
		103	mb: "MB"
		104	gb: "GB"
		105	tb: "TB"
96	support:	106	support:
97	array:	107	array:
98	sentence_connector: "e"	108	sentence_connector: "e"

0

config/locales/pt.yml +10 0

@@ -83,6 +83,16 pt:
83	format:	83	format:
84	precision: 1	84	precision: 1
85	delimiter: ''	85	delimiter: ''
		86	storage_units:
		87	format: "%n %u"
		88	units:
		89	byte:
		90	one: "Byte"
		91	other: "Bytes"
		92	kb: "KB"
		93	mb: "MB"
		94	gb: "GB"
		95	tb: "TB"
86		96
87	activerecord:	97	activerecord:
88	errors:	98	errors:

0

config/locales/ro.yml +16 0

@@ -57,6 +57,22 ro:
57	over_x_years:	57	over_x_years:
58	one: "peste un an"	58	one: "peste un an"
59	other: "peste {{count}} ani"	59	other: "peste {{count}} ani"
		60
		61	number:
		62	human:
		63	format:
		64	precision: 1
		65	delimiter: ""
		66	storage_units:
		67	format: "%n %u"
		68	units:
		69	kb: KB
		70	tb: TB
		71	gb: GB
		72	byte:
		73	one: Byte
		74	other: Bytes
		75	mb: MB
60		76
61	# Used in array.to_sentence.	77	# Used in array.to_sentence.
62	support:	78	support:

0

config/locales/sk.yml +16 0

@@ -59,6 +59,22 sk:
59	over_x_years:	59	over_x_years:
60	one: "cez 1 rok"	60	one: "cez 1 rok"
61	other: "cez {{count}} roky/ov"	61	other: "cez {{count}} roky/ov"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: MB
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/sl.yml +16 0

@@ -59,6 +59,22 sl:
59	over_x_years:	59	over_x_years:
60	one: "over 1 year"	60	one: "over 1 year"
61	other: "over {{count}} years"	61	other: "over {{count}} years"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: MB
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/sr.yml +11 0

@@ -81,6 +81,17
81	unit: 'ДИН'	81	unit: 'ДИН'
82	precision: 2	82	precision: 2
83	format: '%n %u'	83	format: '%n %u'
		84	human:
		85	storage_units:
		86	format: "%n %u"
		87	units:
		88	byte:
		89	one: "Byte"
		90	other: "Bytes"
		91	kb: "KB"
		92	mb: "MB"
		93	gb: "GB"
		94	tb: "TB"
84		95
85	support:	96	support:
86	array:	97	array:

0

config/locales/sv.yml +10 -1

@@ -47,7 +47,16 sv:
47	# separator:	47	# separator:
48	delimiter: ""	48	delimiter: ""
49	# precision: 1	49	# precision: 1
50	storage_units: [~~Byte~~, KB, MB, GB, TB]	50	storage_units:
		51	format: "%n %u"
		52	units:
		53	byte:
		54	one: "Byte"
		55	other: "Bytes"
		56	kb: "KB"
		57	mb: "MB"
		58	gb: "GB"
		59	tb: "TB"
51		60
52	# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()	61	# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
53	datetime:	62	datetime:

0

config/locales/th.yml +16 0

@@ -59,6 +59,22 th:
59	over_x_years:	59	over_x_years:
60	one: "over 1 year"	60	one: "over 1 year"
61	other: "over {{count}} years"	61	other: "over {{count}} years"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: MB
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/tr.yml +10 0

@@ -92,6 +92,16 tr:
92	delimiter: '.'	92	delimiter: '.'
93	separator: ','	93	separator: ','
94	precision: 2	94	precision: 2
		95	storage_units:
		96	format: "%n %u"
		97	units:
		98	byte:
		99	one: "Byte"
		100	other: "Bytes"
		101	kb: "KB"
		102	mb: "MB"
		103	gb: "GB"
		104	tb: "TB"
95		105
96	support:	106	support:
97	array:	107	array:

0

config/locales/uk.yml +16 0

@@ -59,6 +59,22 uk:
59	over_x_years:	59	over_x_years:
60	one: "over 1 year"	60	one: "over 1 year"
61	other: "over {{count}} years"	61	other: "over {{count}} years"
		62
		63	number:
		64	human:
		65	format:
		66	precision: 1
		67	delimiter: ""
		68	storage_units:
		69	format: "%n %u"
		70	units:
		71	kb: KB
		72	tb: TB
		73	gb: GB
		74	byte:
		75	one: Byte
		76	other: Bytes
		77	mb: MB
62		78
63	# Used in array.to_sentence.	79	# Used in array.to_sentence.
64	support:	80	support:

0

config/locales/vi.yml +10 -1

@@ -49,7 +49,16 vi:
49	# separator:	49	# separator:
50	delimiter: ""	50	delimiter: ""
51	precision: 1	51	precision: 1
52	storage_units: [~~Bytes~~, KB, MB, GB, TB]	52	storage_units:
		53	format: "%n %u"
		54	units:
		55	byte:
		56	one: "Byte"
		57	other: "Bytes"
		58	kb: "KB"
		59	mb: "MB"
		60	gb: "GB"
		61	tb: "TB"
53		62
54	# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()	63	# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
55	datetime:	64	datetime:

0

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

                     precision: 1
                     # 儲存單位輸出格式.
                     # %u 是儲存單位, %n 是數值 (預設值: 2 MB)
+                  storage_units:
                     format: "%n %u"
-                    storage_units:
+                    units:
                       byte:
                         one: "位元組 (B)"
                         other: "位元組 (B)"

0

config/locales/zh.yml +10 -1

@@ -86,7 +86,16 zh:
86	format:	86	format:
87	delimiter: ""	87	delimiter: ""
88	precision: 1	88	precision: 1
89	storage_units: [~~Bytes~~, KB, MB, GB, TB]	89	storage_units:
		90	format: "%n %u"
		91	units:
		92	byte:
		93	one: "Byte"
		94	other: "Bytes"
		95	kb: "KB"
		96	mb: "MB"
		97	gb: "GB"
		98	tb: "TB"
90		99
91	support:	100	support:
92	array:	101	array:

0

config/routes.rb 0 -5

               # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
               # Keep in mind you can assign values other than :controller and :action
-              # Allow Redmine plugins to map routes and potentially override them
-              Rails.plugins.each do |plugin|
-                map.from_plugin plugin.name.to_sym
-              end
               map.home '', :controller => 'welcome'
               map.signin 'login', :controller => 'account', :action => 'login'

0

lib/tabular_form_builder.rb +1 -1

                   return '' if options.delete(:no_label)
                   text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
                   text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
-                  text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
+                  text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
                   @template.content_tag("label", text,
                                                  :class => (@object && @object.errors[field] ? "error" : nil),
                                                  :for => (@object_name.to_s + "_" + field.to_s))

0

test/functional/account_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class AccountController; def rescue_action(e) raise e end; end
-            class AccountControllerTest < Test::Unit::TestCase
+            class AccountControllerTest < ActionController::TestCase
               fixtures :users, :roles
               def setup

0

test/functional/admin_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class AdminController; def rescue_action(e) raise e end; end
-            class AdminControllerTest < Test::Unit::TestCase
+            class AdminControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles
               def setup

0

test/functional/application_controller_test.rb +2 -2

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
-            require 'application'
+            require 'application_controller'
             # Re-raise errors caught by the controller.
             class ApplicationController; def rescue_action(e) raise e end; end
-            class ApplicationControllerTest < Test::Unit::TestCase
+            class ApplicationControllerTest < ActionController::TestCase
               include Redmine::I18n
               def setup

0

test/functional/attachments_controller_test.rb +1 -1

             class AttachmentsController; def rescue_action(e) raise e end; end
-            class AttachmentsControllerTest < Test::Unit::TestCase
+            class AttachmentsControllerTest < ActionController::TestCase
               fixtures :users, :projects, :roles, :members, :member_roles, :enabled_modules, :issues, :trackers, :attachments,
                        :versions, :wiki_pages, :wikis, :documents

0

test/functional/boards_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class BoardsController; def rescue_action(e) raise e end; end
-            class BoardsControllerTest < Test::Unit::TestCase
+            class BoardsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup

0

test/functional/custom_fields_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class CustomFieldsController; def rescue_action(e) raise e end; end
-            class CustomFieldsControllerTest < Test::Unit::TestCase
+            class CustomFieldsControllerTest < ActionController::TestCase
               fixtures :custom_fields, :trackers, :users
               def setup

0

test/functional/documents_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class DocumentsController; def rescue_action(e) raise e end; end
-            class DocumentsControllerTest < Test::Unit::TestCase
+            class DocumentsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :documents, :enumerations
               def setup

0

test/functional/enumerations_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class EnumerationsController; def rescue_action(e) raise e end; end
-            class EnumerationsControllerTest < Test::Unit::TestCase
+            class EnumerationsControllerTest < ActionController::TestCase
               fixtures :enumerations, :issues, :users
               def setup

0

test/functional/groups_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class GroupsController; def rescue_action(e) raise e end; end
-            class GroupsControllerTest < Test::Unit::TestCase
+            class GroupsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles
               def setup

0

test/functional/issue_categories_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class IssueCategoriesController; def rescue_action(e) raise e end; end
-            class IssueCategoriesControllerTest < Test::Unit::TestCase
+            class IssueCategoriesControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories
               def setup

0

test/functional/issue_relations_controller_test.rb +1 -1

             class IssueRelationsController; def rescue_action(e) raise e end; end
-            class IssueRelationsControllerTest < Test::Unit::TestCase
+            class IssueRelationsControllerTest < ActionController::TestCase
               fixtures :projects,
                        :users,
                        :roles,

0

test/functional/issues_controller_test.rb +31 -24

             # Re-raise errors caught by the controller.
             class IssuesController; def rescue_action(e) raise e end; end
-            class IssuesControllerTest < Test::Unit::TestCase
+            class IssuesControllerTest < ActionController::TestCase
               fixtures :projects,
                        :users,
                        :roles,
                        :custom_fields_trackers,
                        :time_entries,
                        :journals,
-                       :journal_details
+                       :journal_details,
+                       :queries
               def setup
                 @controller = IssuesController.new
               def test_post_new
                 @request.session[:user_id] = 2
-                post :new, :project_id => 1,
+                assert_difference 'Issue.count' do
-                           :issue => {:tracker_id => 3,
+                  post :new, :project_id => 1,
-                                      :subject => 'This is the test_new issue',
+                             :issue => {:tracker_id => 3,
-                                      :description => 'This is the description',
+                                        :subject => 'This is the test_new issue',
-                                      :priority_id => 5,
+                                        :description => 'This is the description',
-                                      :estimated_hours => '',
+                                        :priority_id => 5,
-                                      :custom_field_values => {'2' => 'Value for field 2'}}
+                                        :estimated_hours => '',
-                assert_redirected_to :action => 'show'
+                                        :custom_field_values => {'2' => 'Value for field 2'}}
+                end
+                assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
                 issue = Issue.find_by_subject('This is the test_new issue')
                 assert_not_nil issue
               def test_post_new_without_custom_fields_param
                 @request.session[:user_id] = 2
-                post :new, :project_id => 1,
+                assert_difference 'Issue.count' do
-                           :issue => {:tracker_id => 1,
+                  post :new, :project_id => 1,
-                                      :subject => 'This is the test_new issue',
+                             :issue => {:tracker_id => 1,
-                                      :description => 'This is the description',
+                                        :subject => 'This is the test_new issue',
-                                      :priority_id => 5}
+                                        :description => 'This is the description',
-                assert_redirected_to :action => 'show'
+                                        :priority_id => 5}
+                end
+                assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
               end
               def test_post_new_with_required_custom_field_and_without_custom_fields_param
               def test_post_new_should_send_a_notification
                 ActionMailer::Base.deliveries.clear
                 @request.session[:user_id] = 2
-                post :new, :project_id => 1,
+                assert_difference 'Issue.count' do
-                           :issue => {:tracker_id => 3,
+                  post :new, :project_id => 1,
-                                      :subject => 'This is the test_new issue',
+                             :issue => {:tracker_id => 3,
-                                      :description => 'This is the description',
+                                        :subject => 'This is the test_new issue',
-                                      :priority_id => 5,
+                                        :description => 'This is the description',
-                                      :estimated_hours => '',
+                                        :priority_id => 5,
-                                      :custom_field_values => {'2' => 'Value for field 2'}}
+                                        :estimated_hours => '',
-                assert_redirected_to :action => 'show'
+                                        :custom_field_values => {'2' => 'Value for field 2'}}
+                end
+                assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
                 assert_equal 1, ActionMailer::Base.deliveries.size
               end

0

test/functional/journals_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class JournalsController; def rescue_action(e) raise e end; end
-            class JournalsControllerTest < Test::Unit::TestCase
+            class JournalsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules
               def setup

0

test/functional/mail_handler_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class MailHandlerController; def rescue_action(e) raise e end; end
-            class MailHandlerControllerTest < Test::Unit::TestCase
+            class MailHandlerControllerTest < ActionController::TestCase
               fixtures :users, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses, :trackers, :enumerations
               FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'

0

test/functional/members_controller_test.rb +1 -1

             class MembersController; def rescue_action(e) raise e end; end
-            class MembersControllerTest < Test::Unit::TestCase
+            class MembersControllerTest < ActionController::TestCase
               fixtures :projects, :members, :member_roles, :roles, :users
               def setup

0

test/functional/messages_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class MessagesController; def rescue_action(e) raise e end; end
-            class MessagesControllerTest < Test::Unit::TestCase
+            class MessagesControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup

0

test/functional/my_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class MyController; def rescue_action(e) raise e end; end
-            class MyControllerTest < Test::Unit::TestCase
+            class MyControllerTest < ActionController::TestCase
               fixtures :users, :issues, :issue_statuses, :trackers, :enumerations, :custom_fields
               def setup

0

test/functional/news_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class NewsController; def rescue_action(e) raise e end; end
-            class NewsControllerTest < Test::Unit::TestCase
+            class NewsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments
               def setup

0

test/functional/projects_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
-            class ProjectsControllerTest < Test::Unit::TestCase
+            class ProjectsControllerTest < ActionController::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
                        :attachments

0

test/functional/queries_controller_test.rb +4 -4

             # Re-raise errors caught by the controller.
             class QueriesController; def rescue_action(e) raise e end; end
-            class QueriesControllerTest < Test::Unit::TestCase
+            class QueriesControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
               def setup
                      :query => {"name" => "test_new_project_public_query", "is_public" => "1"}
                 q = Query.find_by_name('test_new_project_public_query')
-                assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+                assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
                 assert q.is_public?
                 assert q.has_default_columns?
                 assert q.valid?
                      :query => {"name" => "test_new_project_private_query", "is_public" => "1"}
                 q = Query.find_by_name('test_new_project_private_query')
-                assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+                assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
                 assert !q.is_public?
                 assert q.has_default_columns?
                 assert q.valid?
                      :query => {"name" => "test_new_global_private_query", "is_public" => "1", "column_names" => ["", "tracker", "subject", "priority", "category"]}
                 q = Query.find_by_name('test_new_global_private_query')
-                assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+                assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q
                 assert !q.is_public?
                 assert !q.has_default_columns?
                 assert_equal [:tracker, :subject, :priority, :category], q.columns.collect {|c| c.name}

0

test/functional/reports_controller_test.rb +1 -1

             class ReportsController; def rescue_action(e) raise e end; end
-            class ReportsControllerTest < Test::Unit::TestCase
+            class ReportsControllerTest < ActionController::TestCase
               fixtures :all
               def setup

0

test/functional/repositories_bazaar_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesBazaarControllerTest < Test::Unit::TestCase
+            class RepositoriesBazaarControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path

0

test/functional/repositories_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesControllerTest < Test::Unit::TestCase
+            class RepositoriesControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               def setup

0

test/functional/repositories_cvs_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesCvsControllerTest < Test::Unit::TestCase
+            class RepositoriesCvsControllerTest < ActionController::TestCase
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'

0

test/functional/repositories_darcs_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesDarcsControllerTest < Test::Unit::TestCase
+            class RepositoriesDarcsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path

0

test/functional/repositories_git_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesGitControllerTest < Test::Unit::TestCase
+            class RepositoriesGitControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path

0

test/functional/repositories_mercurial_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesMercurialControllerTest < Test::Unit::TestCase
+            class RepositoriesMercurialControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path

0

test/functional/repositories_subversion_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
-            class RepositoriesSubversionControllerTest < Test::Unit::TestCase
+            class RepositoriesSubversionControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers

0

test/functional/roles_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class RolesController; def rescue_action(e) raise e end; end
-            class RolesControllerTest < Test::Unit::TestCase
+            class RolesControllerTest < ActionController::TestCase
               fixtures :roles, :users, :members, :member_roles, :workflows
               def setup

0

test/functional/search_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class SearchController; def rescue_action(e) raise e end; end
-            class SearchControllerTest < Test::Unit::TestCase
+            class SearchControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles,
                        :issues, :trackers, :issue_statuses,
                        :custom_fields, :custom_values,

0

test/functional/settings_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class SettingsController; def rescue_action(e) raise e end; end
-            class SettingsControllerTest < Test::Unit::TestCase
+            class SettingsControllerTest < ActionController::TestCase
               fixtures :users
               def setup

0

test/functional/sys_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class SysController; def rescue_action(e) raise e end; end
-            class SysControllerTest < Test::Unit::TestCase
+            class SysControllerTest < ActionController::TestCase
               fixtures :projects, :repositories
               def setup

0

test/functional/timelog_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class TimelogController; def rescue_action(e) raise e end; end
-            class TimelogControllerTest < Test::Unit::TestCase
+            class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
               def setup

0

test/functional/trackers_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class TrackersController; def rescue_action(e) raise e end; end
-            class TrackersControllerTest < Test::Unit::TestCase
+            class TrackersControllerTest < ActionController::TestCase
               fixtures :trackers, :projects, :projects_trackers, :users, :issues
               def setup

0

test/functional/users_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class UsersController; def rescue_action(e) raise e end; end
-            class UsersControllerTest < Test::Unit::TestCase
+            class UsersControllerTest < ActionController::TestCase
               include Redmine::I18n
               fixtures :users, :projects, :members, :member_roles, :roles

0

test/functional/versions_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class VersionsController; def rescue_action(e) raise e end; end
-            class VersionsControllerTest < Test::Unit::TestCase
+            class VersionsControllerTest < ActionController::TestCase
               fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules
               def setup

0

test/functional/watchers_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class WatchersController; def rescue_action(e) raise e end; end
-            class WatchersControllerTest < Test::Unit::TestCase
+            class WatchersControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers

0

test/functional/welcome_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class WelcomeController; def rescue_action(e) raise e end; end
-            class WelcomeControllerTest < Test::Unit::TestCase
+            class WelcomeControllerTest < ActionController::TestCase
               fixtures :projects, :news
               def setup

0

test/functional/wiki_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class WikiController; def rescue_action(e) raise e end; end
-            class WikiControllerTest < Test::Unit::TestCase
+            class WikiControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :attachments
               def setup

0

test/functional/wikis_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class WikisController; def rescue_action(e) raise e end; end
-            class WikisControllerTest < Test::Unit::TestCase
+            class WikisControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis
               def setup

0

test/functional/workflows_controller_test.rb +1 -1

             # Re-raise errors caught by the controller.
             class WorkflowsController; def rescue_action(e) raise e end; end
-            class WorkflowsControllerTest < Test::Unit::TestCase
+            class WorkflowsControllerTest < ActionController::TestCase
               fixtures :roles, :trackers, :workflows
               def setup

0

test/helper_testcase.rb +1 -1

               attr_accessor :request, :url
             end
-            class HelperTestCase < Test::Unit::TestCase
+            class HelperTestCase < ActiveSupport::TestCase
               # Add other helpers here if you need them
               include ActionView::Helpers::ActiveRecordHelper

0

test/test_helper.rb +2 -2

             require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
             require File.join(RAILS_ROOT,'test', 'mocks', 'open_id_authentication_mock.rb')
-            class Test::Unit::TestCase
+            class ActiveSupport::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method
               # in a transaction that's rolled back on completion.  This ensures that the
               # test database remains unchanged so your fixtures don't have to be reloaded
               end
               def test_uploaded_file(name, mime)
-                ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + "/files/#{name}", mime)
+                ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime)
               end
               # Use a temporary directory for attachment related tests

0

test/unit/activity_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class ActivityTest < Test::Unit::TestCase
+            class ActivityTest < ActiveSupport::TestCase
               fixtures :projects, :versions, :attachments, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages

0

test/unit/attachment_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class AttachmentTest < Test::Unit::TestCase
+            class AttachmentTest < ActiveSupport::TestCase
               fixtures :issues, :users
               def setup

0

test/unit/auth_source_ldap_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class AuthSourceLdapTest < Test::Unit::TestCase
+            class AuthSourceLdapTest < ActiveSupport::TestCase
               def setup
               end

0

test/unit/board_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class BoardTest < Test::Unit::TestCase
+            class BoardTest < ActiveSupport::TestCase
               fixtures :projects, :boards, :messages
               def setup

0

test/unit/calendar_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class CalendarTest < Test::Unit::TestCase
+            class CalendarTest < ActiveSupport::TestCase
               def test_monthly
                 c = Redmine::Helpers::Calendar.new(Date.today, :fr, :month)

0

test/unit/changeset_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class ChangesetTest < Test::Unit::TestCase
+            class ChangesetTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :member_roles, :trackers
               def setup

0

test/unit/comment_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class CommentTest < Test::Unit::TestCase
+            class CommentTest < ActiveSupport::TestCase
               fixtures :users, :news, :comments
               def setup

0

test/unit/custom_field_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class CustomFieldTest < Test::Unit::TestCase
+            class CustomFieldTest < ActiveSupport::TestCase
               fixtures :custom_fields
               def test_create

0

test/unit/custom_value_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class CustomValueTest < Test::Unit::TestCase
+            class CustomValueTest < ActiveSupport::TestCase
               fixtures :custom_fields
               def test_string_field_validation_with_blank_value

0

test/unit/default_data_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class DefaultDataTest < Test::Unit::TestCase
+            class DefaultDataTest < ActiveSupport::TestCase
               include Redmine::I18n
               fixtures :roles

0

test/unit/document_category_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class DocumentCategoryTest < Test::Unit::TestCase
+            class DocumentCategoryTest < ActiveSupport::TestCase
               fixtures :enumerations, :documents
               def test_should_be_an_enumeration

0

test/unit/document_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class DocumentTest < Test::Unit::TestCase
+            class DocumentTest < ActiveSupport::TestCase
               fixtures :projects, :enumerations, :documents
               def test_create

0

test/unit/enabled_module_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class EnabledModuleTest < Test::Unit::TestCase
+            class EnabledModuleTest < ActiveSupport::TestCase
               fixtures :projects, :wikis
               def test_enabling_wiki_should_create_a_wiki

0

test/unit/enumeration_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class EnumerationTest < Test::Unit::TestCase
+            class EnumerationTest < ActiveSupport::TestCase
               fixtures :enumerations, :issues
               def setup

0

test/unit/filesystem_adapter_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class FilesystemAdapterTest < Test::Unit::TestCase
+            class FilesystemAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'

0

test/unit/git_adapter_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class GitAdapterTest < Test::Unit::TestCase
+            class GitAdapterTest < ActiveSupport::TestCase
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               if File.directory?(REPOSITORY_PATH)

0

test/unit/group_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class GroupTest < Test::Unit::TestCase
+            class GroupTest < ActiveSupport::TestCase
               fixtures :all
               def test_create

0

test/unit/issue_category_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class IssueCategoryTest < Test::Unit::TestCase
+            class IssueCategoryTest < ActiveSupport::TestCase
               fixtures :issue_categories, :issues
               def setup

0

test/unit/issue_priority_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class IssuePriorityTest < Test::Unit::TestCase
+            class IssuePriorityTest < ActiveSupport::TestCase
               fixtures :enumerations, :issues
               def test_should_be_an_enumeration

0

test/unit/issue_status_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class IssueStatusTest < Test::Unit::TestCase
+            class IssueStatusTest < ActiveSupport::TestCase
               fixtures :issue_statuses, :issues
               def test_create

0

test/unit/issue_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class IssueTest < Test::Unit::TestCase
+            class IssueTest < ActiveSupport::TestCase
               fixtures :projects, :users, :members, :member_roles,
                        :trackers, :projects_trackers,
                        :issue_statuses, :issue_categories, :issue_relations, :workflows,

0

test/unit/journal_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class JournalTest < Test::Unit::TestCase
+            class JournalTest < ActiveSupport::TestCase
               fixtures :issues, :issue_statuses, :journals, :journal_details
               def setup

0

test/unit/lib/redmine/access_control_test.rb +1 -1

             require File.dirname(__FILE__) + '/../../../test_helper'
-            class Redmine::AccessControlTest < Test::Unit::TestCase
+            class Redmine::AccessControlTest < ActiveSupport::TestCase
               def setup
                 @access_module = Redmine::AccessControl

0

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

             require File.dirname(__FILE__) + '/../../../test_helper'
-            class Redmine::Hook::ManagerTest < Test::Unit::TestCase
+            class Redmine::Hook::ManagerTest < ActiveSupport::TestCase
               fixtures :issues

0

test/unit/lib/redmine/i18n_test.rb +1 -1

             require File.dirname(__FILE__) + '/../../../test_helper'
-            class Redmine::I18nTest < Test::Unit::TestCase
+            class Redmine::I18nTest < ActiveSupport::TestCase
               include Redmine::I18n
               def setup

0

test/unit/lib/redmine/mime_type_test.rb +1 -1

             require File.dirname(__FILE__) + '/../../../test_helper'
-            class Redmine::MimeTypeTest < Test::Unit::TestCase
+            class Redmine::MimeTypeTest < ActiveSupport::TestCase
               def test_of
                 to_test = {'test.unk' => nil,

0

test/unit/lib/redmine/plugin_test.rb +1 -1

             require File.dirname(__FILE__) + '/../../../test_helper'
-            class Redmine::PluginTest < Test::Unit::TestCase
+            class Redmine::PluginTest < ActiveSupport::TestCase
               def setup
                 @klass = Redmine::Plugin

0

test/unit/lib/redmine/unified_diff_test.rb +1 -1

             require File.dirname(__FILE__) + '/../../../test_helper'
-            class Redmine::UnifiedDiffTest < Test::Unit::TestCase
+            class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
               def setup
               end

0

test/unit/mail_handler_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class MailHandlerTest < Test::Unit::TestCase
+            class MailHandlerTest < ActiveSupport::TestCase
               fixtures :users, :projects,
                                :enabled_modules,
                                :roles,

0

test/unit/mailer_test.rb +13 -3

             require File.dirname(__FILE__) + '/../test_helper'
-            class MailerTest < Test::Unit::TestCase
+            class MailerTest < ActiveSupport::TestCase
               include Redmine::I18n
               fixtures :projects, :issues, :users, :members, :member_roles, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
                 journal = Journal.find(2)
                 Mailer.deliver_issue_edit(journal)
                 mail = ActionMailer::Base.deliveries.last
-                assert !mail.body.include?('<a href="https://mydomain.foo/issues/1">Bug #1: Can\'t print recipes</a>')
+                assert_equal 1, mail.parts.size
+                assert !mail.encoded.include?('href')
               end
+              def test_html_mail
+                Setting.plain_text_mail = 0
+                journal = Journal.find(2)
+                Mailer.deliver_issue_edit(journal)
+                mail = ActionMailer::Base.deliveries.last
+                assert_equal 2, mail.parts.size
+                assert mail.encoded.include?('href')
+              end
               def test_issue_add_message_id
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.find(1)

0

test/unit/member_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class MemberTest < Test::Unit::TestCase
+            class MemberTest < ActiveSupport::TestCase
               fixtures :users, :projects, :roles, :members, :member_roles
               def setup

0

test/unit/mercurial_adapter_test.rb +1 -1

             begin
               require 'mocha'
-              class MercurialAdapterTest < Test::Unit::TestCase
+              class MercurialAdapterTest < ActiveSupport::TestCase
                 TEMPLATES_DIR = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATES_DIR
                 TEMPLATE_NAME = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME

0

test/unit/message_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class MessageTest < Test::Unit::TestCase
+            class MessageTest < ActiveSupport::TestCase
               fixtures :projects, :roles, :members, :member_roles, :boards, :messages, :users, :watchers
               def setup

0

test/unit/news_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class NewsTest < Test::Unit::TestCase
+            class NewsTest < ActiveSupport::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news
               def valid_news

0

test/unit/project_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class ProjectTest < Test::Unit::TestCase
+            class ProjectTest < ActiveSupport::TestCase
               fixtures :projects, :enabled_modules,
                        :issues, :issue_statuses, :journals, :journal_details,
                        :users, :members, :member_roles, :roles, :projects_trackers, :trackers, :boards,

0

test/unit/query_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class QueryTest < Test::Unit::TestCase
+            class QueryTest < ActiveSupport::TestCase
               fixtures :projects, :enabled_modules, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :watchers, :custom_fields, :custom_values, :versions, :queries
               def test_custom_fields_for_all_projects_should_be_available_in_global_queries

0

test/unit/repository_bazaar_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositoryBazaarTest < Test::Unit::TestCase
+            class RepositoryBazaarTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path

0

test/unit/repository_cvs_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             require 'pp'
-            class RepositoryCvsTest < Test::Unit::TestCase
+            class RepositoryCvsTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path

0

test/unit/repository_darcs_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositoryDarcsTest < Test::Unit::TestCase
+            class RepositoryDarcsTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path

0

test/unit/repository_filesystem_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositoryFilesystemTest < Test::Unit::TestCase
+            class RepositoryFilesystemTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path

0

test/unit/repository_git_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositoryGitTest < Test::Unit::TestCase
+            class RepositoryGitTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path

0

test/unit/repository_mercurial_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositoryMercurialTest < Test::Unit::TestCase
+            class RepositoryMercurialTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path

0

test/unit/repository_subversion_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositorySubversionTest < Test::Unit::TestCase
+            class RepositorySubversionTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path for svn

0

test/unit/repository_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RepositoryTest < Test::Unit::TestCase
+            class RepositoryTest < ActiveSupport::TestCase
               fixtures :projects,
                        :trackers,
                        :projects_trackers,

0

test/unit/role_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class RoleTest < Test::Unit::TestCase
+            class RoleTest < ActiveSupport::TestCase
               fixtures :roles, :workflows
               def test_copy_workflows

0

test/unit/search_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class SearchTest < Test::Unit::TestCase
+            class SearchTest < ActiveSupport::TestCase
               fixtures :users,
                        :members,
                        :member_roles,

0

test/unit/setting_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class SettingTest < Test::Unit::TestCase
+            class SettingTest < ActiveSupport::TestCase
               def test_read_default
                 assert_equal "Redmine", Setting.app_title

0

test/unit/subversion_adapter_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class SubversionAdapterTest < Test::Unit::TestCase
+            class SubversionAdapterTest < ActiveSupport::TestCase
               if find_executable0('svn')
                 def test_client_version

0

test/unit/time_entry_activity_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class TimeEntryActivityTest < Test::Unit::TestCase
+            class TimeEntryActivityTest < ActiveSupport::TestCase
               fixtures :enumerations, :time_entries
               def test_should_be_an_enumeration

0

test/unit/time_entry_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class TimeEntryTest < Test::Unit::TestCase
+            class TimeEntryTest < ActiveSupport::TestCase
               fixtures :issues, :projects, :users, :time_entries
               def test_hours_format

0

test/unit/token_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class TokenTest < Test::Unit::TestCase
+            class TokenTest < ActiveSupport::TestCase
               fixtures :tokens
               def test_create

0

test/unit/tracker_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class TrackerTest < Test::Unit::TestCase
+            class TrackerTest < ActiveSupport::TestCase
               fixtures :trackers, :workflows
               def test_copy_workflows

0

test/unit/user_preference_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class UserPreferenceTest < Test::Unit::TestCase
+            class UserPreferenceTest < ActiveSupport::TestCase
               fixtures :users, :user_preferences
               def test_create

0

test/unit/user_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class UserTest < Test::Unit::TestCase
+            class UserTest < ActiveSupport::TestCase
               fixtures :users, :members, :projects, :roles, :member_roles
               def setup

0

test/unit/version_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class VersionTest < Test::Unit::TestCase
+            class VersionTest < ActiveSupport::TestCase
               fixtures :projects, :users, :issues, :issue_statuses, :trackers, :enumerations, :versions
               def setup

0

test/unit/watcher_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class WatcherTest < Test::Unit::TestCase
+            class WatcherTest < ActiveSupport::TestCase
               fixtures :issues, :users
               def setup

0

test/unit/wiki_content_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class WikiContentTest < Test::Unit::TestCase
+            class WikiContentTest < ActiveSupport::TestCase
               fixtures :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :users
               def setup

0

test/unit/wiki_page_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class WikiPageTest < Test::Unit::TestCase
+            class WikiPageTest < ActiveSupport::TestCase
               fixtures :projects, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
               def setup

0

test/unit/wiki_redirect_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class WikiRedirectTest < Test::Unit::TestCase
+            class WikiRedirectTest < ActiveSupport::TestCase
               fixtures :projects, :wikis
               def setup

0

test/unit/wiki_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
-            class WikiTest < Test::Unit::TestCase
+            class WikiTest < ActiveSupport::TestCase
               fixtures :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
               def test_create

0

vendor/plugins/engines/Rakefile +18 -5

@@ -172,16 +172,29 namespace :test do
172		172
173	desc 'Update the plugin and tests files in the test application from the plugin'	173	desc 'Update the plugin and tests files in the test application from the plugin'
174	task :mirror_engine_files => [:test_app, :copy_engines_plugin] do	174	task :mirror_engine_files => [:test_app, :copy_engines_plugin] do
175	puts "> Modifying default config files to load engines plugin"	175	puts "> Tweaking generated application to be suitable for testing"
		176
		177	# Replace the Rails plugin loader with the engines one.
176	insert_line("require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')",	178	insert_line("require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')",
177	:into => 'config/environment.rb',	179	:into => 'config/environment.rb',
178	:after => "require File.join(File.dirname(__FILE__), 'boot')")	180	:after => "require File.join(File.dirname(__FILE__), 'boot')")
179		181
180	insert_line('map.from_plugin :test_routing', :into => 'config/routes.rb',	182	# Add the engines test helper to handle fixtures & stuff.
181	:after => /\AActionController::Routing::Routes/)
182
183	insert_line("require 'engines_test_helper'", :into => 'test/test_helper.rb')	183	insert_line("require 'engines_test_helper'", :into => 'test/test_helper.rb')
184		184
		185	# Run engine plugin tests when running the application
		186	insert_line("task :test => ['test:engines:all']", :into => 'Rakefile')
		187
		188	# We want exceptions to be raised
		189	insert_line("def rescue_action(e) raise e end;",
		190	:into => "app/controllers/application_controller.rb",
		191	:after => "class ApplicationController < ActionController::Base")
		192
		193	# We need this method to test where actions are being rendered from.
		194	insert_line("include RenderInformation",
		195	:into => "app/controllers/application_controller.rb",
		196	:after => "class ApplicationController < ActionController::Base")
		197
185	puts "> Mirroring test application files into #{test_app_dir}"	198	puts "> Mirroring test application files into #{test_app_dir}"
186	mirror_test_files('app')	199	mirror_test_files('app')
187	mirror_test_files('lib')	200	mirror_test_files('lib')

0

vendor/plugins/engines/about.yml +1 -1

             summary: Enhances the plugin mechanism to perform more flexible sharing
             description: The Rails Engines plugin allows the sharing of almost any type of code or asset that you could use in a Rails application, including controllers, models, stylesheets, and views.
             license: MIT
-            version: 2.1.0
  No newline at end of file
+            version: 2.3.2
  No newline at end of file

0

vendor/plugins/engines/boot.rb +2 -2

             begin
               require 'rails/version'
-              unless Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 2 && Rails::VERSION::TINY >= 0
+              unless Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 3 && Rails::VERSION::TINY >= 2
-                raise "This version of the engines plugin requires Rails 2.2.0 or later!"
+                raise "This version of the engines plugin requires Rails 2.3.2 or later!"
               end
             end

0

vendor/plugins/engines/init.rb +2 -2

             # Only call Engines.init once, in the after_initialize block so that Rails
             # plugin reloading works when turned on
             config.after_initialize do
-              Engines.init if defined? :Engines
+              Engines.init(initializer) if defined? :Engines
-            end
+            end
  No newline at end of file

0

vendor/plugins/engines/lib/engines.rb +5 -5

               # List of extensions to load, can be changed in init.rb before calling Engines.init
               mattr_accessor :rails_extensions
-              self.rails_extensions = %w(action_mailer asset_helpers form_tag_helpers routing migrations dependencies)
+              self.rails_extensions = %w(asset_helpers form_tag_helpers migrations dependencies)
               # The name of the public directory to mirror public engine assets into.
               # Defaults to <tt>RAILS_ROOT/public/plugin_assets</tt>.
               mattr_accessor :disable_application_code_loading
               self.disable_application_code_loading = false
-              # Set this ti true if code should not be mixed (i.e. it will be loaded
+              # Set this to true if code should not be mixed (i.e. it will be loaded
               # from the first valid path on $LOAD_PATH)
               mattr_accessor :disable_code_mixing
               self.disable_code_mixing = false
               self.code_mixing_file_types = %w(controller helper)
               class << self
-                def init
+                def init(initializer)
                   load_extensions
                   Engines::Assets.initialize_base_public_directory
                 end
                 # and that they are placed within plugin/app/things (the pluralized form of 'thing').
                 #
                 # It's important to note that you'll also want to ensure that the "things" are
-                # on your load path in your plugin's init.rb:
+                # on your load path by including them in Rails load path mechanism, e.g. in init.rb:
                 #
-                #   Rails.plugins[:my_plugin].code_paths << "app/things"
+                #  ActiveSupport::Dependencies.load_paths << File.join(File.dirname(__FILE__), 'app', 'things'))
                 #
                 def mix_code_from(*types)
                   self.code_mixing_file_types += types.map { |x| x.to_s.singularize }

0

vendor/plugins/engines/lib/engines/plugin.rb +1 -48

             #
             #   Engines.plugins[:plugin_name]
             #
-            # If this plugin contains paths in directories other than <tt>app/controllers</tt>,
-            # <tt>app/helpers</tt>, <tt>app/models</tt> and <tt>components</tt>, authors can
-            # declare this by adding extra paths to #code_paths:
-            #    Rails.plugin[:my_plugin].code_paths << "app/sweepers" << "vendor/my_lib"
             # Other properties of the Plugin instance can also be set.
             module Engines
               class Plugin < Rails::Plugin
-                # Plugins can add code paths to this attribute in init.rb if they
-                # need plugin directories to be added to the load path, i.e.
-                #   plugin.code_paths << 'app/other_classes'
-                # Defaults to ["app/controllers", "app/helpers", "app/models", "components"]
-                attr_accessor :code_paths
                 # Plugins can add paths to this attribute in init.rb if they need
                 # controllers loaded from additional locations.
                 attr_accessor :controller_paths
                 attr_accessor :public_directory
                 protected
-                  # The default set of code paths which will be added to $LOAD_PATH
-                  # and Dependencies.load_paths
-                  def default_code_paths
-                    # lib will actually be removed from the load paths when we call
-                    # uniq! in #inject_into_load_paths, but it's important to keep it
-                    # around (for the documentation tasks, for instance).
-                    %w(app/controllers app/helpers app/models components lib)
-                  end
                   # The default set of code paths which will be added to the routing system
                   def default_controller_paths
                     %w(app/controllers components)
                 def initialize(directory)
                   super directory
-                  @code_paths = default_code_paths
                   @controller_paths = default_controller_paths
                   @public_directory = default_public_directory
                 end
-                # Returns a list of paths this plugin wishes to make available in $LOAD_PATH
-                # Overwrites the correspondend method in the superclass
-                def load_paths
-                  report_nonexistant_or_empty_plugin! unless valid?
-                  select_existing_paths :code_paths
-                end
                 # Extends the superclass' load method to additionally mirror public assets
                 def load(initializer)
                   return if loaded?
                   super initializer
-                  add_plugin_view_paths
                   add_plugin_locale_paths
                   Assets.mirror_files_for(self)
                 end
-                # for code_paths and controller_paths select those paths that actually
+                # select those paths that actually exist in the plugin's directory
-                # exist in the plugin's directory
                 def select_existing_paths(name)
                   Engines.select_existing_paths(self.send(name).map { |p| File.join(directory, p) })
                 end
-                def add_plugin_view_paths
-                  view_path = File.join(directory, 'app', 'views')
-                  if File.exist?(view_path)
-                    ActionController::Base.prepend_view_path(view_path) # push it just underneath the app
-                  end
-                end
                 def add_plugin_locale_paths
                   locale_path = File.join(directory, 'locales')
                   return unless File.exists?(locale_path)
                   "#{File.basename(Engines.public_directory)}/#{name}"
                 end
-                # The path to this plugin's routes file
-                def routes_path
-                  File.join(directory, "routes.rb")
-                end
                 # The directory containing this plugin's migrations (<tt>plugin/db/migrate</tt>)
                 def migration_directory
                   File.join(self.directory, 'db', 'migrate')

0

vendor/plugins/engines/lib/engines/plugin/loader.rb 0 -7

                     def register_plugin_as_loaded(plugin)
                       super plugin
                       Engines.plugins << plugin
-                      register_to_routing(plugin)
                     end
-                    # Registers the plugin's controller_paths for the routing system.
-                    def register_to_routing(plugin)
-                      initializer.configuration.controller_paths += plugin.select_existing_paths(:controller_paths)
-                      initializer.configuration.controller_paths.uniq!
-                    end
                 end
               end
             end

0

vendor/plugins/engines/lib/engines/testing.rb +15 -1

               # This method is called by the engines-supplied plugin testing rake tasks
               def self.setup_plugin_fixtures(plugins = Engines.plugins.by_precedence)
+                # First, clear the directory
+                Dir.glob("#{self.temporary_fixtures_directory}/*.yml").each{|fixture| File.delete(fixture)}
                 # Copy all plugin fixtures, and then the application fixtures, into this directory
                 plugins.each do |plugin|
                   plugin_fixtures_directory =  File.join(plugin.directory, "test", "fixtures")
-                  if File.directory?(plugin_fixtures_directory)
+                  plugin_app_directory =  File.join(plugin.directory, "app")
+                  if File.directory?(plugin_app_directory) && File.directory?(plugin_fixtures_directory)
                     Engines.mirror_files_from(plugin_fixtures_directory, self.temporary_fixtures_directory)
                   end
                 end
                 ActiveSupport::TestCase.fixture_path = self.temporary_fixtures_directory
                 $LOAD_PATH.unshift self.temporary_fixtures_directory
               end
+              # overridden test should be in test/{unit,functional,integration}/{plugin_name}/{test_name}
+              def self.override_tests_from_app
+                filename = caller.first.split(":").first
+                plugin_name = filename.split("/")[-4]
+                test_kind = filename.split("/")[-2]
+                override_file = File.expand_path(File.join(File.dirname(filename), "..", "..", "..", "..", "..", "test",
+                                                           test_kind, plugin_name, File.basename(filename)))
+                load(override_file) if File.exist?(override_file)
+              end
             end

0

vendor/plugins/engines/tasks/engines.rake +35 -7

                 end
                 desc 'Migrate a specified plugin.'
-                task({:plugin => :environment}, :name, :version) do |task, args|
+                task(:plugin => :environment) do
-                  name = args[:name] || ENV['NAME']
+                  name = ENV['NAME']
                   if plugin = Engines.plugins[name]
-                    version = args[:version] || ENV['VERSION']
+                    version = ENV['VERSION']
                     puts "Migrating #{plugin.name} to " + (version ? "version #{version}" : 'latest version') + " ..."
                     plugin.migrate(version ? version.to_i : nil)
                   else
             # this is just a modification of the original task in railties/lib/tasks/documentation.rake,
             # because the default task doesn't support subdirectories like <plugin>/app or
-            # <plugin>/component. These tasks now include every file under a plugin's code paths (see
+            # <plugin>/component. These tasks now include every file under a plugin's load paths (see
-            # Plugin#code_paths).
+            # Plugin#load_paths).
             namespace :doc do
               plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
                     options << '--line-numbers' << '--inline-source'
                     options << '-T html'
-                    # Include every file in the plugin's code_paths (see Plugin#code_paths)
+                    # Include every file in the plugin's load_paths (see Plugin#load_paths)
                     if Engines.plugins[plugin]
-                      files.include("#{plugin_base}/{#{Engines.plugins[plugin].code_paths.join(",")}}/**/*.rb")
+                      files.include("#{plugin_base}/{#{Engines.plugins[plugin].load_paths.join(",")}}/**/*.rb")
                     end
                     if File.exists?("#{plugin_base}/README")
                       files.include("#{plugin_base}/README")
             -~===============( ... as you were ... )============================~-}
               end
+              namespace :engines do
+                def engine_plugins
+                  Dir["vendor/plugins/*"].select { |f| File.directory?(File.join(f, "app")) }.map { |f| File.basename(f) }.join(",")
+                end
+                desc "Run tests from within engines plugins (plugins with an 'app' directory)"
+                task :all => [:units, :functionals, :integration]
+                desc "Run unit tests from within engines plugins (plugins with an 'app' directory)"
+                Rake::TestTask.new(:units => "test:plugins:setup_plugin_fixtures") do |t|
+                  t.pattern = "vendor/plugins/{#{ENV['PLUGIN'] || engine_plugins}}/test/unit/**/*_test.rb"
+                  t.verbose = true
+                end
+                desc "Run functional tests from within engines plugins (plugins with an 'app' directory)"
+                Rake::TestTask.new(:functionals => "test:plugins:setup_plugin_fixtures") do |t|
+                  t.pattern = "vendor/plugins/{#{ENV['PLUGIN'] || engine_plugins}}/test/functional/**/*_test.rb"
+                  t.verbose = true
+                end
+                desc "Run integration tests from within engines plugins (plugins with an 'app' directory)"
+                Rake::TestTask.new(:integration => "test:plugins:setup_plugin_fixtures") do |t|
+                  t.pattern = "vendor/plugins/{#{ENV['PLUGIN'] || engine_plugins}}/test/integration/**/*_test.rb"
+                  t.verbose = true
+                end
+              end
               namespace :plugins do
                 desc "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"

0

vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb removed 0 -82

1

NO CONTENT: file was removed

0

vendor/plugins/engines/lib/engines/rails_extensions/routing.rb removed 0 -83

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