mocha 1.7.0 → 1.10.2
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/CONTRIBUTING.md +4 -9
- data/README.md +55 -27
- data/RELEASE.md +89 -0
- data/Rakefile +15 -16
- data/bin/build-matrix +15 -2
- data/docs/CNAME +1 -0
- data/docs/Mocha.html +254 -0
- data/docs/Mocha/API.html +1287 -0
- data/docs/Mocha/ClassMethods.html +264 -0
- data/docs/Mocha/Configuration.html +1525 -0
- data/docs/Mocha/Expectation.html +2654 -0
- data/docs/Mocha/ExpectationError.html +152 -0
- data/docs/Mocha/ExpectationErrorFactory.html +260 -0
- data/docs/Mocha/Hooks.html +370 -0
- data/docs/Mocha/Integration.html +125 -0
- data/docs/Mocha/Integration/MiniTest.html +123 -0
- data/docs/Mocha/Integration/MiniTest/Adapter.html +164 -0
- data/docs/Mocha/Integration/TestUnit.html +123 -0
- data/docs/Mocha/Integration/TestUnit/Adapter.html +164 -0
- data/docs/Mocha/Mock.html +1237 -0
- data/docs/Mocha/ObjectMethods.html +765 -0
- data/docs/Mocha/ParameterMatchers.html +2961 -0
- data/docs/Mocha/ParameterMatchers/AllOf.html +153 -0
- data/docs/Mocha/ParameterMatchers/AnyOf.html +153 -0
- data/docs/Mocha/ParameterMatchers/AnyParameters.html +153 -0
- data/docs/Mocha/ParameterMatchers/Anything.html +153 -0
- data/docs/Mocha/ParameterMatchers/Base.html +441 -0
- data/docs/Mocha/ParameterMatchers/Equals.html +153 -0
- data/docs/Mocha/ParameterMatchers/EquivalentUri.html +153 -0
- data/docs/Mocha/ParameterMatchers/HasEntries.html +153 -0
- data/docs/Mocha/ParameterMatchers/HasEntry.html +153 -0
- data/docs/Mocha/ParameterMatchers/HasKey.html +153 -0
- data/docs/Mocha/ParameterMatchers/HasValue.html +153 -0
- data/docs/Mocha/ParameterMatchers/Includes.html +153 -0
- data/docs/Mocha/ParameterMatchers/InstanceOf.html +153 -0
- data/docs/Mocha/ParameterMatchers/IsA.html +153 -0
- data/docs/Mocha/ParameterMatchers/KindOf.html +153 -0
- data/docs/Mocha/ParameterMatchers/Not.html +153 -0
- data/docs/Mocha/ParameterMatchers/Optionally.html +153 -0
- data/docs/Mocha/ParameterMatchers/RegexpMatches.html +153 -0
- data/docs/Mocha/ParameterMatchers/RespondsWith.html +153 -0
- data/docs/Mocha/ParameterMatchers/YamlEquivalent.html +153 -0
- data/docs/Mocha/Sequence.html +149 -0
- data/docs/Mocha/StateMachine.html +527 -0
- data/docs/Mocha/StateMachine/State.html +140 -0
- data/docs/Mocha/StateMachine/StatePredicate.html +140 -0
- data/docs/Mocha/StubbingError.html +150 -0
- data/docs/_index.html +519 -0
- data/docs/class_list.html +51 -0
- data/docs/css/common.css +1 -0
- data/docs/css/full_list.css +58 -0
- data/docs/css/style.css +496 -0
- data/docs/file.COPYING.html +81 -0
- data/docs/file.MIT-LICENSE.html +85 -0
- data/docs/file.README.html +448 -0
- data/docs/file.RELEASE.html +974 -0
- data/docs/file_list.html +71 -0
- data/docs/frames.html +17 -0
- data/docs/index.html +448 -0
- data/docs/js/app.js +303 -0
- data/docs/js/full_list.js +216 -0
- data/docs/js/jquery.js +4 -0
- data/docs/method_list.html +635 -0
- data/docs/top-level-namespace.html +118 -0
- 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 +11 -53
- data/lib/mocha/api.rb +120 -56
- data/lib/mocha/cardinality.rb +26 -11
- data/lib/mocha/class_methods.rb +17 -15
- data/lib/mocha/configuration.rb +351 -67
- data/lib/mocha/deprecation.rb +2 -1
- 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 +73 -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 +25 -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/stubbed_method.rb +127 -0
- 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 +3 -6
- 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_built_with_first_argument_type_being_string_test.rb +99 -0
- 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 +27 -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 +60 -35
- 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 +103 -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 +16 -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
- data/yard-templates/default/layout/html/google_analytics.erb +6 -9
- metadata +78 -61
- data/lib/mocha/class_method.rb +0 -113
- 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 -254
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
@@ -0,0 +1,127 @@
|
|
1
|
+
require 'mocha/ruby_version'
|
2
|
+
require 'mocha/singleton_class'
|
3
|
+
|
4
|
+
module Mocha
|
5
|
+
class StubbedMethod
|
6
|
+
PrependedModule = Class.new(Module)
|
7
|
+
|
8
|
+
attr_reader :stubbee, :method_name
|
9
|
+
|
10
|
+
def initialize(stubbee, method_name)
|
11
|
+
@stubbee = stubbee
|
12
|
+
@original_method = nil
|
13
|
+
@original_visibility = nil
|
14
|
+
@method_name = PRE_RUBY_V19 ? method_name.to_s : method_name.to_sym
|
15
|
+
end
|
16
|
+
|
17
|
+
def stub
|
18
|
+
hide_original_method
|
19
|
+
define_new_method
|
20
|
+
end
|
21
|
+
|
22
|
+
def unstub
|
23
|
+
remove_new_method
|
24
|
+
restore_original_method
|
25
|
+
mock.unstub(method_name.to_sym)
|
26
|
+
return if mock.any_expectations?
|
27
|
+
reset_mocha
|
28
|
+
end
|
29
|
+
|
30
|
+
def mock
|
31
|
+
mock_owner.mocha
|
32
|
+
end
|
33
|
+
|
34
|
+
def reset_mocha
|
35
|
+
mock_owner.reset_mocha
|
36
|
+
end
|
37
|
+
|
38
|
+
def hide_original_method
|
39
|
+
return unless original_method_owner.__method_exists__?(method_name)
|
40
|
+
store_original_method_visibility
|
41
|
+
if use_prepended_module_for_stub_method?
|
42
|
+
use_prepended_module_for_stub_method
|
43
|
+
else
|
44
|
+
begin
|
45
|
+
store_original_method
|
46
|
+
# rubocop:disable Lint/HandleExceptions
|
47
|
+
rescue NameError
|
48
|
+
# deal with nasties like ActiveRecord::Associations::AssociationProxy
|
49
|
+
end
|
50
|
+
# rubocop:enable Lint/HandleExceptions
|
51
|
+
if stub_method_overwrites_original_method?
|
52
|
+
remove_original_method_from_stubbee
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
def define_new_method
|
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)
|
64
|
+
end
|
65
|
+
|
66
|
+
def remove_new_method
|
67
|
+
stub_method_owner.send(:remove_method, method_name)
|
68
|
+
end
|
69
|
+
|
70
|
+
def store_original_method
|
71
|
+
@original_method = stubbee_method(method_name)
|
72
|
+
end
|
73
|
+
|
74
|
+
def restore_original_method
|
75
|
+
return if use_prepended_module_for_stub_method?
|
76
|
+
if stub_method_overwrites_original_method?
|
77
|
+
original_method_owner.send(:define_method, method_name, method_body(original_method))
|
78
|
+
end
|
79
|
+
retain_original_visibility(original_method_owner)
|
80
|
+
end
|
81
|
+
|
82
|
+
def matches?(other)
|
83
|
+
return false unless other.class == self.class
|
84
|
+
(stubbee.object_id == other.stubbee.object_id) && (method_name == other.method_name)
|
85
|
+
end
|
86
|
+
|
87
|
+
alias_method :==, :eql?
|
88
|
+
|
89
|
+
def to_s
|
90
|
+
"#{stubbee}.#{method_name}"
|
91
|
+
end
|
92
|
+
|
93
|
+
private
|
94
|
+
|
95
|
+
def retain_original_visibility(method_owner)
|
96
|
+
return unless original_visibility
|
97
|
+
Module.instance_method(original_visibility).bind(method_owner).call(method_name)
|
98
|
+
end
|
99
|
+
|
100
|
+
attr_reader :original_method, :original_visibility
|
101
|
+
|
102
|
+
def store_original_method_visibility
|
103
|
+
@original_visibility = original_method_owner.__method_visibility__(method_name)
|
104
|
+
end
|
105
|
+
|
106
|
+
def stub_method_overwrites_original_method?
|
107
|
+
original_method && original_method.owner == original_method_owner
|
108
|
+
end
|
109
|
+
|
110
|
+
def remove_original_method_from_stubbee
|
111
|
+
original_method_owner.send(:remove_method, method_name)
|
112
|
+
end
|
113
|
+
|
114
|
+
def use_prepended_module_for_stub_method?
|
115
|
+
RUBY_V2_PLUS
|
116
|
+
end
|
117
|
+
|
118
|
+
def use_prepended_module_for_stub_method
|
119
|
+
@stub_method_owner = PrependedModule.new
|
120
|
+
original_method_owner.__send__ :prepend, @stub_method_owner
|
121
|
+
end
|
122
|
+
|
123
|
+
def stub_method_owner
|
124
|
+
@stub_method_owner ||= original_method_owner
|
125
|
+
end
|
126
|
+
end
|
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']
|
@@ -16,12 +16,9 @@ Gem::Specification.new do |s|
|
|
16
16
|
s.files.delete('.travis.yml')
|
17
17
|
s.files.delete('.gitignore')
|
18
18
|
|
19
|
-
s.homepage = '
|
19
|
+
s.homepage = 'https://mocha.jamesmead.org'
|
20
20
|
s.require_paths = ['lib']
|
21
21
|
s.summary = 'Mocking and stubbing library'
|
22
|
-
s.has_rdoc = 'yard'
|
23
|
-
|
24
|
-
s.add_dependency('metaclass', '~> 0.0.1')
|
25
22
|
|
26
23
|
unless s.respond_to?(:add_development_dependency)
|
27
24
|
class << s
|
@@ -43,7 +40,7 @@ Gem::Specification.new do |s|
|
|
43
40
|
s.add_development_dependency('minitest')
|
44
41
|
end
|
45
42
|
if RUBY_VERSION >= '1.9.2'
|
46
|
-
s.add_development_dependency('rubocop')
|
43
|
+
s.add_development_dependency('rubocop', '<= 0.58.2')
|
47
44
|
end
|
48
45
|
if ENV['MOCHA_GENERATE_DOCS']
|
49
46
|
s.add_development_dependency('redcarpet')
|
@@ -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
|