projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' from workbench2.git
[arvados.git]
/
apps
/
workbench
/
test
/
integration
/
collection_upload_test.rb
diff --git
a/apps/workbench/test/integration/collection_upload_test.rb
b/apps/workbench/test/integration/collection_upload_test.rb
index 552a9cd5e8fc53af4a484fbbd9b84798fc86f59a..43e7a22dc25dcf3326a9d2fc07dbfeca5823ded2 100644
(file)
--- a/
apps/workbench/test/integration/collection_upload_test.rb
+++ b/
apps/workbench/test/integration/collection_upload_test.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'integration_helper'
class CollectionUploadTest < ActionDispatch::IntegrationTest
require 'integration_helper'
class CollectionUploadTest < ActionDispatch::IntegrationTest
@@
-17,7
+21,7
@@
class CollectionUploadTest < ActionDispatch::IntegrationTest
teardown do
use_token :admin do
@keep_services.each do |ks|
teardown do
use_token :admin do
@keep_services.each do |ks|
- KeepService.find(ks.uuid).update
_attributes
(ks.attributes)
+ KeepService.find(ks.uuid).update(ks.attributes)
end
end
testfiles.each do |filename, _|
end
end
testfiles.each do |filename, _|
@@
-76,7
+80,7
@@
class CollectionUploadTest < ActionDispatch::IntegrationTest
need_selenium "to make file uploads work"
use_token :admin do
KeepService.where(service_type: 'proxy').first.
need_selenium "to make file uploads work"
use_token :admin do
KeepService.where(service_type: 'proxy').first.
- update
_attributes
(service_ssl_flag: false)
+ update(service_ssl_flag: false)
end
visit page_with_token 'active', sandbox_path
find('.nav-tabs a', text: 'Upload').click
end
visit page_with_token 'active', sandbox_path
find('.nav-tabs a', text: 'Upload').click
@@
-92,11
+96,11
@@
class CollectionUploadTest < ActionDispatch::IntegrationTest
test "Report network error" do
need_selenium "to make file uploads work"
use_token :admin do
test "Report network error" do
need_selenium "to make file uploads work"
use_token :admin do
- # Even if
you somehow do port>2^16
, surely nx.example.net won't
+ # Even if
port 0 is a thing
, surely nx.example.net won't
# respond
KeepService.where(service_type: 'proxy').first.
# respond
KeepService.where(service_type: 'proxy').first.
- update
_attributes
(service_host: 'nx.example.net',
- service_port:
99999
)
+ update(service_host: 'nx.example.net',
+ service_port:
0
)
end
visit page_with_token 'active', sandbox_path
end
visit page_with_token 'active', sandbox_path