Revert "Skip needless Rails extension."

This reverts commit 4d3a671.

Author: kaspth

test/helper.rb

@@ -6,17 +6,27 @@
 
 FIXTURES_ROOT = File.expand_path(File.dirname(__FILE__)) + "/fixtures"
 
+module Rails
+  class << self
+    def version_matches?(requirement_str)
+      ver = Gem::Version.new(version)
+      req = Gem::Requirement.new(requirement_str)
+      req.satisfied_by?(ver)
+    end
+  end
+end
+
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
 
   self.test_order = :random if self.respond_to?(:test_order=)
   self.fixture_path = FIXTURES_ROOT
   self.use_instantiated_fixtures  = false
-  self.use_transactional_fixtures = true if Rails.version.start_with?('4.0')
+  self.use_transactional_fixtures = true if Rails.version_matches?('~> 4.0')
   self.use_transactional_tests = true if self.respond_to?(:use_transactional_tests=)
 end
 
-if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=) && Rails.version.start_with?('4.0')
+if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=) && Rails.version_matches?('~> 4.0')
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 

test/sweeper_test.rb

@@ -13,7 +13,7 @@ class SweeperTestController < ActionController::Base
   cache_sweeper :app_sweeper
 
   def show
-    if Rails.version >= '5.0'
+    if Rails.version_matches?('>= 5.0.0.beta1')
       render plain: 'hello world'
     else
       render text: 'hello world'

test/transaction_callbacks_test.rb

@@ -1,8 +1,8 @@
 require "helper"
 
 class TransactionCallbacksTest < ActiveSupport::TestCase
-  self.use_transactional_fixtures = false if Rails.version.start_with?('4.0')
-  self.use_transactional_tests = false if respond_to?(:use_transactional_tests=)
+  self.use_transactional_fixtures = false if Rails.version_matches?('~> 4.0')
+  self.use_transactional_tests = false if self.respond_to?(:use_transactional_tests=)
   fixtures :topics
 
   class TopicWithCallbacks < ActiveRecord::Base
@@ -228,14 +228,14 @@ def @first.last_after_transaction_error; @last_transaction_error; end
     @second.after_commit_block{|r| r.history << :after_commit}
     @second.after_rollback_block{|r| r.history << :after_rollback}
 
-    action_without_rollback = -> do
+    action_without_rollback = Proc.new do
       Topic.transaction do
         @first.save!
         @second.save!
       end
     end
 
-    if Rails.version >= '4.2'
+    if Rails.version_matches?('>= 4.2')
       assert_raises RuntimeError, &action_without_rollback
     else
       action_without_rollback.call
@@ -244,15 +244,14 @@ def @first.last_after_transaction_error; @last_transaction_error; end
     assert_equal [:after_commit], @second.history
 
     @second.history.clear
-    action_with_rollback = -> do
+    action_with_rollback = Proc.new do
       Topic.transaction do
         @first.save!
         @second.save!
         raise ActiveRecord::Rollback
       end
     end
-
-    if Rails.version >= '4.2'
+    if Rails.version_matches?('>= 4.2')
       assert_raises RuntimeError, &action_with_rollback
       assert_equal :rollback, @first.last_after_transaction_error
       assert_equal [], @second.history