Fix 2.4.2 upgrade notes formatting refs #19330

[arvados.git] / apps / workbench / test / integration / errors_test.rb

diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index f2067a92bfdb27233b59fbc4ddb730156c5ce8c8..86d5902ff5b1ef11ec62d6a0c8219225d5b71c45 100644 (file)
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'integration_helper'
 
 class ErrorsTest < ActionDispatch::IntegrationTest
@@ -46,18 +50,6 @@ class ErrorsTest < ActionDispatch::IntegrationTest
     page.html =~ /\b(#{matching_stamps})\+[0-9A-Fa-f]{8}\b/
   end
 
-  # We use API tokens with limited scopes as the quickest way to get the API
-  # server to return an error.  If Workbench gets smarter about coping when
-  # it has a too-limited token, these tests will need to be adjusted.
-  test "API error page includes error token" do
-    start_stamp = now_timestamp
-    visit(page_with_token("active_readonly", "/groups"))
-    click_on "Add a new group"
-    assert(page.has_text?(/fiddlesticks/i),
-           "Not on an error page after making a group out of scope")
-    assert(page_has_error_token?(start_stamp), "no error token on 404 page")
-  end
-
   test "showing a bad UUID returns 404" do
     visit(page_with_token("active", "/pipeline_templates/zzz"))
     assert(page.has_no_text?(/fiddlesticks/i),
@@ -80,15 +72,15 @@ class ErrorsTest < ActionDispatch::IntegrationTest
 
   test "API error page has Report problem button" do
     # point to a bad api server url to generate fiddlesticks error
-    original_arvados_v1_base = Rails.configuration.arvados_v1_base
-    Rails.configuration.arvados_v1_base = "https://[::1]:1/"
+    original_arvados_v1_base = Rails.configuration.Services.Controller.ExternalURL
+    Rails.configuration.Services.Controller.ExternalURL = URI("https://[::1]:1/")
 
     visit page_with_token("active")
 
     assert_text 'fiddlesticks'
 
     # reset api server base config to let the popup rendering to work
-    Rails.configuration.arvados_v1_base = original_arvados_v1_base
+    Rails.configuration.Services.Controller.ExternalURL = original_arvados_v1_base
 
     click_link 'Report problem'
 
@@ -120,4 +112,17 @@ class ErrorsTest < ActionDispatch::IntegrationTest
     # out of the popup now and should be back in the error page
     assert_text 'fiddlesticks'
   end
+
+  test "showing a trashed collection UUID gives untrash button" do
+    visit(page_with_token("active", "/collections/zzzzz-4zz18-trashedproj2col"))
+    assert(page.has_text?(/You must untrash the owner project to access this/i),
+           "missing untrash instructions")
+  end
+
+  test "showing a trashed container request gives untrash button" do
+    visit(page_with_token("active", "/container_requests/zzzzz-xvhdp-cr5trashedcontr"))
+    assert(page.has_text?(/You must untrash the owner project to access this/i),
+           "missing untrash instructions")
+  end
+
 end