8000 Fix restore options consistency. by hainesr · Pull Request #486 · rubyzip/rubyzip · GitHub
[go: up one dir, main page]
Skip to content

Fix restore options consistency. #486

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

Merged
merged 7 commits into from
Jun 6, 2021
Merged

Fix restore options consistency. #486

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
78b9c21
Move the restore options to the top level.
hainesr May 31, 2021
837f958
Set restoring permissions and times as the default.
hainesr May 31, 2021
3f563a8
Add some tests to ensure the default behaviour sticks.
hainesr May 31, 2021
664a58f
Restore file timestamps on all platforms.
hainesr May 31, 2021
3ca6c7b
Update Changelog.
hainesr May 31, 2021
93b130d
Revert "REVERT ME: This disables a test fixed by #486"
jspanjers Jun 6, 2021
ada3608
Fix restore permissons test on Windows
jspanjers Jun 6, 2021
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
Prev Previous commit
Fix restore permissons test on Windows
  • Loading branch information
@jspanjers @hainesr
jspanjers authored and hainesr committed Jun 6, 2021
commit ada3608d056224e727d9c9f03822511870318b27
2 changes: 1 addition & 1 deletion test/file_options_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_restore_permissions_false
zip.extract(ENTRY_3, EXTPATH_3)
end

default_perms = 0o100_666 - ::File.umask
default_perms = (Zip::RUNNING_ON_WINDOWS ? 0o100_644 : 0o100_666) - ::File.umask
assert_equal(default_perms, ::File.stat(EXTPATH_1).mode)
assert_equal(default_perms, ::File.stat(EXTPATH_2).mode)
assert_equal(default_perms, ::File.stat(EXTPATH_3).mode)
Expand Down
0