From 9a2be3594fd888c9d802dfa192ba1754cb860056 Mon Sep 17 00:00:00 2001 From: Ilya Bylich Date: Tue, 6 May 2014 17:17:33 +0300 Subject: [PATCH 1/6] Fixed dummy mongoid config. --- spec/dummy/config/mongoid.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/dummy/config/mongoid.yml b/spec/dummy/config/mongoid.yml index c391722..92d1932 100644 --- a/spec/dummy/config/mongoid.yml +++ b/spec/dummy/config/mongoid.yml @@ -73,7 +73,6 @@ test: hosts: - localhost:27017 options: - consistency: :strong # In the test environment we lower the retries and retry interval to # low amounts for fast failures. max_retries: 1 From d146dce175e41c18eefc2fd6b9071236c40f7d72 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Tue, 20 May 2014 10:06:34 -0600 Subject: [PATCH 2/6] Bump minitest-rails development dependency Draper should depend on the released versions of minitest-rails. Version ~> 1.0 for Rails 3.0-4.0, and ~> 2.0 for Rails 4.1+. --- draper.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draper.gemspec b/draper.gemspec index f5d13b3..99c744a 100644 --- a/draper.gemspec +++ b/draper.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rspec', '~> 2.12' s.add_development_dependency 'rspec-mocks', '>= 2.12.1' s.add_development_dependency 'rspec-rails', '~> 2.12' - s.add_development_dependency 'minitest-rails', '~> 0.2' + s.add_development_dependency 'minitest-rails', '>= 1.0' s.add_development_dependency 'capybara' s.add_development_dependency 'active_model_serializers' end From 2e066922a109ab22dce9b780bd7f44cb5f289e38 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Tue, 20 May 2014 10:18:42 -0600 Subject: [PATCH 3/6] Remove minitest-rails require The mintest/rails require should only be in the test helper. This code is here to deal with very old versions of minitest-rails, but Draper should rely on the 1.0+ released versions. These checks are very outdated, and worse, can introduce other bugs. --- lib/draper/test_case.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/draper/test_case.rb b/lib/draper/test_case.rb index 62320e9..334a8f7 100644 --- a/lib/draper/test_case.rb +++ b/lib/draper/test_case.rb @@ -1,18 +1,7 @@ module Draper - begin - require 'minitest/rails' - rescue LoadError - end + require 'active_support/test_case' - active_support_test_case = begin - require 'minitest/rails/active_support' # minitest-rails < 0.5 - ::MiniTest::Rails::ActiveSupport::TestCase - rescue LoadError - require 'active_support/test_case' - ::ActiveSupport::TestCase - end - - class TestCase < active_support_test_case + class TestCase < ::ActiveSupport::TestCase module ViewContextTeardown def teardown super From 55ea318d86721728ab748b8b3f9ebe6da4bb61f7 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Tue, 20 May 2014 11:01:44 -0600 Subject: [PATCH 4/6] Use load hook for minitest integration Unlike RSpec, Minitest doesn't load the Spec DSL when loaded by Bundler, so loading the integration in the Railtie can be problematic. Switch to a load hook so that the integration can be loaded whenever minitest-rails is loaded, which it may not be during Draper initialization. --- lib/draper/railtie.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/draper/railtie.rb b/lib/draper/railtie.rb index 128f446..ce65c20 100755 --- a/lib/draper/railtie.rb +++ b/lib/draper/railtie.rb @@ -20,7 +20,6 @@ module Draper if Rails.env.test? require 'draper/test_case' require 'draper/test/rspec_integration' if defined?(RSpec) and RSpec.respond_to?(:configure) - require 'draper/test/minitest_integration' if defined?(MiniTest::Rails) end end @@ -50,6 +49,12 @@ module Draper end end + initializer "draper.minitest-rails_integration" do |app| + ActiveSupport.on_load :minitest do + require "draper/test/minitest_integration" + end + end + console do require 'action_controller/test_case' ApplicationController.new.view_context From 38a214c48d4b47f74c3bdf2e9979b08e84515d31 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Sat, 31 May 2014 14:58:47 -0700 Subject: [PATCH 5/6] Update .travis.yml Travis has chanced some stuff, new Rubies have come out, etc. --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36ee1f3..eea1140 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,11 @@ services: rvm: - 1.9.3 - - 2.0.0 - - rbx-19mode + - 2.1.0 - jruby-19mode + - rbx-2 + - ruby-head + - jruby-head env: - "RAILS_VERSION=4.0" @@ -19,3 +21,6 @@ env: matrix: allow_failures: - env: "RAILS_VERSION=4.1" + - rvm: + - ruby-head + - jruby-head From 428e36a94522230478110a7f3c62551f595112fc Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Sat, 31 May 2014 19:30:59 -0700 Subject: [PATCH 6/6] Fix allow failures syntax Whoops. I thought I had it right, but I didn't. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eea1140..d836cfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,5 @@ env: matrix: allow_failures: - env: "RAILS_VERSION=4.1" - - rvm: - - ruby-head - - jruby-head + - rvm: ruby-head + - rvm: jruby-head