mocha 1.0.0.alpha → 1.10.0.alpha
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.rubocop.yml +61 -0
- data/.rubocop_todo.yml +27 -0
- data/CONTRIBUTING.md +7 -0
- data/README.md +136 -42
- data/RELEASE.md +166 -16
- data/Rakefile +52 -36
- data/bin/build-matrix +32 -21
- data/docs/CNAME +1 -0
- data/docs/Mocha.html +254 -0
- data/docs/Mocha/API.html +1129 -0
- data/docs/Mocha/ClassMethods.html +339 -0
- data/docs/Mocha/Configuration.html +1383 -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 +429 -0
- data/docs/file.RELEASE.html +942 -0
- data/docs/file_list.html +71 -0
- data/docs/frames.html +17 -0
- data/docs/index.html +429 -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/gemfiles/Gemfile.test-unit.latest +5 -1
- data/init.rb +1 -3
- data/lib/mocha.rb +8 -0
- data/lib/mocha/any_instance_method.rb +12 -50
- data/lib/mocha/api.rb +63 -65
- data/lib/mocha/argument_iterator.rb +4 -8
- data/lib/mocha/backtrace_filter.rb +1 -5
- data/lib/mocha/cardinality.rb +43 -35
- data/lib/mocha/central.rb +21 -12
- data/lib/mocha/change_state_side_effect.rb +0 -4
- data/lib/mocha/class_methods.rb +18 -20
- data/lib/mocha/configuration.rb +305 -18
- data/lib/mocha/debug.rb +3 -2
- data/lib/mocha/deprecation.rb +6 -10
- data/lib/mocha/detection/mini_test.rb +0 -2
- data/lib/mocha/detection/test_unit.rb +3 -5
- data/lib/mocha/error_with_filtered_backtrace.rb +13 -0
- data/lib/mocha/exception_raiser.rb +4 -6
- data/lib/mocha/expectation.rb +62 -67
- data/lib/mocha/expectation_error.rb +1 -1
- data/lib/mocha/expectation_error_factory.rb +0 -1
- data/lib/mocha/expectation_list.rb +7 -11
- data/lib/mocha/hooks.rb +1 -3
- data/lib/mocha/in_state_ordering_constraint.rb +0 -4
- data/lib/mocha/inspect.rb +28 -38
- data/lib/mocha/instance_method.rb +15 -8
- data/lib/mocha/integration.rb +2 -5
- data/lib/mocha/integration/mini_test.rb +7 -0
- data/lib/mocha/integration/mini_test/adapter.rb +2 -4
- data/lib/mocha/integration/mini_test/exception_translation.rb +1 -1
- data/lib/mocha/integration/mini_test/nothing.rb +4 -4
- data/lib/mocha/integration/mini_test/version_13.rb +4 -1
- data/lib/mocha/integration/mini_test/version_140.rb +4 -1
- data/lib/mocha/integration/mini_test/version_141.rb +4 -1
- data/lib/mocha/integration/mini_test/version_142_to_172.rb +4 -1
- data/lib/mocha/integration/mini_test/version_200.rb +4 -1
- data/lib/mocha/integration/mini_test/version_201_to_222.rb +4 -1
- data/lib/mocha/integration/mini_test/version_2110_to_2111.rb +4 -1
- data/lib/mocha/integration/mini_test/version_2112_to_320.rb +4 -1
- data/lib/mocha/integration/mini_test/version_230_to_2101.rb +4 -1
- data/lib/mocha/integration/monkey_patcher.rb +8 -2
- data/lib/mocha/integration/test_unit.rb +7 -0
- data/lib/mocha/integration/test_unit/adapter.rb +5 -6
- data/lib/mocha/integration/test_unit/gem_version_200.rb +5 -2
- data/lib/mocha/integration/test_unit/gem_version_201_to_202.rb +5 -2
- data/lib/mocha/integration/test_unit/gem_version_203_to_220.rb +5 -2
- data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb +5 -2
- data/lib/mocha/integration/test_unit/nothing.rb +4 -4
- data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb +4 -1
- data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb +4 -1
- data/lib/mocha/invocation.rb +61 -0
- data/lib/mocha/is_a.rb +0 -2
- data/lib/mocha/logger.rb +0 -4
- data/lib/mocha/macos_version.rb +5 -0
- data/lib/mocha/method_matcher.rb +1 -5
- data/lib/mocha/minitest.rb +8 -0
- data/lib/mocha/mock.rb +70 -44
- data/lib/mocha/mockery.rb +78 -91
- data/lib/mocha/multiple_yields.rb +0 -5
- data/lib/mocha/names.rb +2 -12
- data/lib/mocha/no_yields.rb +1 -7
- data/lib/mocha/not_initialized_error.rb +7 -0
- data/lib/mocha/object_methods.rb +27 -33
- data/lib/mocha/parameter_matchers.rb +2 -4
- data/lib/mocha/parameter_matchers/all_of.rb +2 -8
- data/lib/mocha/parameter_matchers/any_of.rb +2 -8
- data/lib/mocha/parameter_matchers/any_parameters.rb +3 -9
- data/lib/mocha/parameter_matchers/anything.rb +2 -8
- data/lib/mocha/parameter_matchers/base.rb +6 -12
- data/lib/mocha/parameter_matchers/equals.rb +1 -7
- data/lib/mocha/parameter_matchers/{query_string.rb → equivalent_uri.rb} +15 -15
- data/lib/mocha/parameter_matchers/has_entries.rb +2 -6
- data/lib/mocha/parameter_matchers/has_entry.rb +8 -11
- data/lib/mocha/parameter_matchers/has_key.rb +2 -6
- data/lib/mocha/parameter_matchers/has_value.rb +2 -6
- data/lib/mocha/parameter_matchers/includes.rb +50 -8
- data/lib/mocha/parameter_matchers/instance_methods.rb +18 -0
- data/lib/mocha/parameter_matchers/instance_of.rb +0 -6
- data/lib/mocha/parameter_matchers/is_a.rb +2 -6
- data/lib/mocha/parameter_matchers/kind_of.rb +2 -6
- data/lib/mocha/parameter_matchers/not.rb +2 -6
- data/lib/mocha/parameter_matchers/optionally.rb +4 -10
- data/lib/mocha/parameter_matchers/regexp_matches.rb +0 -6
- data/lib/mocha/parameter_matchers/responds_with.rb +3 -8
- data/lib/mocha/parameter_matchers/yaml_equivalent.rb +2 -6
- data/lib/mocha/parameters_matcher.rb +6 -9
- data/lib/mocha/pretty_parameters.rb +0 -4
- data/lib/mocha/raised_exception.rb +11 -0
- data/lib/mocha/receivers.rb +10 -14
- data/lib/mocha/return_values.rb +4 -8
- data/lib/mocha/ruby_version.rb +4 -0
- data/lib/mocha/sequence.rb +4 -9
- data/lib/mocha/setup.rb +5 -0
- data/lib/mocha/single_return_value.rb +2 -5
- data/lib/mocha/single_yield.rb +0 -5
- data/lib/mocha/singleton_class.rb +9 -0
- data/lib/mocha/state_machine.rb +6 -10
- data/lib/mocha/stubbed_method.rb +127 -0
- data/lib/mocha/stubbing_error.rb +2 -13
- data/lib/mocha/test_unit.rb +7 -2
- data/lib/mocha/thrower.rb +4 -6
- data/lib/mocha/thrown_object.rb +12 -0
- data/lib/mocha/version.rb +1 -1
- data/lib/mocha/yield_parameters.rb +3 -7
- data/mocha.gemspec +35 -39
- data/test/acceptance/acceptance_test_helper.rb +6 -6
- data/test/acceptance/bug_18914_test.rb +7 -13
- data/test/acceptance/bug_21465_test.rb +0 -3
- data/test/acceptance/bug_21563_test.rb +0 -3
- data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb +69 -0
- data/test/acceptance/exception_rescue_test.rb +7 -9
- data/test/acceptance/expectations_on_multiple_methods_test.rb +2 -2
- data/test/acceptance/expected_invocation_count_test.rb +27 -30
- data/test/acceptance/failure_messages_test.rb +3 -6
- data/test/acceptance/issue_272_test.rb +50 -0
- data/test/acceptance/issue_65_test.rb +15 -14
- data/test/acceptance/issue_70_test.rb +0 -2
- data/test/acceptance/mocha_example_test.rb +5 -7
- data/test/acceptance/mocha_test_result_test.rb +7 -8
- data/test/acceptance/mock_test.rb +48 -9
- data/test/acceptance/mocked_methods_dispatch_test.rb +0 -3
- data/test/acceptance/multiple_expectations_failure_message_test.rb +16 -18
- data/test/acceptance/optional_parameters_test.rb +0 -3
- data/test/acceptance/parameter_matcher_test.rb +6 -44
- data/test/acceptance/partial_mocks_test.rb +4 -7
- data/test/acceptance/prepend_test.rb +86 -0
- data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb +76 -0
- data/test/acceptance/raise_exception_test.rb +2 -5
- data/test/acceptance/return_value_test.rb +0 -3
- data/test/acceptance/sequence_test.rb +9 -12
- data/test/acceptance/states_test.rb +6 -5
- data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb +33 -3
- data/test/acceptance/stub_any_instance_method_test.rb +119 -21
- data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +8 -9
- data/test/acceptance/stub_class_method_defined_on_class_test.rb +5 -5
- data/test/acceptance/stub_class_method_defined_on_module_test.rb +0 -2
- data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +34 -2
- data/test/acceptance/stub_everything_test.rb +1 -4
- data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +6 -8
- data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +0 -2
- data/test/acceptance/stub_instance_method_defined_on_class_test.rb +3 -5
- data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +63 -2
- data/test/acceptance/stub_instance_method_defined_on_module_test.rb +3 -2
- data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +2 -2
- data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +0 -3
- data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +0 -2
- data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb +38 -0
- data/test/acceptance/stub_module_method_test.rb +58 -21
- data/test/acceptance/stub_test.rb +1 -4
- data/test/acceptance/stubba_example_test.rb +6 -15
- data/test/acceptance/stubba_test_result_test.rb +11 -6
- data/test/acceptance/stubbing_error_backtrace_test.rb +6 -7
- data/test/acceptance/stubbing_frozen_object_test.rb +2 -2
- data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +12 -8
- data/test/acceptance/stubbing_method_unnecessarily_test.rb +5 -7
- data/test/acceptance/stubbing_nil_test.rb +36 -35
- data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +23 -12
- data/test/acceptance/stubbing_non_existent_class_method_test.rb +14 -14
- data/test/acceptance/stubbing_non_existent_instance_method_test.rb +12 -14
- data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +8 -10
- data/test/acceptance/stubbing_non_public_class_method_test.rb +12 -12
- data/test/acceptance/stubbing_non_public_instance_method_test.rb +10 -12
- data/test/acceptance/stubbing_on_non_mock_object_test.rb +17 -11
- data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +3 -5
- data/test/acceptance/throw_test.rb +0 -3
- data/test/acceptance/unexpected_invocation_test.rb +2 -4
- data/test/acceptance/unstubbing_test.rb +41 -15
- data/test/assertions.rb +6 -4
- data/test/deprecation_disabler.rb +1 -1
- data/test/execution_point.rb +7 -7
- data/test/integration/mini_test_test.rb +2 -2
- data/test/integration/shared_tests.rb +27 -23
- data/test/integration/test_unit_test.rb +2 -2
- data/test/method_definer.rb +11 -19
- data/test/mini_test_result.rb +17 -11
- data/test/minitest_result.rb +2 -3
- data/test/simple_counter.rb +0 -2
- data/test/test_helper.rb +13 -5
- data/test/test_runner.rb +5 -5
- data/test/test_unit_result.rb +4 -2
- data/test/unit/any_instance_method_test.rb +74 -31
- data/test/unit/array_inspect_test.rb +2 -4
- data/test/unit/backtrace_filter_test.rb +3 -5
- data/test/unit/cardinality_test.rb +41 -25
- data/test/unit/central_test.rb +26 -28
- data/test/unit/change_state_side_effect_test.rb +0 -4
- data/test/unit/class_methods_test.rb +35 -6
- data/test/unit/configuration_test.rb +13 -14
- data/test/unit/date_time_inspect_test.rb +1 -3
- data/test/unit/exception_raiser_test.rb +10 -7
- data/test/unit/expectation_list_test.rb +13 -13
- data/test/unit/expectation_test.rb +111 -131
- data/test/unit/hash_inspect_test.rb +3 -5
- data/test/unit/hooks_test.rb +14 -8
- data/test/unit/in_state_ordering_constraint_test.rb +0 -4
- data/test/unit/instance_method_test.rb +282 -0
- data/test/unit/method_matcher_test.rb +1 -3
- data/test/unit/mock_test.rb +56 -25
- data/test/unit/mockery_test.rb +49 -29
- data/test/unit/module_methods_test.rb +2 -5
- data/test/unit/multiple_yields_test.rb +0 -2
- data/test/unit/no_yields_test.rb +0 -2
- data/test/unit/object_inspect_test.rb +27 -5
- data/test/unit/object_methods_test.rb +25 -8
- data/test/unit/parameter_matchers/all_of_test.rb +0 -2
- data/test/unit/parameter_matchers/any_of_test.rb +0 -2
- data/test/unit/parameter_matchers/anything_test.rb +2 -4
- data/test/unit/parameter_matchers/equals_test.rb +1 -3
- data/test/unit/parameter_matchers/equivalent_uri_test.rb +41 -0
- data/test/unit/parameter_matchers/has_entries_test.rb +3 -3
- data/test/unit/parameter_matchers/has_entry_test.rb +16 -17
- data/test/unit/parameter_matchers/has_key_test.rb +1 -2
- data/test/unit/parameter_matchers/has_value_test.rb +2 -4
- data/test/unit/parameter_matchers/includes_test.rb +50 -3
- data/test/unit/parameter_matchers/instance_of_test.rb +1 -3
- data/test/unit/parameter_matchers/is_a_test.rb +1 -3
- data/test/unit/parameter_matchers/kind_of_test.rb +1 -3
- data/test/unit/parameter_matchers/not_test.rb +0 -2
- data/test/unit/parameter_matchers/regexp_matches_test.rb +1 -2
- data/test/unit/parameter_matchers/responds_with_test.rb +10 -4
- data/test/unit/parameter_matchers/stub_matcher.rb +0 -4
- data/test/unit/parameter_matchers/yaml_equivalent_test.rb +1 -3
- data/test/unit/parameters_matcher_test.rb +2 -4
- data/test/unit/receivers_test.rb +35 -5
- data/test/unit/return_values_test.rb +28 -25
- data/test/unit/sequence_test.rb +1 -5
- data/test/unit/single_return_value_test.rb +6 -3
- data/test/unit/single_yield_test.rb +0 -2
- data/test/unit/state_machine_test.rb +1 -3
- data/test/unit/string_inspect_test.rb +3 -5
- data/test/unit/thrower_test.rb +7 -4
- data/test/unit/yield_parameters_test.rb +0 -2
- data/yard-templates/default/layout/html/google_analytics.erb +6 -9
- data/yard-templates/default/layout/html/setup.rb +2 -3
- metadata +99 -42
- data/lib/mocha/class_method.rb +0 -106
- data/lib/mocha/mini_test.rb +0 -3
- data/lib/mocha/module_method.rb +0 -16
- data/lib/mocha/module_methods.rb +0 -14
- data/lib/mocha/parameter_matchers/object.rb +0 -17
- data/lib/mocha/standalone.rb +0 -4
- data/lib/mocha/unexpected_invocation.rb +0 -26
- data/lib/mocha_standalone.rb +0 -4
- data/test/acceptance/mock_with_initializer_block_test.rb +0 -51
- data/test/unit/class_method_test.rb +0 -223
data/test/assertions.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
|
+
require 'mocha/ruby_version'
|
2
|
+
|
1
3
|
module Assertions
|
2
|
-
def
|
3
|
-
method_key =
|
4
|
-
assert object.send("#{visiblity}_methods"
|
4
|
+
def assert_method_visibility(object, method_name, visiblity)
|
5
|
+
method_key = Mocha::PRE_RUBY_V19 ? method_name.to_s : method_name.to_sym
|
6
|
+
assert object.send("#{visiblity}_methods").include?(method_key), "#{method_name} is not #{visiblity}"
|
5
7
|
end
|
6
|
-
end
|
8
|
+
end
|
@@ -1,7 +1,6 @@
|
|
1
1
|
require 'mocha/deprecation'
|
2
2
|
|
3
3
|
module DeprecationDisabler
|
4
|
-
|
5
4
|
def disable_deprecations
|
6
5
|
original_mode = Mocha::Deprecation.mode
|
7
6
|
Mocha::Deprecation.mode = :disabled
|
@@ -12,4 +11,5 @@ module DeprecationDisabler
|
|
12
11
|
end
|
13
12
|
end
|
14
13
|
|
14
|
+
module_function :disable_deprecations
|
15
15
|
end
|
data/test/execution_point.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
class ExecutionPoint
|
2
|
-
|
3
2
|
attr_reader :backtrace
|
4
3
|
|
5
4
|
def self.current
|
@@ -10,19 +9,21 @@ class ExecutionPoint
|
|
10
9
|
@backtrace = backtrace
|
11
10
|
end
|
12
11
|
|
12
|
+
def first_relevant_line_of_backtrace
|
13
|
+
@backtrace && (@backtrace.reject { |l| %r{\Aorg/jruby/}.match(l) }.first || 'unknown:0')
|
14
|
+
end
|
15
|
+
|
13
16
|
def file_name
|
14
|
-
|
15
|
-
/\A(.*?):\d+/.match(@backtrace.first)[1]
|
17
|
+
/\A(.*?):\d+/.match(first_relevant_line_of_backtrace)[1]
|
16
18
|
end
|
17
19
|
|
18
20
|
def line_number
|
19
|
-
|
20
|
-
Integer(/\A.*?:(\d+)/.match(@backtrace.first)[1])
|
21
|
+
Integer(/\A.*?:(\d+)/.match(first_relevant_line_of_backtrace)[1])
|
21
22
|
end
|
22
23
|
|
23
24
|
def ==(other)
|
24
25
|
return false unless other.is_a?(ExecutionPoint)
|
25
|
-
(file_name == other.file_name)
|
26
|
+
(file_name == other.file_name) && (line_number == other.line_number)
|
26
27
|
end
|
27
28
|
|
28
29
|
def to_s
|
@@ -32,5 +33,4 @@ class ExecutionPoint
|
|
32
33
|
def inspect
|
33
34
|
to_s
|
34
35
|
end
|
35
|
-
|
36
36
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'test_runner'
|
2
2
|
require 'execution_point'
|
3
3
|
|
4
|
+
# rubocop:disable Metrics/ModuleLength
|
4
5
|
module SharedTests
|
5
6
|
include TestRunner
|
6
7
|
|
@@ -11,6 +12,7 @@ module SharedTests
|
|
11
12
|
assert_passed(test_result)
|
12
13
|
end
|
13
14
|
|
15
|
+
# rubocop:disable Style/Semicolon
|
14
16
|
def test_assertion_unsatisfied
|
15
17
|
execution_point = nil
|
16
18
|
test_result = run_as_test do
|
@@ -24,19 +26,19 @@ module SharedTests
|
|
24
26
|
def test_mock_object_unexpected_invocation
|
25
27
|
execution_point = nil
|
26
28
|
test_result = run_as_test do
|
27
|
-
mock = mock(
|
29
|
+
mock = mock('not expecting invocation')
|
28
30
|
execution_point = ExecutionPoint.current; mock.unexpected
|
29
31
|
end
|
30
32
|
assert_failed(test_result)
|
31
33
|
failure = test_result.failures.first
|
32
34
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
33
|
-
assert_equal [
|
35
|
+
assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines
|
34
36
|
end
|
35
37
|
|
36
38
|
def test_mock_object_explicitly_unexpected_invocation
|
37
39
|
execution_point = nil
|
38
40
|
test_result = run_as_test do
|
39
|
-
mock = mock(
|
41
|
+
mock = mock('not expecting invocation')
|
40
42
|
mock.expects(:unexpected).never
|
41
43
|
execution_point = ExecutionPoint.current; mock.unexpected
|
42
44
|
end
|
@@ -44,25 +46,25 @@ module SharedTests
|
|
44
46
|
failure = test_result.failures.first
|
45
47
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
46
48
|
assert_equal [
|
47
|
-
|
48
|
-
|
49
|
-
|
49
|
+
'unexpected invocation: #<Mock:not expecting invocation>.unexpected()',
|
50
|
+
'unsatisfied expectations:',
|
51
|
+
'- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)'
|
50
52
|
], test_result.failure_message_lines
|
51
53
|
end
|
52
54
|
|
53
55
|
def test_mock_object_unsatisfied_expectation
|
54
56
|
execution_point = nil
|
55
57
|
test_result = run_as_test do
|
56
|
-
mock = mock(
|
58
|
+
mock = mock('expecting invocation')
|
57
59
|
execution_point = ExecutionPoint.current; mock.expects(:expected)
|
58
60
|
end
|
59
61
|
assert_failed(test_result)
|
60
62
|
failure = test_result.failures.first
|
61
63
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
62
64
|
assert_equal [
|
63
|
-
|
64
|
-
|
65
|
-
|
65
|
+
'not all expectations were satisfied',
|
66
|
+
'unsatisfied expectations:',
|
67
|
+
'- expected exactly once, invoked never: #<Mock:expecting invocation>.expected(any_parameters)'
|
66
68
|
], test_result.failure_message_lines
|
67
69
|
end
|
68
70
|
|
@@ -70,7 +72,7 @@ module SharedTests
|
|
70
72
|
execution_point = nil
|
71
73
|
test_result = run_as_tests(
|
72
74
|
:setup => lambda {
|
73
|
-
mock = mock(
|
75
|
+
mock = mock('not expecting invocation')
|
74
76
|
execution_point = ExecutionPoint.current; mock.unexpected
|
75
77
|
},
|
76
78
|
:test_me => lambda {
|
@@ -80,14 +82,14 @@ module SharedTests
|
|
80
82
|
assert_failed(test_result)
|
81
83
|
failure = test_result.failures.first
|
82
84
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
83
|
-
assert_equal [
|
85
|
+
assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines
|
84
86
|
end
|
85
87
|
|
86
88
|
def test_mock_object_unsatisfied_expectation_in_setup
|
87
89
|
execution_point = nil
|
88
90
|
test_result = run_as_tests(
|
89
91
|
:setup => lambda {
|
90
|
-
mock = mock(
|
92
|
+
mock = mock('expecting invocation')
|
91
93
|
execution_point = ExecutionPoint.current; mock.expects(:expected)
|
92
94
|
},
|
93
95
|
:test_me => lambda {
|
@@ -98,9 +100,9 @@ module SharedTests
|
|
98
100
|
failure = test_result.failures.first
|
99
101
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
100
102
|
assert_equal [
|
101
|
-
|
102
|
-
|
103
|
-
|
103
|
+
'not all expectations were satisfied',
|
104
|
+
'unsatisfied expectations:',
|
105
|
+
'- expected exactly once, invoked never: #<Mock:expecting invocation>.expected(any_parameters)'
|
104
106
|
], test_result.failure_message_lines
|
105
107
|
end
|
106
108
|
|
@@ -111,14 +113,14 @@ module SharedTests
|
|
111
113
|
assert true
|
112
114
|
},
|
113
115
|
:teardown => lambda {
|
114
|
-
mock = mock(
|
116
|
+
mock = mock('not expecting invocation')
|
115
117
|
execution_point = ExecutionPoint.current; mock.unexpected
|
116
118
|
}
|
117
119
|
)
|
118
120
|
assert_failed(test_result)
|
119
121
|
failure = test_result.failures.first
|
120
122
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
121
|
-
assert_equal [
|
123
|
+
assert_equal ['unexpected invocation: #<Mock:not expecting invocation>.unexpected()'], test_result.failure_message_lines
|
122
124
|
end
|
123
125
|
|
124
126
|
def test_real_object_explicitly_unexpected_invocation
|
@@ -133,7 +135,7 @@ module SharedTests
|
|
133
135
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
134
136
|
assert_equal [
|
135
137
|
"unexpected invocation: #{object.mocha_inspect}.unexpected()",
|
136
|
-
|
138
|
+
'unsatisfied expectations:',
|
137
139
|
"- expected never, invoked once: #{object.mocha_inspect}.unexpected(any_parameters)"
|
138
140
|
], test_result.failure_message_lines
|
139
141
|
end
|
@@ -148,9 +150,9 @@ module SharedTests
|
|
148
150
|
failure = test_result.failures.first
|
149
151
|
assert_equal execution_point, ExecutionPoint.new(failure.location)
|
150
152
|
assert_equal [
|
151
|
-
|
152
|
-
|
153
|
-
"- expected exactly once,
|
153
|
+
'not all expectations were satisfied',
|
154
|
+
'unsatisfied expectations:',
|
155
|
+
"- expected exactly once, invoked never: #{object.mocha_inspect}.expected(any_parameters)"
|
154
156
|
], test_result.failure_message_lines
|
155
157
|
end
|
156
158
|
|
@@ -169,6 +171,8 @@ module SharedTests
|
|
169
171
|
assert_failed(test_result)
|
170
172
|
exception = test_result.errors.first.exception
|
171
173
|
assert_equal execution_point, ExecutionPoint.new(exception.backtrace)
|
172
|
-
assert_match
|
174
|
+
assert_match(/undefined method `foo'/, exception.message)
|
173
175
|
end
|
176
|
+
# rubocop:enable Style/Semicolon
|
174
177
|
end
|
178
|
+
# rubocop:enable Metrics/ModuleLength
|
data/test/method_definer.rb
CHANGED
@@ -1,24 +1,16 @@
|
|
1
|
-
require '
|
1
|
+
require 'mocha/singleton_class'
|
2
2
|
|
3
|
-
module
|
4
|
-
|
5
|
-
|
6
|
-
def define_instance_method(method_symbol, &block)
|
7
|
-
__metaclass__.send(:define_method, method_symbol, block)
|
8
|
-
end
|
9
|
-
|
10
|
-
def replace_instance_method(method_symbol, &block)
|
11
|
-
raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless self.respond_to?(method_symbol)
|
12
|
-
define_instance_method(method_symbol, &block)
|
13
|
-
end
|
14
|
-
|
15
|
-
def define_instance_accessor(*symbols)
|
16
|
-
symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
|
17
|
-
end
|
3
|
+
module MethodDefiner
|
4
|
+
def define_instance_method(object, method_symbol, &block)
|
5
|
+
object.singleton_class.send(:define_method, method_symbol, block)
|
18
6
|
end
|
19
7
|
|
20
|
-
|
8
|
+
def replace_instance_method(object, method_symbol, &block)
|
9
|
+
raise "Cannot replace #{method_symbol} as #{self} does not respond to it." unless object.respond_to?(method_symbol)
|
10
|
+
define_instance_method(object, method_symbol, &block)
|
11
|
+
end
|
21
12
|
|
22
|
-
|
23
|
-
|
13
|
+
def define_instance_accessor(object, *symbols)
|
14
|
+
symbols.each { |symbol| object.singleton_class.send(:attr_accessor, symbol) }
|
15
|
+
end
|
24
16
|
end
|
data/test/mini_test_result.rb
CHANGED
@@ -2,16 +2,15 @@ require 'stringio'
|
|
2
2
|
require 'minitest/unit'
|
3
3
|
|
4
4
|
class MiniTestResult
|
5
|
-
|
6
5
|
minitest_version = Gem::Version.new(::MiniTest::Unit::VERSION)
|
7
6
|
if Gem::Requirement.new('<= 4.6.1').satisfied_by?(minitest_version)
|
8
|
-
FAILURE_PATTERN =
|
9
|
-
ERROR_PATTERN =
|
10
|
-
PATTERN_INDICES = { :method => 2, :testcase => 3 }
|
7
|
+
FAILURE_PATTERN = /(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n/m
|
8
|
+
ERROR_PATTERN = /(Error)\:\n([^\(]+)\(([^\)]+)\)\:\n(.+?)\n/m
|
9
|
+
PATTERN_INDICES = { :method => 2, :testcase => 3 }.freeze
|
11
10
|
else
|
12
|
-
FAILURE_PATTERN =
|
13
|
-
ERROR_PATTERN =
|
14
|
-
PATTERN_INDICES = { :method => 3, :testcase => 2 }
|
11
|
+
FAILURE_PATTERN = /(Failure)\:\n.([^#]+)\#([^ ]+) \[([^\]]+)\]\:\n(.*)\n/m
|
12
|
+
ERROR_PATTERN = /(Error)\:\n.([^#]+)\#([^ ]+)\:\n(.+?)\n/m
|
13
|
+
PATTERN_INDICES = { :method => 3, :testcase => 2 }.freeze
|
15
14
|
end
|
16
15
|
|
17
16
|
def self.parse_failure(raw)
|
@@ -30,7 +29,10 @@ class MiniTestResult
|
|
30
29
|
class Failure
|
31
30
|
attr_reader :method, :test_case, :location, :message
|
32
31
|
def initialize(method, test_case, location, message)
|
33
|
-
@method
|
32
|
+
@method = method
|
33
|
+
@test_case = test_case
|
34
|
+
@location = location
|
35
|
+
@message = message
|
34
36
|
end
|
35
37
|
end
|
36
38
|
|
@@ -38,18 +40,22 @@ class MiniTestResult
|
|
38
40
|
class Exception
|
39
41
|
attr_reader :message, :backtrace
|
40
42
|
def initialize(message, location)
|
41
|
-
@message
|
43
|
+
@message = message
|
44
|
+
@backtrace = location
|
42
45
|
end
|
43
46
|
end
|
44
47
|
|
45
48
|
attr_reader :method, :test_case, :exception
|
46
49
|
def initialize(method, test_case, message, backtrace)
|
47
|
-
@method
|
50
|
+
@method = method
|
51
|
+
@test_case = test_case
|
52
|
+
@exception = Exception.new(message, backtrace)
|
48
53
|
end
|
49
54
|
end
|
50
55
|
|
51
56
|
def initialize(runner, tests)
|
52
|
-
@runner
|
57
|
+
@runner = runner
|
58
|
+
@tests = tests
|
53
59
|
end
|
54
60
|
|
55
61
|
def failure_count
|
data/test/minitest_result.rb
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
require 'forwardable'
|
2
2
|
|
3
3
|
class MinitestResult
|
4
|
-
|
5
4
|
class Failure
|
6
5
|
extend Forwardable
|
7
6
|
def_delegators :@failure, :message, :backtrace
|
@@ -20,7 +19,7 @@ class MinitestResult
|
|
20
19
|
end
|
21
20
|
|
22
21
|
def failures
|
23
|
-
@tests.map(&:failures).flatten.select { |r| Minitest::Assertion
|
22
|
+
@tests.map(&:failures).flatten.select { |r| r.instance_of?(Minitest::Assertion) }.map { |f| Failure.new(f) }
|
24
23
|
end
|
25
24
|
|
26
25
|
def failure_count
|
@@ -32,7 +31,7 @@ class MinitestResult
|
|
32
31
|
end
|
33
32
|
|
34
33
|
def errors
|
35
|
-
@tests.map(&:failures).flatten.select { |r| Minitest::UnexpectedError
|
34
|
+
@tests.map(&:failures).flatten.select { |r| r.instance_of?(Minitest::UnexpectedError) }
|
36
35
|
end
|
37
36
|
|
38
37
|
def error_count
|
data/test/simple_counter.rb
CHANGED
data/test/test_helper.rb
CHANGED
@@ -2,22 +2,26 @@ unless defined?(STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS)
|
|
2
2
|
STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS = Object.instance_methods + Object.private_instance_methods
|
3
3
|
end
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
5
|
+
$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
|
6
|
+
$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__)))
|
7
|
+
$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
|
8
|
+
$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
|
9
|
+
$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
|
10
10
|
|
11
11
|
require 'mocha/detection/mini_test'
|
12
12
|
|
13
13
|
begin
|
14
14
|
require 'minitest'
|
15
|
+
# rubocop:disable Lint/HandleExceptions
|
15
16
|
rescue LoadError
|
16
17
|
end
|
18
|
+
# rubocop:enable Lint/HandleExceptions
|
17
19
|
begin
|
18
20
|
require 'minitest/unit'
|
21
|
+
# rubocop:disable Lint/HandleExceptions
|
19
22
|
rescue LoadError
|
20
23
|
end
|
24
|
+
# rubocop:enable Lint/HandleExceptions
|
21
25
|
|
22
26
|
module Mocha; end
|
23
27
|
|
@@ -27,6 +31,7 @@ if (minitest_testcase = Mocha::Detection::MiniTest.testcase) && (ENV['MOCHA_RUN_
|
|
27
31
|
rescue LoadError
|
28
32
|
MiniTest::Unit.autorun
|
29
33
|
end
|
34
|
+
# rubocop:disable Style/ClassAndModuleChildren
|
30
35
|
class Mocha::TestCase < minitest_testcase
|
31
36
|
def assert_nothing_raised(exception = StandardError)
|
32
37
|
yield
|
@@ -39,12 +44,15 @@ if (minitest_testcase = Mocha::Detection::MiniTest.testcase) && (ENV['MOCHA_RUN_
|
|
39
44
|
alias_method :assert_not_same, :refute_same
|
40
45
|
alias_method :assert_no_match, :refute_match
|
41
46
|
end
|
47
|
+
# rubocop:enable Style/ClassAndModuleChildren
|
42
48
|
else
|
43
49
|
require 'test/unit'
|
50
|
+
# rubocop:disable Style/ClassAndModuleChildren
|
44
51
|
class Mocha::TestCase < Test::Unit::TestCase
|
45
52
|
def test_dummy
|
46
53
|
# Some versions (?) of Test::Unit try to run this base class as a test case
|
47
54
|
# and it fails because it has no test methods, so I'm adding a dummy test.
|
48
55
|
end
|
49
56
|
end
|
57
|
+
# rubocop:enable Style/ClassAndModuleChildren
|
50
58
|
end
|
data/test/test_runner.rb
CHANGED
@@ -7,6 +7,7 @@ module TestRunner
|
|
7
7
|
run_as_tests(:test_me => block)
|
8
8
|
end
|
9
9
|
|
10
|
+
# rubocop:disable Metrics/AbcSize
|
10
11
|
def run_as_tests(methods = {})
|
11
12
|
base_class = Mocha::TestCase
|
12
13
|
test_class = Class.new(base_class) do
|
@@ -23,9 +24,7 @@ module TestRunner
|
|
23
24
|
minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
|
24
25
|
if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
|
25
26
|
require File.expand_path('../minitest_result', __FILE__)
|
26
|
-
tests.each
|
27
|
-
test.run
|
28
|
-
end
|
27
|
+
tests.each(&:run)
|
29
28
|
Minitest::Runnable.runnables.delete(test_class)
|
30
29
|
test_result = MinitestResult.new(tests)
|
31
30
|
elsif Gem::Requirement.new('> 0.0.0', '< 5.0.0').satisfied_by?(minitest_version)
|
@@ -46,13 +45,14 @@ module TestRunner
|
|
46
45
|
|
47
46
|
test_result
|
48
47
|
end
|
48
|
+
# rubocop:enable Metrics/AbcSize
|
49
49
|
|
50
50
|
def assert_passed(test_result)
|
51
51
|
flunk "Test failed unexpectedly with message: #{test_result.failures}" if test_result.failure_count > 0
|
52
|
-
flunk "Test failed unexpectedly with message: #{test_result.errors}" if test_result.error_count > 0
|
52
|
+
flunk "Test failed unexpectedly with message: #{test_result.errors.map(&:exception)}" if test_result.error_count > 0
|
53
53
|
end
|
54
54
|
|
55
55
|
def assert_failed(test_result)
|
56
|
-
flunk
|
56
|
+
flunk 'Test passed unexpectedly' unless test_result.failure_count + test_result.error_count > 0
|
57
57
|
end
|
58
58
|
end
|