kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #32127 from zamith/zamith/screenshot-absolute-path

Browse source 
Uses the absolute path for system test screenshots
This commit is contained in:
Rafael França 2018-02-27 14:20:42 -05:00 committed by GitHub
commit 39d2cde659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
View file

@ -43,7 +43,7 @@ module ActionDispatch
end end
def image_path def image_path
@image_path ||= absolute_image_path.relative_path_from(Pathname.pwd).to_s @image_path ||= absolute_image_path.to_s
end end
def absolute_image_path def absolute_image_path

10
actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
View file

@ -9,7 +9,7 @@ class ScreenshotHelperTest < ActiveSupport::TestCase
new_test = DrivenBySeleniumWithChrome.new("x") new_test = DrivenBySeleniumWithChrome.new("x")
Rails.stub :root, Pathname.getwd do Rails.stub :root, Pathname.getwd do
assert_equal "tmp/screenshots/x.png", new_test.send(:image_path) assert_equal Rails.root.join("tmp/screenshots/x.png").to_s, new_test.send(:image_path)
end end
end end
@ -18,7 +18,7 @@ class ScreenshotHelperTest < ActiveSupport::TestCase
Rails.stub :root, Pathname.getwd do Rails.stub :root, Pathname.getwd do
new_test.stub :passed?, false do new_test.stub :passed?, false do
assert_equal "tmp/screenshots/failures_x.png", new_test.send(:image_path) assert_equal Rails.root.join("tmp/screenshots/failures_x.png").to_s, new_test.send(:image_path)
end end
end end
end end
@ -29,7 +29,7 @@ class ScreenshotHelperTest < ActiveSupport::TestCase
Rails.stub :root, Pathname.getwd do Rails.stub :root, Pathname.getwd do
new_test.stub :passed?, false do new_test.stub :passed?, false do
new_test.stub :skipped?, true do new_test.stub :skipped?, true do
assert_equal "tmp/screenshots/x.png", new_test.send(:image_path) assert_equal Rails.root.join("tmp/screenshots/x.png").to_s, new_test.send(:image_path)
end end
end end
end end
@ -59,11 +59,11 @@ class ScreenshotHelperTest < ActiveSupport::TestCase
end end
end end
test "image path returns the relative path from current directory" do test "image path returns the absolute path from root" do
new_test = DrivenBySeleniumWithChrome.new("x") new_test = DrivenBySeleniumWithChrome.new("x")
Rails.stub :root, Pathname.getwd.join("..") do Rails.stub :root, Pathname.getwd.join("..") do
assert_equal "../tmp/screenshots/x.png", new_test.send(:image_path) assert_equal Rails.root.join("tmp/screenshots/x.png").to_s, new_test.send(:image_path)
end end
end end
end end