From 0e61d10ccd7bd84a1d1afda3872a0e619646833f Mon Sep 17 00:00:00 2001 From: Stefan Wienert Date: Mon, 6 Jan 2014 18:33:58 +0100 Subject: [PATCH 1/3] Rails 4 and 4.1 adapters --- lib/wrong/adapters/rspec.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/wrong/adapters/rspec.rb b/lib/wrong/adapters/rspec.rb index 1be3869..ae43e8a 100644 --- a/lib/wrong/adapters/rspec.rb +++ b/lib/wrong/adapters/rspec.rb @@ -6,7 +6,20 @@ if RSpec.const_defined? :Rails require 'rails/version' - if Rails::VERSION::MAJOR == 3 + case Rails::VERSION::STRING + when /^4\.1/ + # RSpec 2 plus Rails 4.1 + module RSpec::Rails::MinitestAssertionAdapter::ClassMethods + def define_assertion_delegators_with_removed + define_assertion_delegators_without_removed + class_eval do + remove_method :assert + end + end + alias_method_chain :define_assertion_delegators, :removed + end + + when /^4\.0/, /^3\./ # RSpec 2 plus Rails 3 module RSpec::Rails::TestUnitAssertionAdapter included do From bbd84ba9e71811fa43e1811bd5bd1e3a22be74cd Mon Sep 17 00:00:00 2001 From: Stefan Wienert Date: Mon, 6 Jan 2014 18:37:58 +0100 Subject: [PATCH 2/3] else clause to make debugging easier for future (or past) Rails versions --- lib/wrong/adapters/rspec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/wrong/adapters/rspec.rb b/lib/wrong/adapters/rspec.rb index ae43e8a..616258a 100644 --- a/lib/wrong/adapters/rspec.rb +++ b/lib/wrong/adapters/rspec.rb @@ -29,6 +29,8 @@ module RSpec::Rails::TestUnitAssertionAdapter end end end + else + raise "Wrong's RSpec adapter can't be applied to your Rails version #{Rails::VERSION::STRING}" end end From be1ddcc214dd151b9530466f7c8ef7f52c8ec8f2 Mon Sep 17 00:00:00 2001 From: Stefan Wienert Date: Thu, 22 Oct 2015 19:58:07 +0200 Subject: [PATCH 3/3] Added Rails 4.2 integration clause --- lib/wrong/adapters/rspec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/wrong/adapters/rspec.rb b/lib/wrong/adapters/rspec.rb index 616258a..8b15726 100644 --- a/lib/wrong/adapters/rspec.rb +++ b/lib/wrong/adapters/rspec.rb @@ -7,8 +7,8 @@ if RSpec.const_defined? :Rails require 'rails/version' case Rails::VERSION::STRING - when /^4\.1/ - # RSpec 2 plus Rails 4.1 + when /^4\.[12]/ + # RSpec 2 plus Rails 4.1/4.2 module RSpec::Rails::MinitestAssertionAdapter::ClassMethods def define_assertion_delegators_with_removed define_assertion_delegators_without_removed