Weblab filesapi rename case only #15287
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ashercodeorg
approved these changes
May 23, 2017
| not_found if src_entry.nil? | ||
| new_entry_json = src_entry.to_json | ||
| else | ||
| new_entry_json = copy_file('files', encrypted_channel_id, URI.encode(unescaped_filename_downcased), URI.encode(unescaped_src_filename_downcased)) |
There was a problem hiding this comment.
nit: This line is a too long, please break it up as
new_entry_json = copy_file(
'files',
encrypted_channel_id,
URI.encode(unescaped_filename_downcased),
URI.encode(unescaped_src_filename_downcased)
)
| @@ -531,7 +541,7 @@ def files_put_file(encrypted_channel_id, filename, body) | |||
| end | |||
|
|
|||
| # delete a file if requested (same as src file in a rename operation) | |||
| bucket.delete(encrypted_channel_id, params['delete'].downcase) if params['delete'] | |||
| bucket.delete(encrypted_channel_id, URI.encode(unescaped_delete_filename_downcased)) if deleting_separate_file | |||
There was a problem hiding this comment.
nit: Another long line.
if deleting_separate_file
bucket.delete(encrypted_channel_id, URI.encode(unescaped_delete_filename_downcased))
end
| get "v3/files/#{@channel_id}" | ||
| response_after_rename = JSON.parse(last_response.body) | ||
| # There should be only one file with the new filename, category, and size matching our expectations | ||
| expected_image_info_after_rename = {'filename' => filename2, 'category' => 'image', 'size' => image_body.length} |
There was a problem hiding this comment.
Is this clearer as expected_image_info_after_rename = expected_image_info.merge('filename' => filename2)?
| assert_fileinfo_equal(expected_image_info_after_rename, file_infos_after_rename[0]) | ||
|
|
||
| # The manifest version (filesVersionId) should be different, but the file version should be the same | ||
| assert response_before_rename['filesVersionId'] != response_after_rename['filesVersionId'] |
There was a problem hiding this comment.
Perhaps use refute_equal here, as doing so may provide a more helpful error message should the test fail here.
islemaster
approved these changes
May 23, 2017
|
@ashercodeorg I'll make those changes locally and include in my next PR. Thanks for the feedback. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
foo.htmltoFoo.html). Cleaned up variable names infiles_put_filerelating to the 3 filenames in play (the new file, the source file, and the file to be deleted). It is now more clear which are unescaped and/or downcased.case_only_rename