iqvoc 4.13.0 → 4.14.4

data/db/schema.rb

@@ -2,16 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_09_01_143030) do
-
+ActiveRecord::Schema[7.0].define(version: 2023_10_12_135837) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -27,8 +26,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.string "type"
     t.integer "owner_id"
     t.integer "target_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "rank", default: 100
     t.index ["owner_id", "target_id"], name: "ix_concept_relations_fk"
   end
@@ -39,13 +38,12 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.integer "rev", default: 1
     t.date "published_at"
     t.integer "published_version_id"
-    t.integer "locked_by"
     t.date "expired_at"
     t.date "follow_up"
     t.boolean "to_review"
     t.date "rdf_updated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "top_term", default: false
     t.index ["origin"], name: "ix_concepts_on_origin"
     t.index ["published_version_id"], name: "ix_concepts_publ_version_id"
@@ -61,13 +59,13 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.integer "attempts", default: 0, null: false
     t.text "handler", null: false
     t.text "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
+    t.datetime "run_at", precision: nil
+    t.datetime "locked_at", precision: nil
+    t.datetime "failed_at", precision: nil
     t.string "locked_by"
     t.string "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "error_message"
     t.string "delayed_reference_type"
     t.integer "delayed_reference_id"
@@ -85,9 +83,9 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.boolean "success", default: false
     t.integer "file_type"
     t.string "token"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "finished_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "finished_at", precision: nil
     t.string "default_namespace"
     t.index ["user_id"], name: "index_exports_on_user_id"
   end
@@ -96,9 +94,9 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.integer "user_id"
     t.text "output"
     t.boolean "success", default: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "finished_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "finished_at", precision: nil
     t.string "import_file"
     t.boolean "publish"
     t.string "default_namespace"
@@ -109,8 +107,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.string "type"
     t.integer "owner_id"
     t.integer "target_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["owner_id", "target_id", "type"], name: "ix_labelings_fk_type"
     t.index ["type"], name: "ix_labelings_on_type"
   end
@@ -120,8 +118,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.string "origin", limit: 4000
     t.string "language"
     t.string "value", limit: 1024
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.date "published_at"
     t.index ["language"], name: "ix_labels_on_language"
     t.index ["origin"], name: "ix_labels_on_origin"
@@ -131,8 +129,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.integer "concept_id"
     t.string "type"
     t.string "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["concept_id", "type"], name: "ix_matches_fk_type"
     t.index ["type"], name: "ix_matches_on_type"
   end
@@ -148,8 +146,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.integer "note_id"
     t.string "predicate", limit: 50
     t.string "value", limit: 1024
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "namespace", limit: 50
     t.string "language"
     t.index ["note_id"], name: "ix_note_annotations_fk"
@@ -160,8 +158,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.string "language", limit: 2
     t.string "value", limit: 4000
     t.string "type", limit: 50
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "owner_id"
     t.string "owner_type", null: false
     t.integer "position"
@@ -176,8 +174,8 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.string "email"
     t.string "crypted_password"
     t.boolean "active"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "password_salt"
     t.string "persistence_token"
     t.string "perishable_token"
@@ -187,9 +185,9 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
     t.text "comment"
     t.integer "login_count", default: 0, null: false
     t.integer "failed_login_count", default: 0, null: false
-    t.datetime "last_request_at"
-    t.datetime "current_login_at"
-    t.datetime "last_login_at"
+    t.datetime "last_request_at", precision: nil
+    t.datetime "current_login_at", precision: nil
+    t.datetime "last_login_at", precision: nil
     t.string "current_login_ip"
     t.string "last_login_ip"
   end
@@ -198,7 +196,6 @@ ActiveRecord::Schema.define(version: 2020_09_01_143030) do
   add_foreign_key "collection_members", "concepts", column: "target_id", on_update: :cascade
   add_foreign_key "concept_relations", "concepts", column: "owner_id", on_update: :cascade
   add_foreign_key "concept_relations", "concepts", column: "target_id", on_update: :cascade
-  add_foreign_key "concepts", "users", column: "locked_by", on_update: :cascade, on_delete: :nullify
   add_foreign_key "exports", "users", on_update: :cascade, on_delete: :nullify
   add_foreign_key "imports", "users", on_update: :cascade, on_delete: :nullify
   add_foreign_key "labelings", "concepts", column: "owner_id", on_update: :cascade

data/iqvoc.gemspec

@@ -11,20 +11,20 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/innoq/iqvoc'
   s.summary     = 'iQvoc'
   s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
-  s.license     = 'Apache License 2.0'
+  s.license     = 'Apache-2.0'
 
-  s.add_dependency 'rails', '>= 5.2.0', '< 6.0'
-  s.add_dependency 'puma', '< 6.0'
-  s.add_dependency 'bootsnap', '>= 1.1.0'
+  s.add_dependency 'rails', '~> 7.0.8'
+  s.add_dependency 'puma'
+  s.add_dependency 'bootsnap'
   s.add_dependency 'bundler'
-  s.add_dependency 'kaminari', '~> 1.2.0'
-  s.add_dependency 'authlogic', '~> 6.2.0'
+  s.add_dependency 'kaminari'
+  s.add_dependency 'authlogic'
   s.add_dependency 'scrypt'
-  s.add_dependency 'cancancan', '~> 2.3.0'
-  s.add_dependency 'iq_rdf', '>= 0.1.16'
+  s.add_dependency 'cancancan'
+  s.add_dependency 'iq_rdf'
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
-  s.add_dependency 'faraday', '0.9.0'
+  s.add_dependency 'faraday'
   s.add_dependency 'faraday_middleware'
   s.add_dependency 'bootstrap_form', '~> 4.0'
   s.add_dependency 'iq_triplestorage'
@@ -32,18 +32,19 @@ Gem::Specification.new do |s|
   s.add_dependency 'linkeddata'
   s.add_dependency 'rdf-vocab'
   s.add_dependency 'deep_cloneable'
-  s.add_dependency 'uglifier', '>= 1.3.0'
   s.add_dependency 'apipie-rails'
   s.add_dependency 'maruku'
+  s.add_dependency 'net-http'
   s.add_dependency 'database_cleaner', '~> 1.8.5'
-  s.add_dependency 'delayed_job_active_record', '~> 4.1.1'
+  s.add_dependency 'delayed_job_active_record'
   s.add_dependency 'carrierwave'
+  s.add_dependency 'carrierwave-i18n'
   s.add_dependency 'rack-mini-profiler'
   s.add_dependency 'faucet_pipeline_rails'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
-    Dir.glob('{app,config,db,public,lib,test,vendor}/**/*')
-  s.test_files = s.files.grep(%r{^test/})
+    Dir.glob('{app,config,db,lib}/**/*')
+  s.test_files = Dir['{test}/**/*']
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

data/lib/iqvoc/configuration/concept.rb

@@ -12,6 +12,7 @@ module Iqvoc
             :broader_relation_class_name, :further_relation_class_names,
             :pref_labeling_class_name,
             :alt_labeling_class_name,
+            :hidden_labeling_class_name,
             :match_class_names,
             :note_class_names,
             :notation_class_names,
@@ -27,6 +28,7 @@ module Iqvoc
 
         self.pref_labeling_class_name     = 'Labeling::SKOS::PrefLabel'
         self.alt_labeling_class_name      = 'Labeling::SKOS::AltLabel'
+        self.hidden_labeling_class_name   = 'Labeling::SKOS::HiddenLabel'
 
         self.note_class_names             = [
           Iqvoc.change_note_class_name,

data/lib/iqvoc/configuration/core.rb

@@ -11,6 +11,7 @@ module Iqvoc
           :default_rdf_namespace_helper_modules,
           :default_rdf_namespace_helper_methods,
           :rdf_namespaces,
+          :rdf_show_change_notes,
           :change_note_class_name,
           :first_level_class_configuration_modules,
           :navigation_items,
@@ -103,6 +104,9 @@ module Iqvoc
           iqvoc: 'http://try.iqvoc.net/schema#'
         }
 
+        # This flag determines if the changes notes should be included in the RDF representation of a Concept/Label/Collection.
+        self.rdf_show_change_notes = true
+
         # The class to use for automatic generation of change notes on every save
         self.change_note_class_name = 'Note::SKOS::ChangeNote'
 
@@ -118,7 +122,8 @@ module Iqvoc
           'collection',
           'languages',
           'change_note',
-          'datasets'
+          'datasets',
+          'options',
         ]
 
         # ignored database tables during thesaurus truncation
@@ -132,11 +137,13 @@ module Iqvoc
         # initialize
         self.config.register_settings({
           'title' => 'iQvoc',
+          'concept_modal_preview' => true,
           'languages.pref_labeling' => ['en', 'de'],
           'languages.further_labelings.Labeling::SKOS::AltLabel' => ['en', 'de'],
           'languages.notes' => ['en', 'de'],
           'performance.unbounded_hierarchy' => false,
-          'sources.iqvoc' => ['']
+          'sources.iqvoc' => [''],
+          'sources.create_reverse_matches' => true
         })
       end
 
@@ -189,6 +196,10 @@ module Iqvoc
           self.config.register_setting('title', value)
         end
 
+        def concept_modal_preview_enabled?
+          config['concept_modal_preview'] == true
+        end
+
         def engine?
           Iqvoc.const_defined?(:Engine)
         end

data/lib/iqvoc/configuration/instance_configuration.rb

@@ -80,7 +80,7 @@ module Iqvoc
 
         json = JSON.dump([value])[1..-2] # temporary array wrapper ensures valid JSON text
         if setting = ConfigurationSetting.find_by_key(key)
-          setting.update_attributes(value: json)
+          setting.update(value: json)
         else
           ConfigurationSetting.create(key: key, value: json)
         end
@@ -116,8 +116,8 @@ module Iqvoc
         if value == nil
           raise TypeError, 'nil values not supported'
         end
-        # 0.class enables support for Ruby 2.4 Fixnum/Bignum into Integer class merge
-        unless [TrueClass, FalseClass, String, 0.class, Float, Array].include?(value.class)
+
+        unless [TrueClass, FalseClass, String, Integer, Float, Array].include?(value.class)
           raise TypeError, 'complex values not supported'
         end
       end

data/lib/iqvoc/environments/development.rb

@@ -1,11 +1,12 @@
+require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
 module Iqvoc::Environments
   def self.setup_development(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
-    # In the development environment your application's code is reloaded on
-    # every request. This slows down response time but is perfect for development
+    # In the development environment your application's code is reloaded any time
+    # it changes. This slows down response time but is perfect for development
     # since you don't have to restart the web server when you make code changes.
     config.cache_classes = false
 
@@ -15,14 +16,18 @@ module Iqvoc::Environments
     # Show full error reports.
     config.consider_all_requests_local = true
 
+    # Enable server timing
+    config.server_timing = true
+
     # Enable/disable caching. By default caching is disabled.
     # Run rails dev:cache to toggle caching.
-    if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    if Rails.root.join("tmp/caching-dev.txt").exist?
       config.action_controller.perform_caching = true
+      config.action_controller.enable_fragment_cache_logging = true
 
       config.cache_store = :memory_store
       config.public_file_server.headers = {
-        'Cache-Control' => "public, max-age=#{2.days.to_i}"
+        "Cache-Control" => "public, max-age=#{2.days.to_i}"
       }
     else
       config.action_controller.perform_caching = false
@@ -30,7 +35,7 @@ module Iqvoc::Environments
       config.cache_store = :null_store
     end
 
-    # Store uploaded files on the local file system (see config/storage.yml for options)
+    # Store uploaded files on the local file system (see config/storage.yml for options).
     config.active_storage.service = :local
 
     # Don't care if the mailer can't send.
@@ -41,20 +46,29 @@ module Iqvoc::Environments
     # Print deprecation notices to the Rails logger.
     config.active_support.deprecation = :log
 
+    # Raise exceptions for disallowed deprecations.
+    config.active_support.disallowed_deprecation = :raise
+
+    # Tell Active Support which deprecation messages to disallow.
+    config.active_support.disallowed_deprecation_warnings = []
+
     # Raise an error on page load if there are pending migrations.
     config.active_record.migration_error = :page_load
 
     # Highlight code that triggered database queries in logs.
     config.active_record.verbose_query_logs = true
 
-    # Raises error for missing translations
-    config.action_view.raise_on_missing_translations = true
+    # Raises error for missing translations.
+    config.i18n.raise_on_missing_translations = true
 
-    # Raises error for missing translations
-    config.i18n.enforce_available_locales = true
+    # Annotate rendered view with file names.
+    config.action_view.annotate_rendered_view_with_filenames = true
 
     # Use an evented file watcher to asynchronously detect changes in source code,
     # routes, locales, etc. This feature depends on the listen gem.
     config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+    # Uncomment if you wish to allow Action Cable access from any origin.
+    # config.action_cable.disable_request_forgery_protection = true
   end
 end

data/lib/iqvoc/environments/production.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
 module Iqvoc::Environments
@@ -23,28 +24,28 @@ module Iqvoc::Environments
 
     # Disable serving static files from the `/public` folder by default since
     # Apache or NGINX already handles this.
-    config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+    config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
     # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-    # config.action_controller.asset_host = 'http://assets.example.com'
+    # config.asset_host = "http://assets.example.com"
 
     # Specifies the header that your server uses for sending files.
-    # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
-    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+    # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+    # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
-    # Store uploaded files on the local file system (see config/storage.yml for options)
+    # Store uploaded files on the local file system (see config/storage.yml for options).
     config.active_storage.service = :local
 
-    # Mount Action Cable outside main process or domain
+    # Mount Action Cable outside main process or domain.
     # config.action_cable.mount_path = nil
-    # config.action_cable.url = 'wss://example.com/cable'
-    # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+    # config.action_cable.url = "wss://example.com/cable"
+    # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 
     # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
     # config.force_ssl = true
 
-    # Use the lowest log level to ensure availability of diagnostic information
-    # when problems arise.
+    # Include generic and useful information about system operation, but avoid logging too much
+    # information to avoid inadvertent exposure of personally identifiable information (PII).
     config.log_level = (ENV['LOG_LEVEL'] || :info)
 
     # Prepend all log lines with the following tags.
@@ -53,9 +54,9 @@ module Iqvoc::Environments
     # Use a different cache store in production.
     # config.cache_store = :mem_cache_store
 
-    # Use a real queuing backend for Active Job (and separate queues per environment)
+    # Use a real queuing backend for Active Job (and separate queues per environment).
     # config.active_job.queue_adapter     = :resque
-    # config.active_job.queue_name_prefix = "iqvoc_#{Rails.env}"
+    # config.active_job.queue_name_prefix = "iqvoc_production"
 
     config.action_mailer.perform_caching = false
 
@@ -70,12 +71,18 @@ module Iqvoc::Environments
     # Send deprecation notices to registered listeners.
     config.active_support.deprecation = :notify
 
+    # Log disallowed deprecations.
+    config.active_support.disallowed_deprecation = :log
+
+    # Tell Active Support which deprecation messages to disallow.
+    config.active_support.disallowed_deprecation_warnings = []
+
     # Use default logging formatter so that PID and timestamp are not suppressed.
     config.log_formatter = ::Logger::Formatter.new
 
     # Use a different logger for distributed setups.
-    # require 'syslog/logger'
-    # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+    # require "syslog/logger"
+    # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
     if ENV["RAILS_LOG_TO_STDOUT"].present?
       logger           = ActiveSupport::Logger.new(STDOUT)
@@ -85,10 +92,5 @@ module Iqvoc::Environments
 
     # Do not dump schema after migrations.
     config.active_record.dump_schema_after_migration = false
-
-    config.i18n.enforce_available_locales = true
-
-    # Raises error for missing translations
-    config.action_view.raise_on_missing_translations = false
   end
 end

data/lib/iqvoc/environments/test.rb

@@ -1,13 +1,10 @@
+require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
 module Iqvoc::Environments
   def self.setup_test(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
-    # The test environment is used exclusively to run your application's
-    # test suite. You never need to work with it otherwise. Remember that
-    # your test database is "scratch space" for the test suite and is wiped
-    # and recreated between test runs. Don't rely on the data there!
     config.cache_classes = true
 
     # Do not eager load code on boot. This avoids loading your whole application
@@ -18,12 +15,13 @@ module Iqvoc::Environments
     # Configure public file server for tests with Cache-Control for performance.
     config.public_file_server.enabled = true
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+      "Cache-Control" => "public, max-age=#{1.hour.to_i}"
     }
 
     # Show full error reports and disable caching.
     config.consider_all_requests_local       = true
     config.action_controller.perform_caching = false
+    config.cache_store = :null_store
 
     # Raise exceptions instead of rendering exception templates.
     config.action_dispatch.show_exceptions = false
@@ -31,7 +29,7 @@ module Iqvoc::Environments
     # Disable request forgery protection in test environment.
     config.action_controller.allow_forgery_protection = false
 
-    # Store uploaded files on the local file system in a temporary directory
+    # Store uploaded files on the local file system in a temporary directory.
     config.active_storage.service = :test
 
     config.action_mailer.perform_caching = false
@@ -44,7 +42,16 @@ module Iqvoc::Environments
     # Print deprecation notices to the stderr.
     config.active_support.deprecation = :stderr
 
-    # Raises error for missing translations
-    config.action_view.raise_on_missing_translations = true
+    # Raise exceptions for disallowed deprecations.
+    config.active_support.disallowed_deprecation = :raise
+
+    # Tell Active Support which deprecation messages to disallow.
+    config.active_support.disallowed_deprecation_warnings = []
+
+    # Raises error for missing translations.
+    config.i18n.raise_on_missing_translations = true
+
+    # Annotate rendered view with file names.
+    # config.action_view.annotate_rendered_view_with_filenames = true
   end
 end

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.13.0"
+  VERSION = "4.14.4"
 end

data/lib/tasks/sync.rake

@@ -14,7 +14,7 @@ namespace :sync do
     default_url_options[:host] = ROOT
 
     class FakeController
-      include RDFSyncService::Helper
+      include RdfSyncService::Helper
       delegate :url_helpers, :to => "Rails.application.routes"
 
       def root_url(*args)

data/test/authentication.rb

@@ -27,7 +27,7 @@ module Authentication
       u.password_confirmation = 'omgomgomg'
       u.role = 'reader'
       u.active = true
-      u.role = role || User.default_role
+      u.role = role || User.default_user_role
     end
   end
 end

data/test/controllers/concepts_movement_controller_test.rb

@@ -17,8 +17,6 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
 class ConceptsMovementControllerTest < ActionController::TestCase
-  require 'authlogic/test_case'
-
   setup do
     activate_authlogic
 

data/test/controllers/hierarchy_test.rb

@@ -150,7 +150,7 @@ boot:
 
     get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
-    assert_equal @response.content_type, 'text/turtle'
+    assert_equal @response.media_type, 'text/turtle'
     assert @response.body =~ /:root[^\.]+skos:topConceptOf[^\.]+:scheme/m
     assert @response.body =~ /:root[^\.]+skos:prefLabel[^\.]+"Root"@en/m
     assert @response.body =~ /:root[^\.]+skos:narrower[^\.]+:bar/m
@@ -180,7 +180,7 @@ boot:
 
     get :show, params: { lang: 'en', format: 'ttl', root: 'lorem', dir: 'up' }
     assert_response 200
-    assert_equal @response.content_type, 'text/turtle'
+    assert_equal @response.media_type, 'text/turtle'
     assert @response.body.include?(<<-EOS)
 :lorem a skos:Concept;
        skos:prefLabel "Lorem"@en;
@@ -210,7 +210,7 @@ boot:
 
     get :show, params: { lang: 'en', format: 'rdf', root: 'root' }
     assert_response 200
-    assert_equal @response.content_type, 'application/rdf+xml'
+    assert_equal @response.media_type, 'application/rdf+xml'
   end
 
   test 'root parameter handling' do
@@ -357,7 +357,7 @@ boot:
   test 'avoid duplication' do # in response to a bug report
     get :show, params: { lang: 'en', format: 'ttl', root: 'uno', dir: 'up' }
     assert_response 200
-    assert_equal 'text/turtle', @response.content_type
+    assert_equal 'text/turtle', @response.media_type
     assert @response.body.include?(<<-EOS)
 :bravo a skos:Concept;
        skos:prefLabel "Bravo"@en;

data/test/controllers/reverse_match_test.rb

@@ -43,7 +43,7 @@ class ReverseMatchTest < ActionController::TestCase
       RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
       c.publish
       c.save
-      new_version = c.branch @admin
+      new_version = c.branch
       new_version.save
     end
 

data/test/integration/client_edit_concept_test.rb

@@ -69,7 +69,7 @@ class ClientEditConceptsTest < ActionDispatch::IntegrationTest
     page.click_link_or_button('Speichern')
     assert page.has_css?('.alert.alert-success')
     # return to edit mode
-    page.click_link_or_button('Weiterbearbeiten')
+    page.click_link_or_button('Bearbeiten')
     assert page.has_css?('#edit_concept')
 
     section = page.find('#note_skos_definitions_data')