16159: Merge branch 'master' into 16159-token-expiration-on-logout

[arvados.git] / apps / workbench / test / controllers / trash_items_controller_test.rb

diff --git a/apps/workbench/test/controllers/trash_items_controller_test.rb b/apps/workbench/test/controllers/trash_items_controller_test.rb
index d5b0d90478d5aa4c58934c1f5e0282c14ace8375..c4090f0cef7dde572f3faec563b006c2bf3883fe 100644 (file)
--- a/apps/workbench/test/controllers/trash_items_controller_test.rb
+++ b/apps/workbench/test/controllers/trash_items_controller_test.rb
@@ -1,28 +1,18 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 
 class TrashItemsControllerTest < ActionController::TestCase
-  reset_api_fixtures :after_each_test, false
-  reset_api_fixtures :after_suite, true
-
-  [
-    :active,
-    :admin,
-  ].each do |user|
-    test "trash index page as #{user}" do
-      get :index, {partial: :trash_rows, format: :json}, session_for(user)
-      assert_response :success
-
-      items = []
-      @response.body.scan(/tr\ data-object-uuid=\\"(.*?)\\"/).each do |uuid,|
-        items << uuid
-      end
+  test "untrash collection with same name as another collection" do
+    collection = api_fixture('collections')['trashed_collection_to_test_name_conflict_on_untrash']
+    items = [collection['uuid']]
+    post :untrash_items, params: {
+      selection: items,
+      format: :js
+    }, session: session_for(:active)
 
-      assert_includes(items, api_fixture('collections')['unique_expired_collection']['uuid'])
-      if user == :admin
-        assert_includes(items, api_fixture('collections')['unique_expired_collection2']['uuid'])
-      else
-        assert_not_includes(items, api_fixture('collections')['unique_expired_collection2']['uuid'])
-      end
-    end
+    assert_response :success
   end
 end