projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18590-fix-discovery-doc'
[arvados.git]
/
services
/
api
/
app
/
controllers
/
database_controller.rb
diff --git
a/services/api/app/controllers/database_controller.rb
b/services/api/app/controllers/database_controller.rb
index 64818da375ecc4fb0277a10be0f3f7e6b552a2e8..5c4cf7bc16c22ad8d8780714d9b0165cf2c4043b 100644
(file)
--- a/
services/api/app/controllers/database_controller.rb
+++ b/
services/api/app/controllers/database_controller.rb
@@
-1,7
+1,11
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class DatabaseController < ApplicationController
class DatabaseController < ApplicationController
- skip_before_
filter
:find_object_by_uuid
- skip_before_
filter
:render_404_if_no_object
- before_
filter
:admin_required
+ skip_before_
action
:find_object_by_uuid
+ skip_before_
action
:render_404_if_no_object
+ before_
action
:admin_required
def reset
raise ArvadosModel::PermissionDeniedError unless Rails.env == 'test'
def reset
raise ArvadosModel::PermissionDeniedError unless Rails.env == 'test'
@@
-10,8
+14,8
@@
class DatabaseController < ApplicationController
# use @example.com email addresses when creating user records, so
# we can tell they're not valuable.
user_uuids = User.
# use @example.com email addresses when creating user records, so
# we can tell they're not valuable.
user_uuids = User.
- where('email is null or
email not like ?', '%@
example.com').
- collect
&:uuid
+ where('email is null or
(email not like ? and email not like ?)', '%@example.com', '%.
example.com').
+ collect
(&:uuid)
fixture_uuids =
YAML::load_file(File.expand_path('../../../test/fixtures/users.yml',
__FILE__)).
fixture_uuids =
YAML::load_file(File.expand_path('../../../test/fixtures/users.yml',
__FILE__)).
@@
-29,6
+33,10
@@
class DatabaseController < ApplicationController
fixturesets = Dir.glob(Rails.root.join('test', 'fixtures', '*.yml')).
collect { |yml| yml.match(/([^\/]*)\.yml$/)[1] }
fixturesets = Dir.glob(Rails.root.join('test', 'fixtures', '*.yml')).
collect { |yml| yml.match(/([^\/]*)\.yml$/)[1] }
+ # Don't reset keep_services: clients need to discover our
+ # integration-testing keepstores, not test fixtures.
+ fixturesets -= %w[keep_services]
+
table_names = '"' + ActiveRecord::Base.connection.tables.join('","') + '"'
attempts_left = 20
table_names = '"' + ActiveRecord::Base.connection.tables.join('","') + '"'
attempts_left = 20
@@
-47,8
+55,8
@@
class DatabaseController < ApplicationController
# create_fixtures() is a no-op for cached fixture sets, so
# uncache them all.
# create_fixtures() is a no-op for cached fixture sets, so
# uncache them all.
- ActiveRecord::Fixture
s
.reset_cache
- ActiveRecord::Fixture
s
.
+ ActiveRecord::Fixture
Set
.reset_cache
+ ActiveRecord::Fixture
Set
.
create_fixtures(Rails.root.join('test', 'fixtures'), fixturesets)
# Dump cache of permissions etc.
create_fixtures(Rails.root.join('test', 'fixtures'), fixturesets)
# Dump cache of permissions etc.
@@
-67,6
+75,11
@@
class DatabaseController < ApplicationController
raise
end
raise
end
+ require 'update_permissions'
+
+ refresh_permissions
+ refresh_trashed
+
# Done.
send_json success: true
end
# Done.
send_json success: true
end