Skip to content

Commit 7ad6ef6

Browse files
committed
Fix raise_error when block does not raise an error
Also fill in missing tests for raise_error.
1 parent 351fde7 commit 7ad6ef6

File tree

3 files changed

+627
-230
lines changed

3 files changed

+627
-230
lines changed

lib/super_diff/rspec/matcher_text_builders/raise_error.rb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,19 @@ class RaiseError < Base
55
protected
66

77
def actual_phrase
8-
"Expected raised exception"
8+
if actual
9+
"Expected raised exception"
10+
else
11+
"Expected"
12+
end
13+
end
14+
15+
def add_actual_value
16+
if actual
17+
template.add_text_in_color(beta_color) { actual }
18+
else
19+
template.add_text("block")
20+
end
921
end
1022
end
1123
end

lib/super_diff/rspec/monkey_patches.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,9 @@ def actual_for_matcher_text
605605
end
606606

607607
def actual_for_diff
608-
@actual_error.message
608+
if @actual_error
609+
@actual_error.message
610+
end
609611
end
610612

611613
def expected_for_matcher_text
@@ -625,7 +627,11 @@ def diffable?
625627
end
626628

627629
def expected_action_for_failure_message
628-
"match"
630+
if @actual_error
631+
"match"
632+
else
633+
"raise error"
634+
end
629635
end
630636

631637
def matcher_text_builder_class
@@ -634,7 +640,7 @@ def matcher_text_builder_class
634640
end)
635641

636642
def self.matcher_name
637-
'raise error'
643+
"raise error"
638644
end
639645
end
640646

0 commit comments

Comments
 (0)