mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
make turn a soft dependency. generate a Gemfile that contains turn and require turn if it is available
This commit is contained in:
parent
2cdc1f0cd5
commit
bd79172e43
3 changed files with 14 additions and 7 deletions
|
@ -23,9 +23,13 @@ source 'http://rubygems.org'
|
||||||
# Bundle gems for the local environment. Make sure to
|
# Bundle gems for the local environment. Make sure to
|
||||||
# put test-only gems in this group so their generators
|
# put test-only gems in this group so their generators
|
||||||
# and rake tasks are available in development mode:
|
# and rake tasks are available in development mode:
|
||||||
# group :development, :test do
|
|
||||||
# gem 'webrat'
|
group :development, :test do
|
||||||
# end
|
# Depend "turn" for pretty printing test output, but disable autorequire.
|
||||||
|
gem 'turn', :require => false
|
||||||
|
|
||||||
|
# gem 'webrat'
|
||||||
|
end
|
||||||
|
|
||||||
# Needed for guides generation
|
# Needed for guides generation
|
||||||
# gem "RedCloth", "~> 4.2"
|
# gem "RedCloth", "~> 4.2"
|
||||||
|
|
|
@ -14,10 +14,14 @@ if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
if defined?(MiniTest)
|
if defined?(MiniTest)
|
||||||
require 'turn'
|
# Enable turn if it is available
|
||||||
|
begin
|
||||||
|
require 'turn'
|
||||||
|
|
||||||
if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
|
if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
|
||||||
MiniTest::Unit.use_natural_language_case_names = true
|
MiniTest::Unit.use_natural_language_case_names = true
|
||||||
|
end
|
||||||
|
rescue LoadError
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ Gem::Specification.new do |s|
|
||||||
s.add_dependency('rake', '>= 0.8.7')
|
s.add_dependency('rake', '>= 0.8.7')
|
||||||
s.add_dependency('thor', '~> 0.14.4')
|
s.add_dependency('thor', '~> 0.14.4')
|
||||||
s.add_dependency('rack-ssl', '~> 1.3.2')
|
s.add_dependency('rack-ssl', '~> 1.3.2')
|
||||||
s.add_dependency('turn', '~> 0.8.2')
|
|
||||||
s.add_dependency('activesupport', version)
|
s.add_dependency('activesupport', version)
|
||||||
s.add_dependency('actionpack', version)
|
s.add_dependency('actionpack', version)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue