Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify mockery and add check to include state in failure message #449

Closed
wants to merge 13 commits into from
Closed

Simplify mockery and add check to include state in failure message #449

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ee09a16
inline exception messages
nitishr Dec 25, 2019
8414a1f
unnecessary to set @instances to nil if empty
nitishr Dec 25, 2019
85ceb4a
consistently use @instances over mix of attr & method
nitishr Dec 25, 2019
5b5feb4
use terser ternary expr for backtrace
nitishr Dec 25, 2019
6d6a8b9
move stubbing_method_unnecessarily check outside loop
nitishr Dec 25, 2019
5946896
replace conditional next with reject
nitishr Dec 25, 2019
031309f
check for including state in unsatisfied message
nitishr Dec 25, 2019
2a5ecdc
consistently terminate Mockery#mocha_inspect with \n
nitishr Dec 25, 2019
e4bf4a5
loop over lists sharing same display template
nitishr Dec 25, 2019
3697ccd
get rid of accumulator by replacing each w/ map
nitishr Dec 25, 2019
2032001
replace 'unless empty?' with simpler 'if any?'
nitishr Dec 25, 2019
c474868
inline on_stubbing_method_unnecessarily used only once
nitishr Dec 25, 2019
9a1507a
remove unless stubbing_method_unnecessarily allow check
nitishr Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/mocha/mockery.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,12 @@ def state_machines

def mocha_inspect
message = ''
message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" unless unsatisfied_expectations.empty?
message << "satisfied expectations:\n- #{satisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" unless satisfied_expectations.empty?
message << "states:\n- #{state_machines.map(&:mocha_inspect).join("\n- ")}\n" unless state_machines.empty?
[
['unsatisfied expectations', unsatisfied_expectations], ['satisfied expectations', satisfied_expectations],
['states', state_machines]
].each do |label, list|
message << "#{label}:\n- #{list.map(&:mocha_inspect).join("\n- ")}\n" unless list.empty?
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While removing the duplication here is good, I'm not convinced that the resultant code is very easy to follow.

message
end

Expand Down