flexmock 2.4.1 → 2.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/flexmock/expectation.rb +8 -2
- data/lib/flexmock/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 55630790b40e21c94d842f9b5a173f0a3e2535aa40c4cc23c00aaaedaeaeb31a
|
4
|
+
data.tar.gz: 2afc06542cbe3ef561fb51239ccdfd646e677ee5508038d7532fe427049713f8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e41731de6baa727d4580e5033180becda98c24a9b0522bf41a802f133023e20d6052c2d4a812ee435204cc8159bfdab32d3ddc66922ba8a69b8bf4427e89e13e
|
7
|
+
data.tar.gz: fc31b71f78372d05cc3e44e7648d9a5c8c9f7499ac56a4713e63eb1a3db4ba4f9b2107ae989cf967d44e0206e0f8e134ec675821c3710248952835daa8e1b457
|
data/lib/flexmock/expectation.rb
CHANGED
@@ -128,7 +128,7 @@ class FlexMock
|
|
128
128
|
|
129
129
|
if @expected_block
|
130
130
|
ret_block.call(*args, &block)
|
131
|
-
elsif block
|
131
|
+
elsif block && @expected_block.nil?
|
132
132
|
ret_block.call(*args, block)
|
133
133
|
else
|
134
134
|
ret_block.call(*args)
|
@@ -407,6 +407,12 @@ class FlexMock
|
|
407
407
|
block ||= lambda { |value| value }
|
408
408
|
and_return { |*args, &orig_block|
|
409
409
|
begin
|
410
|
+
if @expected_block.nil? && !orig_block
|
411
|
+
if Proc === args.last
|
412
|
+
orig_block = args.last
|
413
|
+
args = args[0..-2]
|
414
|
+
end
|
415
|
+
end
|
410
416
|
block.call(@mock.flexmock_invoke_original(@sym, args, orig_block))
|
411
417
|
rescue NoMethodError => e
|
412
418
|
if e.name == @sym
|
@@ -414,7 +420,7 @@ class FlexMock
|
|
414
420
|
else
|
415
421
|
raise
|
416
422
|
end
|
417
|
-
end
|
423
|
+
end
|
418
424
|
}
|
419
425
|
end
|
420
426
|
|
data/lib/flexmock/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: flexmock
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.4.
|
4
|
+
version: 2.4.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jim Weirich
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2024-09-
|
12
|
+
date: 2024-09-16 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: minitest
|