X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cd3966ee048de85447418f00869eec59b38fd7b2..bf4193eeaa390cec08bbb8333a53fbc89edfd7f3:/services/api/test/unit/arvados_model_test.rb diff --git a/services/api/test/unit/arvados_model_test.rb b/services/api/test/unit/arvados_model_test.rb index c1db8c8b5d..69a2710bb9 100644 --- a/services/api/test/unit/arvados_model_test.rb +++ b/services/api/test/unit/arvados_model_test.rb @@ -155,51 +155,6 @@ class ArvadosModelTest < ActiveSupport::TestCase end end - test "full text search index exists on models" do - indexes = {} - conn = ActiveRecord::Base.connection - conn.exec_query("SELECT i.relname as indname, - i.relowner as indowner, - idx.indrelid::regclass::text as table, - am.amname as indam, - idx.indkey, - ARRAY( - SELECT pg_get_indexdef(idx.indexrelid, k + 1, true) - FROM generate_subscripts(idx.indkey, 1) as k - ORDER BY k - ) as keys, - idx.indexprs IS NOT NULL as indexprs, - idx.indpred IS NOT NULL as indpred - FROM pg_index as idx - JOIN pg_class as i - ON i.oid = idx.indexrelid - JOIN pg_am as am - ON i.relam = am.oid - JOIN pg_namespace as ns - ON ns.oid = i.relnamespace - AND ns.nspname = ANY(current_schemas(false))").each do |idx| - if idx['keys'].match(/to_tsvector/) - indexes[idx['table']] ||= [] - indexes[idx['table']] << idx - end - end - fts_tables = ["collections", "container_requests", "groups", "jobs", - "pipeline_instances", "pipeline_templates", "workflows"] - fts_tables.each do |table| - table_class = table.classify.constantize - if table_class.respond_to?('full_text_searchable_columns') - expect = table_class.full_text_searchable_columns - ok = false - indexes[table].andand.each do |idx| - if expect == idx['keys'].scan(/COALESCE\(([A-Za-z_]+)/).flatten - ok = true - end - end - assert ok, "#{table} has no full-text index\nexpect: #{expect.inspect}\nfound: #{indexes[table].inspect}" - end - end - end - [ %w[collections collections_trgm_text_search_idx], %w[container_requests container_requests_trgm_text_search_idx], @@ -262,13 +217,13 @@ class ArvadosModelTest < ActiveSupport::TestCase assert group.valid?, "group is not valid" # update 1 - group.update_attributes!(name: "test create and update name 1") + group.update!(name: "test create and update name 1") results = Group.where(uuid: group.uuid) assert_equal "test create and update name 1", results.first.name, "Expected name to be updated to 1" updated_at_1 = results.first.updated_at.to_f # update 2 - group.update_attributes!(name: "test create and update name 2") + group.update!(name: "test create and update name 2") results = Group.where(uuid: group.uuid) assert_equal "test create and update name 2", results.first.name, "Expected name to be updated to 2" updated_at_2 = results.first.updated_at.to_f @@ -282,17 +237,42 @@ class ArvadosModelTest < ActiveSupport::TestCase c = Collection.create!(properties: {}) assert_equal({}, c.properties) - c.update_attributes(properties: {'foo' => 'foo'}) + c.update(properties: {'foo' => 'foo'}) c.reload assert_equal({'foo' => 'foo'}, c.properties) - c.update_attributes(properties: nil) + c.update(properties: nil) c.reload assert_equal({}, c.properties) - c.update_attributes(properties: {foo: 'bar'}) + c.update(properties: {foo: 'bar'}) assert_equal({'foo' => 'bar'}, c.properties) c.reload assert_equal({'foo' => 'bar'}, c.properties) end + + test 'serialized attributes dirty tracking with audit log settings' do + Rails.configuration.AuditLogs.MaxDeleteBatch = 1000 + set_user_from_auth :admin + [false, true].each do |auditlogs_enabled| + if auditlogs_enabled + Rails.configuration.AuditLogs.MaxAge = 3600 + else + Rails.configuration.AuditLogs.MaxAge = 0 + end + [ + User.find_by_uuid(users(:active).uuid), + ContainerRequest.find_by_uuid(container_requests(:queued).uuid), + Container.find_by_uuid(containers(:queued).uuid), + PipelineInstance.find_by_uuid(pipeline_instances(:has_component_with_completed_jobs).uuid), + PipelineTemplate.find_by_uuid(pipeline_templates(:two_part).uuid), + Job.find_by_uuid(jobs(:running).uuid) + ].each do |obj| + assert_not(obj.class.serialized_attributes.empty?, + "#{obj.class} model doesn't have serialized attributes") + # obj shouldn't have changed since it's just retrieved from the database + assert_not(obj.changed?, "#{obj.class} model's attribute(s) appear as changed: '#{obj.changes.keys.join(',')}' with audit logs #{auditlogs_enabled ? '': 'not '}enabled.") + end + end + end end