fix tests on ruby 2

aya-soft · Jul 22, 2013 · ccb8171 · ccb8171
1 parent 452c7f8
commit ccb8171
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/const_mocker.rb b/test/const_mocker.rb
@@ -11,7 +11,7 @@ def remove
   end
 
   def declare
-    @parent.const_set @const_name, Class.new unless @parent.const_defined?(@const_name)
+    @parent.const_set @const_name, Class.new
   end
 
   def restore
@@ -20,11 +20,11 @@ def restore
   end
 
   def const
-    @parent.const_get @const_name
+    @parent.const_get @const_name if @parent.const_defined?(@const_name)
   end
 
-  def self.mock(*const_names, &block)
-    cm = new(*const_names)
+  def self.mock(const_name, parent = Object, &block)
+    cm = new(const_name, parent)
     yield(cm)
     cm.restore
     true

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,5 +1,5 @@
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start { add_filter 'test' }
 
 ENV['RAILS_ENV'] = 'test'
 require "mock_app/config/environment"