update dependencies for green specs

rainforestapp · Nov 30, 2018 · 7f56835 · 7f56835
1 parent 8a8f83a
commit 7f56835
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/state_validations.gemspec b/state_validations.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "activesupport", ">= 3.0.0"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "test-unit", "= 2.2"
+  gem.add_development_dependency "test-unit"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "shoulda"
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,8 +1,10 @@
 require 'test/unit'
-require 'shoulda'
 require 'mocha'
-require 'mocha/integration/test_unit'
+require 'mocha/test_unit'
+require 'active_support'
 require 'active_support/core_ext'
 require 'active_model'
 
+require 'shoulda'
+
 require 'state_validations'
diff --git a/test/unit/helper_methods_test.rb b/test/unit/helper_methods_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class HelperMethodsTest < ActiveSupport::TestCase
+class HelperMethodsTest < Test::Unit::TestCase
   context "The helper methods on a perfectly valid state history" do
     setup do
       now = DateTime.new(2011, 2, 3, 5, 8, 13)

diff --git a/test/unit/state_history_entry_validator_test.rb b/test/unit/state_history_entry_validator_test.rb
@@ -3,7 +3,7 @@
 module ActiveModel
   module Validations
 
-    class StateHistoryEntryValidatorTest < ActiveSupport::TestCase
+    class StateHistoryEntryValidatorTest < Test::Unit::TestCase
       context "An \"perfect\" account state history entry" do
         setup do
           @now = DateTime.new(2011, 2, 3, 5, 8, 13)

diff --git a/test/unit/state_history_validator_test.rb b/test/unit/state_history_validator_test.rb
@@ -3,7 +3,7 @@
 module ActiveModel
   module Validations
 
-    class StateHistoryValidatorTest < ActiveSupport::TestCase
+    class StateHistoryValidatorTest < Test::Unit::TestCase
       context "A perfectly valid state history" do
         setup do
           now = DateTime.new(2011, 2, 3, 5, 8, 13)
@@ -274,7 +274,7 @@ def state_history_stub(state_history, options = {})
         end_attr = options[:end] || :end
         sort_dir = options[:sort_dir] || "ASC"
 
-        order_by = options[:order] || 
+        order_by = options[:order] ||
           "#{start_attr} #{sort_dir}, ISNULL(#{end_attr}) #{sort_dir}, #{end_attr} #{sort_dir}"
 
         state_history.stubs(:order).with(order_by).returns(state_history)