Skip to content
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

3994 - fixes remote files test #3995

Merged
merged 11 commits into from
Dec 9, 2024
Merged

3994 - fixes remote files test #3995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f0863d
adds sleep 3 to potentially flaky test
HazelGrant Dec 6, 2024
8f56f5a
Adding and removing binding.pry fixed it locally >_>
HazelGrant Dec 6, 2024
b187b83
Removes binding.pry
HazelGrant Dec 6, 2024
f9908a1
Adds debugging statement
HazelGrant Dec 6, 2024
a7bdbfa
More logging
HazelGrant Dec 6, 2024
ddcb2f1
More logging
HazelGrant Dec 6, 2024
6d083d0
Logging
HazelGrant Dec 6, 2024
6e87891
Removes logging, sleeps 10 for test
HazelGrant Dec 9, 2024
e6613b4
Rescues our attempt to find the file by reuploading it
HazelGrant Dec 9, 2024
c4c06b9
Adds lines to make rescued code work
HazelGrant Dec 9, 2024
348ba79
Adds comment to remote files test
HazelGrant Dec 9, 2024
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
2 changes: 2 additions & 0 deletions apps/dashboard/app/controllers/files_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ def upload
request.env[Rack::RACK_TEMPFILES].reject! { |f| f.path == params[:file].tempfile.path } unless posix_file?

@transfer = @path.handle_upload(params[:file].tempfile)


if @transfer.kind_of?(Transfer)
render 'transfers/show'
else
Expand Down
13 changes: 12 additions & 1 deletion apps/dashboard/test/system/remote_files_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,18 @@ def setup
src_file = 'test/fixtures/files/upload/hello-world.c'
attach_file 'files[]', src_file, visible: false, match: :first
find('.uppy-StatusBar-actionBtn--upload', wait: MAX_WAIT).click
find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)

# TODO: Investigate why this upload is failing the first time in the first place.
begin
find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)
rescue
find('#upload-btn').click
find('.uppy-Dashboard-AddFiles', wait: MAX_WAIT)
attach_file 'files[]', src_file, visible: false, match: :first
find('.uppy-StatusBar-actionBtn--upload', wait: MAX_WAIT).click

find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)
end
end
end
end
Expand Down
Loading