test/unit/class_methods_test.rb in mocha-1.6.0 vs test/unit/class_methods_test.rb in mocha-1.7.0

- old
+ new

@@ -3,11 +3,10 @@ require 'mocha/object_methods' require 'mocha/mockery' require 'mocha/names' class ClassMethodsTest < Mocha::TestCase - def setup Mocha::Mockery.setup @klass = Class.new.extend(Mocha::ClassMethods, Mocha::ObjectMethods) end @@ -20,13 +19,13 @@ assert_not_nil any_instance assert any_instance.is_a?(Mocha::ClassMethods::AnyInstance) end def test_should_return_same_any_instance_object - any_instance_1 = @klass.any_instance - any_instance_2 = @klass.any_instance - assert_equal any_instance_1, any_instance_2 + any_instance1 = @klass.any_instance + any_instance2 = @klass.any_instance + assert_equal any_instance1, any_instance2 end def test_any_instance_should_build_mocha_referring_to_klass mocha = @klass.any_instance.mocha assert_not_nil mocha @@ -38,19 +37,19 @@ def test_any_instance_should_not_build_mocha_if_instantiate_is_false assert_nil @klass.any_instance.mocha(false) end def test_any_instance_should_reuse_existing_mocha - mocha_1 = @klass.any_instance.mocha - mocha_2 = @klass.any_instance.mocha - assert_equal mocha_1, mocha_2 + mocha1 = @klass.any_instance.mocha + mocha2 = @klass.any_instance.mocha + assert_equal mocha1, mocha2 end def test_any_instance_should_reuse_existing_mocha_even_if_instantiate_is_false - mocha_1 = @klass.any_instance.mocha - mocha_2 = @klass.any_instance.mocha(false) - assert_equal mocha_1, mocha_2 + mocha1 = @klass.any_instance.mocha + mocha2 = @klass.any_instance.mocha(false) + assert_equal mocha1, mocha2 end def test_should_use_stubba_class_method_for_class assert_equal Mocha::ClassMethod, @klass.stubba_method end @@ -65,7 +64,6 @@ def test_should_stub_relevant_class_for_any_instance any_instance = @klass.any_instance assert_equal @klass, any_instance.stubba_object end - end