Skip to content

Commit 6d63b15

Browse files
authored
Merge pull request rails#54412 from zzak/re-54347
Pad a space after screenshot image path or html url for clickability
2 parents 5a630d6 + 91b5e7f commit 6d63b15

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ def show(img)
132132
end
133133

134134
def display_image(html:, screenshot_output:)
135-
message = +"[Screenshot Image]: #{image_path}\n"
136-
message << +"[Screenshot HTML]: #{html_path}\n" if html
135+
message = +"[Screenshot Image]: #{image_path} \n"
136+
message << +"[Screenshot HTML]: #{html_path} \n" if html
137137

138138
case screenshot_output || output_type
139139
when "artifact"

actionpack/test/dispatch/system_testing/screenshot_helper_test.rb

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,19 @@ def setup
8080
assert_equal "simple", @new_test.send(:output_type)
8181
end
8282

83+
test "take_screenshot saves image and shows link to it" do
84+
display_image_actual = nil
85+
86+
Rails.stub :root, Pathname.getwd do
87+
@new_test.stub :save_image, nil do
88+
@new_test.stub :show, -> (img) { display_image_actual = img } do
89+
@new_test.take_screenshot
90+
end
91+
end
92+
end
93+
assert_match %r|\[Screenshot Image\].+?tmp/screenshots/1_x\.png |, display_image_actual
94+
end
95+
8396
test "take_screenshot saves HTML and shows link to it when using RAILS_SYSTEM_TESTING_SCREENSHOT_HTML env" do
8497
original_html_setting = ENV["RAILS_SYSTEM_TESTING_SCREENSHOT_HTML"]
8598
ENV["RAILS_SYSTEM_TESTING_SCREENSHOT_HTML"] = "1"
@@ -97,7 +110,7 @@ def setup
97110
end
98111
end
99112
assert called_save_html
100-
assert_match %r|\[Screenshot HTML\].+?tmp/screenshots/1_x\.html|, display_image_actual
113+
assert_match %r|\[Screenshot HTML\].+?tmp/screenshots/1_x\.html |, display_image_actual
101114
ensure
102115
ENV["RAILS_SYSTEM_TESTING_SCREENSHOT_HTML"] = original_html_setting
103116
end
@@ -116,7 +129,7 @@ def setup
116129
end
117130
end
118131
assert called_save_html
119-
assert_match %r|\[Screenshot HTML\].+?tmp/screenshots/1_x\.html|, display_image_actual
132+
assert_match %r|\[Screenshot HTML\].+?tmp/screenshots/1_x\.html |, display_image_actual
120133
end
121134

122135
test "take_screenshot allows changing screenshot display format via RAILS_SYSTEM_TESTING_SCREENSHOT env" do

0 commit comments

Comments
 (0)