mocha 1.9.0 → 1.10.0.alpha
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/.rubocop_todo.yml +7 -30
- data/README.md +10 -11
- data/RELEASE.md +48 -0
- data/Rakefile +9 -3
- data/docs/CNAME +1 -0
- data/docs/Mocha.html +132 -5
- data/docs/Mocha/API.html +289 -216
- data/docs/Mocha/ClassMethods.html +88 -16
- data/docs/Mocha/Configuration.html +931 -174
- data/docs/Mocha/Expectation.html +200 -255
- data/docs/Mocha/ExpectationError.html +5 -10
- data/docs/Mocha/ExpectationErrorFactory.html +9 -18
- data/docs/Mocha/Hooks.html +12 -27
- data/docs/Mocha/Integration.html +3 -3
- data/docs/Mocha/Integration/MiniTest.html +3 -3
- data/docs/Mocha/Integration/MiniTest/Adapter.html +5 -6
- data/docs/Mocha/Integration/TestUnit.html +3 -3
- data/docs/Mocha/Integration/TestUnit/Adapter.html +5 -6
- data/docs/Mocha/Mock.html +202 -162
- data/docs/Mocha/ObjectMethods.html +121 -68
- data/docs/Mocha/ParameterMatchers.html +21 -109
- data/docs/Mocha/ParameterMatchers/AllOf.html +4 -5
- data/docs/Mocha/ParameterMatchers/AnyOf.html +4 -5
- data/docs/Mocha/ParameterMatchers/AnyParameters.html +3 -3
- data/docs/Mocha/ParameterMatchers/Anything.html +3 -3
- data/docs/Mocha/ParameterMatchers/Base.html +8 -15
- data/docs/Mocha/ParameterMatchers/Equals.html +4 -5
- data/docs/Mocha/ParameterMatchers/EquivalentUri.html +3 -3
- data/docs/Mocha/ParameterMatchers/HasEntries.html +4 -5
- data/docs/Mocha/ParameterMatchers/HasEntry.html +4 -5
- data/docs/Mocha/ParameterMatchers/HasKey.html +4 -5
- data/docs/Mocha/ParameterMatchers/HasValue.html +4 -5
- data/docs/Mocha/ParameterMatchers/Includes.html +4 -5
- data/docs/Mocha/ParameterMatchers/InstanceOf.html +4 -5
- data/docs/Mocha/ParameterMatchers/IsA.html +3 -3
- data/docs/Mocha/ParameterMatchers/KindOf.html +4 -5
- data/docs/Mocha/ParameterMatchers/Not.html +4 -5
- data/docs/Mocha/ParameterMatchers/Optionally.html +3 -3
- data/docs/Mocha/ParameterMatchers/RegexpMatches.html +4 -5
- data/docs/Mocha/ParameterMatchers/RespondsWith.html +4 -5
- data/docs/Mocha/ParameterMatchers/YamlEquivalent.html +4 -5
- data/docs/Mocha/Sequence.html +3 -3
- data/docs/Mocha/StateMachine.html +13 -25
- data/docs/Mocha/StateMachine/State.html +4 -5
- data/docs/Mocha/StateMachine/StatePredicate.html +4 -5
- data/docs/Mocha/StubbingError.html +3 -3
- data/docs/_index.html +4 -22
- data/docs/class_list.html +1 -1
- data/docs/file.COPYING.html +3 -3
- data/docs/file.MIT-LICENSE.html +3 -3
- data/docs/file.README.html +18 -15
- data/docs/file.RELEASE.html +58 -3
- data/docs/frames.html +1 -1
- data/docs/index.html +18 -15
- data/docs/method_list.html +103 -39
- data/docs/top-level-namespace.html +3 -3
- data/gemfiles/Gemfile.minitest.5.11.3 +7 -0
- data/init.rb +1 -3
- data/lib/mocha.rb +8 -0
- data/lib/mocha/any_instance_method.rb +9 -25
- data/lib/mocha/api.rb +62 -66
- data/lib/mocha/cardinality.rb +26 -11
- data/lib/mocha/class_methods.rb +16 -15
- data/lib/mocha/configuration.rb +295 -67
- data/lib/mocha/detection/test_unit.rb +1 -3
- data/lib/mocha/exception_raiser.rb +2 -1
- data/lib/mocha/expectation.rb +56 -58
- data/lib/mocha/expectation_error.rb +1 -3
- data/lib/mocha/expectation_list.rb +6 -6
- data/lib/mocha/inspect.rb +28 -26
- data/lib/mocha/instance_method.rb +19 -2
- data/lib/mocha/integration.rb +1 -3
- data/lib/mocha/integration/mini_test.rb +7 -0
- data/lib/mocha/integration/test_unit.rb +7 -0
- data/lib/mocha/invocation.rb +61 -0
- data/lib/mocha/macos_version.rb +5 -0
- data/lib/mocha/minitest.rb +6 -1
- data/lib/mocha/mock.rb +46 -31
- data/lib/mocha/mockery.rb +28 -61
- data/lib/mocha/names.rb +1 -1
- data/lib/mocha/object_methods.rb +13 -19
- data/lib/mocha/parameter_matchers.rb +1 -1
- data/lib/mocha/parameter_matchers/all_of.rb +1 -1
- data/lib/mocha/parameter_matchers/any_of.rb +1 -1
- data/lib/mocha/parameter_matchers/equivalent_uri.rb +0 -9
- data/lib/mocha/parameter_matchers/includes.rb +2 -0
- data/lib/mocha/parameter_matchers/instance_methods.rb +18 -0
- data/lib/mocha/raised_exception.rb +11 -0
- data/lib/mocha/return_values.rb +3 -3
- data/lib/mocha/setup.rb +5 -0
- data/lib/mocha/single_return_value.rb +2 -1
- data/lib/mocha/singleton_class.rb +9 -0
- data/lib/mocha/{class_method.rb → stubbed_method.rb} +23 -43
- data/lib/mocha/test_unit.rb +6 -1
- data/lib/mocha/thrower.rb +2 -1
- data/lib/mocha/thrown_object.rb +12 -0
- data/lib/mocha/version.rb +1 -1
- data/mocha.gemspec +1 -3
- data/test/acceptance/acceptance_test_helper.rb +6 -0
- data/test/acceptance/bug_18914_test.rb +0 -1
- data/test/acceptance/bug_21465_test.rb +0 -1
- data/test/acceptance/bug_21563_test.rb +0 -1
- data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb +69 -0
- data/test/acceptance/exception_rescue_test.rb +1 -2
- data/test/acceptance/expectations_on_multiple_methods_test.rb +0 -1
- data/test/acceptance/expected_invocation_count_test.rb +2 -3
- data/test/acceptance/failure_messages_test.rb +0 -1
- data/test/acceptance/issue_272_test.rb +1 -2
- data/test/acceptance/issue_65_test.rb +0 -1
- data/test/acceptance/issue_70_test.rb +0 -1
- data/test/acceptance/mocha_example_test.rb +0 -1
- data/test/acceptance/mocha_test_result_test.rb +0 -1
- data/test/acceptance/mock_test.rb +47 -6
- data/test/acceptance/mocked_methods_dispatch_test.rb +0 -1
- data/test/acceptance/multiple_expectations_failure_message_test.rb +0 -1
- data/test/acceptance/optional_parameters_test.rb +0 -1
- data/test/acceptance/parameter_matcher_test.rb +0 -1
- data/test/acceptance/partial_mocks_test.rb +0 -1
- data/test/acceptance/prepend_test.rb +0 -1
- data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb +0 -1
- data/test/acceptance/raise_exception_test.rb +0 -1
- data/test/acceptance/return_value_test.rb +0 -1
- data/test/acceptance/sequence_test.rb +0 -1
- data/test/acceptance/states_test.rb +0 -1
- data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb +1 -2
- data/test/acceptance/stub_any_instance_method_test.rb +20 -1
- data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +0 -1
- data/test/acceptance/stub_class_method_defined_on_class_test.rb +0 -1
- data/test/acceptance/stub_class_method_defined_on_module_test.rb +0 -1
- data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +1 -2
- data/test/acceptance/stub_everything_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_class_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_module_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +0 -1
- data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +0 -1
- data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb +0 -1
- data/test/acceptance/stub_module_method_test.rb +0 -1
- data/test/acceptance/stub_test.rb +0 -1
- data/test/acceptance/stubba_example_test.rb +0 -1
- data/test/acceptance/stubba_test_result_test.rb +0 -1
- data/test/acceptance/stubbing_error_backtrace_test.rb +4 -5
- data/test/acceptance/stubbing_frozen_object_test.rb +0 -1
- data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +0 -1
- data/test/acceptance/stubbing_method_unnecessarily_test.rb +5 -5
- data/test/acceptance/stubbing_nil_test.rb +5 -5
- data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +11 -11
- data/test/acceptance/stubbing_non_existent_class_method_test.rb +11 -11
- data/test/acceptance/stubbing_non_existent_instance_method_test.rb +11 -11
- data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +8 -8
- data/test/acceptance/stubbing_non_public_class_method_test.rb +9 -9
- data/test/acceptance/stubbing_non_public_instance_method_test.rb +9 -9
- data/test/acceptance/stubbing_on_non_mock_object_test.rb +5 -5
- data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +0 -1
- data/test/acceptance/throw_test.rb +0 -1
- data/test/acceptance/unexpected_invocation_test.rb +0 -1
- data/test/acceptance/unstubbing_test.rb +0 -1
- data/test/integration/shared_tests.rb +5 -3
- data/test/method_definer.rb +11 -17
- data/test/test_runner.rb +2 -0
- data/test/unit/any_instance_method_test.rb +41 -40
- data/test/unit/cardinality_test.rb +41 -23
- data/test/unit/central_test.rb +0 -1
- data/test/unit/class_methods_test.rb +1 -1
- data/test/unit/configuration_test.rb +12 -12
- data/test/unit/exception_raiser_test.rb +10 -5
- data/test/unit/expectation_list_test.rb +13 -11
- data/test/unit/expectation_test.rb +88 -103
- data/test/unit/instance_method_test.rb +282 -0
- data/test/unit/mock_test.rb +28 -19
- data/test/unit/mockery_test.rb +8 -11
- data/test/unit/module_methods_test.rb +2 -3
- data/test/unit/object_inspect_test.rb +6 -4
- data/test/unit/object_methods_test.rb +3 -2
- data/test/unit/parameter_matchers/equivalent_uri_test.rb +0 -9
- data/test/unit/parameter_matchers/has_entries_test.rb +1 -1
- data/test/unit/parameter_matchers/has_entry_test.rb +1 -1
- data/test/unit/parameter_matchers/has_key_test.rb +1 -1
- data/test/unit/parameter_matchers/has_value_test.rb +1 -1
- data/test/unit/parameter_matchers/includes_test.rb +1 -1
- data/test/unit/parameter_matchers/responds_with_test.rb +1 -1
- data/test/unit/return_values_test.rb +25 -20
- data/test/unit/single_return_value_test.rb +6 -1
- data/test/unit/thrower_test.rb +7 -2
- metadata +16 -30
- data/docs/Mocha/UnexpectedInvocation.html +0 -140
- data/lib/mocha/mini_test.rb +0 -5
- data/lib/mocha/module_method.rb +0 -6
- data/lib/mocha/module_methods.rb +0 -10
- data/lib/mocha/parameter_matchers/object.rb +0 -15
- data/lib/mocha/standalone.rb +0 -4
- data/lib/mocha/unexpected_invocation.rb +0 -24
- data/lib/mocha_standalone.rb +0 -4
- data/test/acceptance/mock_with_initializer_block_test.rb +0 -56
- data/test/unit/class_method_test.rb +0 -276
data/lib/mocha/return_values.rb
CHANGED
@@ -12,11 +12,11 @@ module Mocha
|
|
12
12
|
@values = values
|
13
13
|
end
|
14
14
|
|
15
|
-
def next
|
15
|
+
def next(invocation)
|
16
16
|
case @values.length
|
17
17
|
when 0 then nil
|
18
|
-
when 1 then @values.first.evaluate
|
19
|
-
else @values.shift.evaluate
|
18
|
+
when 1 then @values.first.evaluate(invocation)
|
19
|
+
else @values.shift.evaluate(invocation)
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
data/lib/mocha/setup.rb
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
require 'mocha/ruby_version'
|
2
|
-
require '
|
2
|
+
require 'mocha/singleton_class'
|
3
3
|
|
4
4
|
module Mocha
|
5
|
-
class
|
5
|
+
class StubbedMethod
|
6
6
|
PrependedModule = Class.new(Module)
|
7
7
|
|
8
8
|
attr_reader :stubbee, :method_name
|
@@ -28,15 +28,15 @@ module Mocha
|
|
28
28
|
end
|
29
29
|
|
30
30
|
def mock
|
31
|
-
|
31
|
+
mock_owner.mocha
|
32
32
|
end
|
33
33
|
|
34
34
|
def reset_mocha
|
35
|
-
|
35
|
+
mock_owner.reset_mocha
|
36
36
|
end
|
37
37
|
|
38
38
|
def hide_original_method
|
39
|
-
return unless
|
39
|
+
return unless original_method_owner.method_exists?(method_name)
|
40
40
|
store_original_method_visibility
|
41
41
|
if use_prepended_module_for_stub_method?
|
42
42
|
use_prepended_module_for_stub_method
|
@@ -55,29 +55,28 @@ module Mocha
|
|
55
55
|
end
|
56
56
|
|
57
57
|
def define_new_method
|
58
|
-
|
59
|
-
|
60
|
-
|
58
|
+
self_in_scope = self
|
59
|
+
method_name_in_scope = method_name
|
60
|
+
stub_method_owner.send(:define_method, method_name) do |*args, &block|
|
61
|
+
self_in_scope.mock.method_missing(method_name_in_scope, *args, &block)
|
62
|
+
end
|
63
|
+
retain_original_visibility(stub_method_owner)
|
61
64
|
end
|
62
65
|
|
63
66
|
def remove_new_method
|
64
67
|
stub_method_owner.send(:remove_method, method_name)
|
65
68
|
end
|
66
69
|
|
70
|
+
def store_original_method
|
71
|
+
@original_method = stubbee_method(method_name)
|
72
|
+
end
|
73
|
+
|
67
74
|
def restore_original_method
|
68
75
|
return if use_prepended_module_for_stub_method?
|
69
76
|
if stub_method_overwrites_original_method?
|
70
|
-
|
71
|
-
original_method_in_scope = original_method
|
72
|
-
original_method_owner.send(:define_method, method_name) do |*args, &block|
|
73
|
-
original_method_in_scope.call(*args, &block)
|
74
|
-
end
|
75
|
-
else
|
76
|
-
original_method_owner.send(:define_method, method_name, original_method)
|
77
|
-
end
|
77
|
+
original_method_owner.send(:define_method, method_name, method_body(original_method))
|
78
78
|
end
|
79
|
-
|
80
|
-
Module.instance_method(original_visibility).bind(stubbee.__metaclass__).call(method_name)
|
79
|
+
retain_original_visibility(original_method_owner)
|
81
80
|
end
|
82
81
|
|
83
82
|
def matches?(other)
|
@@ -91,23 +90,17 @@ module Mocha
|
|
91
90
|
"#{stubbee}.#{method_name}"
|
92
91
|
end
|
93
92
|
|
94
|
-
def method_visibility
|
95
|
-
(original_method_owner.public_method_defined?(method_name) && :public) ||
|
96
|
-
(original_method_owner.protected_method_defined?(method_name) && :protected) ||
|
97
|
-
(original_method_owner.private_method_defined?(method_name) && :private)
|
98
|
-
end
|
99
|
-
alias_method :method_defined_in_stubbee_or_in_ancestor_chain?, :method_visibility
|
100
|
-
|
101
93
|
private
|
102
94
|
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
@original_method = stubbee._method(method_name)
|
95
|
+
def retain_original_visibility(method_owner)
|
96
|
+
return unless original_visibility
|
97
|
+
Module.instance_method(original_visibility).bind(method_owner).call(method_name)
|
107
98
|
end
|
108
99
|
|
100
|
+
attr_reader :original_method, :original_visibility
|
101
|
+
|
109
102
|
def store_original_method_visibility
|
110
|
-
@original_visibility = method_visibility
|
103
|
+
@original_visibility = original_method_owner.method_visibility(method_name)
|
111
104
|
end
|
112
105
|
|
113
106
|
def stub_method_overwrites_original_method?
|
@@ -127,21 +120,8 @@ module Mocha
|
|
127
120
|
original_method_owner.__send__ :prepend, @stub_method_owner
|
128
121
|
end
|
129
122
|
|
130
|
-
def stub_method_definition
|
131
|
-
method_implementation = <<-CODE
|
132
|
-
def #{method_name}(*args, &block)
|
133
|
-
mocha.method_missing(:#{method_name}, *args, &block)
|
134
|
-
end
|
135
|
-
CODE
|
136
|
-
[method_implementation, __FILE__, __LINE__ - 4]
|
137
|
-
end
|
138
|
-
|
139
123
|
def stub_method_owner
|
140
124
|
@stub_method_owner ||= original_method_owner
|
141
125
|
end
|
142
|
-
|
143
|
-
def original_method_owner
|
144
|
-
stubbee.__metaclass__
|
145
|
-
end
|
146
126
|
end
|
147
127
|
end
|
data/lib/mocha/test_unit.rb
CHANGED
@@ -1,3 +1,8 @@
|
|
1
1
|
require 'mocha/integration/test_unit'
|
2
|
+
require 'mocha/deprecation'
|
2
3
|
|
3
|
-
Mocha::Integration::TestUnit.activate
|
4
|
+
unless Mocha::Integration::TestUnit.activate
|
5
|
+
Mocha::Deprecation.warning(
|
6
|
+
"Test::Unit must be loaded *before* `require 'mocha/test_unit'`."
|
7
|
+
)
|
8
|
+
end
|
data/lib/mocha/thrower.rb
CHANGED
data/lib/mocha/version.rb
CHANGED
data/mocha.gemspec
CHANGED
@@ -2,7 +2,7 @@ lib = File.expand_path('../lib/', __FILE__)
|
|
2
2
|
$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
|
3
3
|
require 'mocha/version'
|
4
4
|
|
5
|
-
Gem::Specification.new do |s|
|
5
|
+
Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
|
6
6
|
s.name = 'mocha'
|
7
7
|
s.version = Mocha::VERSION
|
8
8
|
s.licenses = ['MIT', 'BSD-2-Clause']
|
@@ -20,8 +20,6 @@ Gem::Specification.new do |s|
|
|
20
20
|
s.require_paths = ['lib']
|
21
21
|
s.summary = 'Mocking and stubbing library'
|
22
22
|
|
23
|
-
s.add_dependency('metaclass', '~> 0.0.1')
|
24
|
-
|
25
23
|
unless s.respond_to?(:add_development_dependency)
|
26
24
|
class << s
|
27
25
|
def add_development_dependency(*args)
|
@@ -3,6 +3,12 @@ require 'test_runner'
|
|
3
3
|
require 'mocha/configuration'
|
4
4
|
require 'introspection'
|
5
5
|
|
6
|
+
if Mocha::Detection::MiniTest.testcase && (ENV['MOCHA_RUN_INTEGRATION_TESTS'] != 'test-unit')
|
7
|
+
require 'mocha/minitest'
|
8
|
+
else
|
9
|
+
require 'mocha/test_unit'
|
10
|
+
end
|
11
|
+
|
6
12
|
module AcceptanceTest
|
7
13
|
class FakeLogger
|
8
14
|
attr_reader :warnings
|
@@ -0,0 +1,69 @@
|
|
1
|
+
require File.expand_path('../acceptance_test_helper', __FILE__)
|
2
|
+
|
3
|
+
class DisplayMatchingInvocationsAlongsideExpectationsTest < Mocha::TestCase
|
4
|
+
include AcceptanceTest
|
5
|
+
|
6
|
+
def setup
|
7
|
+
setup_acceptance_test
|
8
|
+
Mocha.configuration.display_matching_invocations_on_failure = true
|
9
|
+
end
|
10
|
+
|
11
|
+
def test_should_display_results
|
12
|
+
test_result = run_as_test do
|
13
|
+
foo = mock('foo')
|
14
|
+
foo.expects(:bar).with(1).returns('a')
|
15
|
+
foo.stubs(:bar).with(any_parameters).returns('f').raises(StandardError).throws(:tag, 'value')
|
16
|
+
|
17
|
+
foo.bar(1, 2)
|
18
|
+
assert_raises(StandardError) { foo.bar(3, 4) }
|
19
|
+
assert_throws(:tag) { foo.bar(5, 6) }
|
20
|
+
end
|
21
|
+
assert_invocations(
|
22
|
+
test_result,
|
23
|
+
'- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
|
24
|
+
' - #<Mock:foo>.bar(1, 2) # => "f"',
|
25
|
+
' - #<Mock:foo>.bar(3, 4) # => raised StandardError',
|
26
|
+
' - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value")'
|
27
|
+
)
|
28
|
+
end
|
29
|
+
|
30
|
+
def test_should_display_yields
|
31
|
+
test_result = run_as_test do
|
32
|
+
foo = mock('foo')
|
33
|
+
foo.expects(:bar).with(1).returns('a')
|
34
|
+
foo.stubs(:bar).with(any_parameters).multiple_yields(%w[b c], %w[d e]).returns('f').raises(StandardError).throws(:tag, 'value')
|
35
|
+
|
36
|
+
foo.bar(1, 2) { |_ignored| }
|
37
|
+
assert_raises(StandardError) { foo.bar(3, 4) { |_ignored| } }
|
38
|
+
assert_throws(:tag) { foo.bar(5, 6) { |_ignored| } }
|
39
|
+
end
|
40
|
+
assert_invocations(
|
41
|
+
test_result,
|
42
|
+
'- allowed any number of times, invoked 3 times: #<Mock:foo>.bar(any_parameters)',
|
43
|
+
' - #<Mock:foo>.bar(1, 2) # => "f" after yielding ("b", "c"), then ("d", "e")',
|
44
|
+
' - #<Mock:foo>.bar(3, 4) # => raised StandardError after yielding ("b", "c"), then ("d", "e")',
|
45
|
+
' - #<Mock:foo>.bar(5, 6) # => threw (:tag, "value") after yielding ("b", "c"), then ("d", "e")'
|
46
|
+
)
|
47
|
+
end
|
48
|
+
|
49
|
+
def test_should_display_empty_yield_and_return
|
50
|
+
test_result = run_as_test do
|
51
|
+
foo = mock('foo')
|
52
|
+
foo.expects(:bar).with(1).returns('a')
|
53
|
+
foo.stubs(:bar).with(any_parameters).yields
|
54
|
+
|
55
|
+
foo.bar(1, 2) { |_ignored| }
|
56
|
+
end
|
57
|
+
assert_invocations(
|
58
|
+
test_result,
|
59
|
+
'- allowed any number of times, invoked once: #<Mock:foo>.bar(any_parameters)',
|
60
|
+
' - #<Mock:foo>.bar(1, 2) # => nil after yielding ()'
|
61
|
+
)
|
62
|
+
end
|
63
|
+
|
64
|
+
def assert_invocations(test_result, *invocations)
|
65
|
+
assert_failed(test_result)
|
66
|
+
assert_equal invocations.unshift('satisfied expectations:'),
|
67
|
+
test_result.failure_message_lines[-invocations.size..-1]
|
68
|
+
end
|
69
|
+
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require File.expand_path('../acceptance_test_helper', __FILE__)
|
2
|
-
require 'mocha/setup'
|
3
2
|
|
4
3
|
class ExceptionRescueTest < Mocha::TestCase
|
5
4
|
include AcceptanceTest
|
@@ -48,7 +47,7 @@ class ExceptionRescueTest < Mocha::TestCase
|
|
48
47
|
assert_equal [
|
49
48
|
'not all expectations were satisfied',
|
50
49
|
'unsatisfied expectations:',
|
51
|
-
'- expected exactly once,
|
50
|
+
'- expected exactly once, invoked never: #<Mock:mock>.some_method(any_parameters)'
|
52
51
|
], test_result.failure_message_lines
|
53
52
|
end
|
54
53
|
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require File.expand_path('../acceptance_test_helper', __FILE__)
|
2
|
-
require 'mocha/setup'
|
3
2
|
|
4
3
|
class ExpectedInvocationCountTest < Mocha::TestCase
|
5
4
|
include AcceptanceTest
|
@@ -155,7 +154,7 @@ class ExpectedInvocationCountTest < Mocha::TestCase
|
|
155
154
|
assert_equal [
|
156
155
|
'not all expectations were satisfied',
|
157
156
|
'unsatisfied expectations:',
|
158
|
-
'- expected at least once,
|
157
|
+
'- expected at least once, invoked never: #<Mock:mock>.method(any_parameters)'
|
159
158
|
], test_result.failure_message_lines
|
160
159
|
end
|
161
160
|
|
@@ -224,7 +223,7 @@ class ExpectedInvocationCountTest < Mocha::TestCase
|
|
224
223
|
assert_equal [
|
225
224
|
'unexpected invocation: #<Mock:mock>.method()',
|
226
225
|
'unsatisfied expectations:',
|
227
|
-
'- expected exactly once,
|
226
|
+
'- expected exactly once, invoked never: #<Mock:mock>.method(1)'
|
228
227
|
], test_result.failure_message_lines
|
229
228
|
end
|
230
229
|
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require File.expand_path('../acceptance_test_helper', __FILE__)
|
2
|
-
require 'mocha/setup'
|
3
2
|
|
4
3
|
class Issue272Test < Mocha::TestCase
|
5
4
|
include AcceptanceTest
|
@@ -38,7 +37,7 @@ class Issue272Test < Mocha::TestCase
|
|
38
37
|
Klass.stubs(:foo).returns('stubbed-foo')
|
39
38
|
# hangs in next line executing:
|
40
39
|
# `@original_method = stubbee._method(method)`
|
41
|
-
# in Mocha::
|
40
|
+
# in Mocha::StubbedMethod#hide_original_method
|
42
41
|
# but only in Ruby v2.3, not v2.2
|
43
42
|
Klass.stubs(:bar).returns('stubbed-bar')
|
44
43
|
assert_equal 'stubbed-foo', Klass.foo
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require File.expand_path('../acceptance_test_helper', __FILE__)
|
2
|
-
require 'mocha/setup'
|
3
2
|
|
4
3
|
class MockTest < Mocha::TestCase
|
5
4
|
include AcceptanceTest
|
@@ -29,7 +28,7 @@ class MockTest < Mocha::TestCase
|
|
29
28
|
assert_failed(test_result)
|
30
29
|
end
|
31
30
|
|
32
|
-
def
|
31
|
+
def test_should_build_string_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
|
33
32
|
test_result = run_as_test do
|
34
33
|
foo = mock('foo')
|
35
34
|
foo.expects(:bar)
|
@@ -38,7 +37,16 @@ class MockTest < Mocha::TestCase
|
|
38
37
|
assert_passed(test_result)
|
39
38
|
end
|
40
39
|
|
41
|
-
def
|
40
|
+
def test_should_build_symbol_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
|
41
|
+
test_result = run_as_test do
|
42
|
+
foo = mock(:foo)
|
43
|
+
foo.expects(:bar)
|
44
|
+
foo.bar
|
45
|
+
end
|
46
|
+
assert_passed(test_result)
|
47
|
+
end
|
48
|
+
|
49
|
+
def test_should_build_string_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
|
42
50
|
test_result = run_as_test do
|
43
51
|
foo = mock('foo')
|
44
52
|
foo.expects(:bar)
|
@@ -46,6 +54,14 @@ class MockTest < Mocha::TestCase
|
|
46
54
|
assert_failed(test_result)
|
47
55
|
end
|
48
56
|
|
57
|
+
def test_should_build_symbol_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
|
58
|
+
test_result = run_as_test do
|
59
|
+
foo = mock(:foo)
|
60
|
+
foo.expects(:bar)
|
61
|
+
end
|
62
|
+
assert_failed(test_result)
|
63
|
+
end
|
64
|
+
|
49
65
|
def test_should_build_mock_incorporating_two_expectations_which_are_satisifed
|
50
66
|
test_result = run_as_test do
|
51
67
|
foo = mock(:bar => 'bar', :baz => 'baz')
|
@@ -71,7 +87,7 @@ class MockTest < Mocha::TestCase
|
|
71
87
|
assert_failed(test_result)
|
72
88
|
end
|
73
89
|
|
74
|
-
def
|
90
|
+
def test_should_build_string_named_mock_incorporating_two_expectations_which_are_satisifed
|
75
91
|
test_result = run_as_test do
|
76
92
|
foo = mock('foo', :bar => 'bar', :baz => 'baz')
|
77
93
|
foo.bar
|
@@ -80,7 +96,16 @@ class MockTest < Mocha::TestCase
|
|
80
96
|
assert_passed(test_result)
|
81
97
|
end
|
82
98
|
|
83
|
-
def
|
99
|
+
def test_should_build_symbol_named_mock_incorporating_two_expectations_which_are_satisifed
|
100
|
+
test_result = run_as_test do
|
101
|
+
foo = mock(:foo, :bar => 'bar', :baz => 'baz')
|
102
|
+
foo.bar
|
103
|
+
foo.baz
|
104
|
+
end
|
105
|
+
assert_passed(test_result)
|
106
|
+
end
|
107
|
+
|
108
|
+
def test_should_build_string_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
|
84
109
|
test_result = run_as_test do
|
85
110
|
foo = mock('foo', :bar => 'bar', :baz => 'baz')
|
86
111
|
foo.baz
|
@@ -88,11 +113,27 @@ class MockTest < Mocha::TestCase
|
|
88
113
|
assert_failed(test_result)
|
89
114
|
end
|
90
115
|
|
91
|
-
def
|
116
|
+
def test_should_build_symbol_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
|
117
|
+
test_result = run_as_test do
|
118
|
+
foo = mock(:foo, :bar => 'bar', :baz => 'baz')
|
119
|
+
foo.baz
|
120
|
+
end
|
121
|
+
assert_failed(test_result)
|
122
|
+
end
|
123
|
+
|
124
|
+
def test_should_build_string_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
|
92
125
|
test_result = run_as_test do
|
93
126
|
foo = mock('foo', :bar => 'bar', :baz => 'baz')
|
94
127
|
foo.bar
|
95
128
|
end
|
96
129
|
assert_failed(test_result)
|
97
130
|
end
|
131
|
+
|
132
|
+
def test_should_build_symbol_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
|
133
|
+
test_result = run_as_test do
|
134
|
+
foo = mock(:foo, :bar => 'bar', :baz => 'baz')
|
135
|
+
foo.bar
|
136
|
+
end
|
137
|
+
assert_failed(test_result)
|
138
|
+
end
|
98
139
|
end
|