iqvoc 4.13.2 → 4.14.4

data/config/locales/en.yml

@@ -75,7 +75,6 @@ en:
      of: of
      ops: Oops!
      pending: "Loading…"
-     translation_missing_for: "translation missing for"
      type_to_search: "Type to search"
      hint_csv_input: "Multiple values can be entered comma-separated."
      form_errors: "Errors"
@@ -219,10 +218,10 @@ en:
      search_results:
        header: "Search"
        inflectionals: "inflectionals"
-       contains: "contains"
-       ends_with: "ends with"
-       begins_with: "begins with"
-       exact: "exact match"
+       contains: "contain keyword"
+       ends_with: "end with keyword"
+       begins_with: "start with keyword"
+       exact: "exactly match"
        regexp: "regular expression (advanced)"
        search_term: "Search term(s)"
        note: with note
@@ -236,23 +235,25 @@ en:
          other: "Your search for <strong>%{query}</strong> yielded the following %{count} results."
        no_results_found: "Your search yielded no results."
        submit: "Search"
+       detailed_search: "Detailed search"
        type: "type"
        used_as: "used as"
        expired: "include expired?"
-       language: "language"
+       language: "Language"
        all: "all"
        none: "none"
-       in: "In"
-       for: "For"
-       mode: "Mode"
+       in: "Search contains"
+       for: "Search in"
+       mode: "Search results"
        datasets: "External sources"
        change_note:
+         all: "Creation or update date"
          type: "type"
          created: "creation date"
          modified: "modification date"
          date: "Date range"
-         date_from: '(from)'
-         date_to: '(to)'
+         date_from: 'From'
+         date_to: 'To'
      user_sessions:
        header: "Login"
        login: "Login"
@@ -301,7 +302,6 @@ en:
        delete_copy: "Delete copy"
        delete_confirm: "Do you really want to delete this copy?"
        versioning_mode: "Create new version"
-       unlock: "Unlock"
        preview_new_version: "Preview of the version in editing"
        consistency_check: "Check consistency"
        current_revision: "Current revision %{rev}"
@@ -318,7 +318,6 @@ en:
      dashboard:
        type: "Type"
        value: "Name"
-       locking_user: "Locked by"
        follow_up: "Follow up"
        updated_at: "Updated at"
        to_review: "Submission for review"
@@ -388,11 +387,7 @@ en:
        published_with_warning: "Instance has been successfully published, but it has no relations!"
        merged_delete_error: "Label could not be deleted."
        merged_publishing_error: "Instance could not be published - please consult the consistency check."
-       branched: "Instance copy has been created and locked."
-       locked: "Instance has been locked."
-       lock_error: "Instance is already locked."
-       unlocked: "Instance has been unlocked."
-       unlock_error: "Instance has been alraedy unlocked."
+       branched: "Instance copy has been created."
        to_review_success: "Sent to review."
        to_review_error: "Can't send to review."
        new_version_blank_error: "A new version does not yet exist!"

data/config/locales/pt.yml

@@ -70,7 +70,6 @@ pt:
        checked_out: "Verificado"
      of: de
      pending: "Carregando…"
-     translation_missing_for: "tradução faltando para"
      type_to_search: "Digite para buscar"
      hint_csv_input: " Vários valores podem ser inseridos separados por vírgula."
      form_errors: "Erros"
@@ -234,7 +233,6 @@ pt:
        delete: "Excluir cópia"
        delete_confirm: "Você realmente deseja excluir esta cópia?"
        versioning_mode: "Criar nova versão"
-       unlock: "Destravar"
        preview_new_version: "Pré-visualização da versão em alteração"
        consistency_check: "Verificar consistência"
        current_revision: "Revisão atual %{rev}"
@@ -250,7 +248,6 @@ pt:
      dashboard:
        type: "Tipo"
        value: "Nome"
-       locking_user: "Travado por"
        follow_up: "Reapresentar"
        updated_at: "Atualizado em"
        to_review: "Submissão para revisão"
@@ -301,10 +298,6 @@ pt:
        merged_delete_error: "Não foi possível excluir o rótulo!"
        merged_publishing_error: "Não foi possível lançar a instância!"
        branched: "Cópia da instância foi criada e travada."
-       locked: "Instância foi travada."
-       lock_error: "Instância já foi travada!"
-       unlocked: "Instância foi destravada."
-       unlock_error: "Instância já foi destravada!"
        to_review_success: "Enviado para revisão com sucesso."
        to_review_error: "Não foi possível enviar para revisão."
        new_version_blank_error: "Ainda não existe uma nova versão!"

data/config/routes.rb

@@ -51,8 +51,6 @@ Rails.application.routes.draw do
 
     post 'concepts/:origin/branch'      => 'concepts/versions#branch',    as: 'concept_versions_branch'
     post 'concepts/:origin/merge'       => 'concepts/versions#merge',     as: 'concept_versions_merge'
-    post 'concepts/:origin/lock'        => 'concepts/versions#lock',      as: 'concept_versions_lock'
-    post 'concepts/:origin/unlock'      => 'concepts/versions#unlock',    as: 'concept_versions_unlock'
     post 'concepts/:origin/to_review'   => 'concepts/versions#to_review', as: 'concept_versions_to_review'
     get 'concepts/:origin/consistency_check' => 'concepts/versions#consistency_check', as: 'concept_versions_consistency_check'
 
@@ -60,8 +58,6 @@ Rails.application.routes.draw do
 
     post 'collections/:origin/branch'      => 'collections/versions#branch',    as: 'collection_versions_branch'
     post 'collections/:origin/merge'       => 'collections/versions#merge',     as: 'collection_versions_merge'
-    post 'collections/:origin/lock'        => 'collections/versions#lock',      as: 'collection_versions_lock'
-    post 'collections/:origin/unlock'      => 'collections/versions#unlock',    as: 'collection_versions_unlock'
     post 'collections/:origin/to_review'   => 'collections/versions#to_review', as: 'collection_versions_to_review'
     get 'collections/:origin/consistency_check' => 'collections/versions#consistency_check', as: 'collection_versions_consistency_check'
 

data/db/migrate/20231012135837_remove_locked_by.rb

@@ -0,0 +1,6 @@
+class RemoveLockedBy < ActiveRecord::Migration[7.0]
+
+  def change
+    remove_column :concepts, :locked_by
+  end
+end

data/db/schema.rb

@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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: 2022_01_07_114201) 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

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
   s.license     = 'Apache-2.0'
 
-  s.add_dependency 'rails', '~> 6.1.5', '>= 6.1.5.1'
-  s.add_dependency 'puma', '< 6.0'
-  s.add_dependency 'bootsnap', '>= 1.4.4'
+  s.add_dependency 'rails', '~> 7.0.8'
+  s.add_dependency 'puma'
+  s.add_dependency 'bootsnap'
   s.add_dependency 'bundler'
   s.add_dependency 'kaminari'
   s.add_dependency 'authlogic'
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   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'
@@ -34,14 +34,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'deep_cloneable'
   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'
   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,bin,config,db,lib}/**/*')
+    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']

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'
 

data/lib/iqvoc/configuration/instance_configuration.rb

@@ -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

@@ -16,15 +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

data/lib/iqvoc/environments/production.rb

@@ -24,22 +24,22 @@ 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.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).
     config.active_storage.service = :local
 
     # 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
@@ -82,7 +82,7 @@ module Iqvoc::Environments
 
     # Use a different logger for distributed setups.
     # require "syslog/logger"
-    # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+    # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
     if ENV["RAILS_LOG_TO_STDOUT"].present?
       logger           = ActiveSupport::Logger.new(STDOUT)
@@ -92,26 +92,5 @@ module Iqvoc::Environments
 
     # Do not dump schema after migrations.
     config.active_record.dump_schema_after_migration = false
-
-    # Inserts middleware to perform automatic connection switching.
-    # The `database_selector` hash is used to pass options to the DatabaseSelector
-    # middleware. The `delay` is used to determine how long to wait after a write
-    # to send a subsequent read to the primary.
-    #
-    # The `database_resolver` class is used by the middleware to determine which
-    # database is appropriate to use based on the time delay.
-    #
-    # The `database_resolver_context` class is used by the middleware to set
-    # timestamps for the last write to the primary. The resolver uses the context
-    # class timestamps to determine how long to wait before reading from the
-    # replica.
-    #
-    # By default Rails will store a last write timestamp in the session. The
-    # DatabaseSelector middleware is designed as such you can define your own
-    # strategy for connection switching and pass that into the middleware through
-    # these configuration options.
-    # config.active_record.database_selector = { delay: 2.seconds }
-    # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
-    # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
   end
 end

data/lib/iqvoc/environments/test.rb

@@ -15,7 +15,7 @@ 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.

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.13.2"
+  VERSION = "4.14.4"
 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/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/collection_browsing_test.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+# Copyright 2011-2022 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
+
+class CollectionBrowsingTest < ActionDispatch::IntegrationTest
+  setup do
+    login('administrator')
+
+    @indoor = Iqvoc::Collection.base_class.new.publish.tap do |c|
+      RDFAPI.devour c, 'skos:prefLabel', '"Indoors"@en'
+      c.save
+    end
+
+    @outdoor = Iqvoc::Collection.base_class.new.publish.tap do |c|
+      RDFAPI.devour c, 'skos:prefLabel', '"Outdoors"@en'
+      c.save
+    end
+  end
+
+  test 'collection listing' do
+    visit collections_path(lang: 'en')
+    assert page.has_content?("#{@indoor.pref_label}")
+    assert page.has_content?("#{@outdoor.pref_label}")
+  end
+
+  test 'showing published collection' do
+    visit collection_path(@indoor, lang: 'en')
+    assert page.has_content?('Collections')
+    assert page.has_content?("#{@indoor.pref_label}")
+  end
+end

data/test/integration/collection_circularity_test.rb

@@ -20,11 +20,11 @@ class CollectionCircularityTest < ActionDispatch::IntegrationTest
   setup do
     login('administrator')
 
-    @coll1 = Iqvoc::Collection.base_class.new.lock_by_user(@user.id).tap { |c| c.save }
+    @coll1 = Iqvoc::Collection.base_class.new.tap { |c| c.save }
     RDFAPI.devour @coll1, 'skos:prefLabel', '"coll1"@en'
-    @coll2 = Iqvoc::Collection.base_class.new.lock_by_user(@user.id).tap { |c| c.save }
+    @coll2 = Iqvoc::Collection.base_class.new.tap { |c| c.save }
     RDFAPI.devour @coll2, 'skos:prefLabel', '"coll2"@en'
-    @coll3 = Iqvoc::Collection.base_class.new.lock_by_user(@user.id).tap { |c| c.save }
+    @coll3 = Iqvoc::Collection.base_class.new.tap { |c| c.save }
     RDFAPI.devour @coll3, 'skos:prefLabel', '"coll3"@en'
 
     @concept1 = Concept::SKOS::Base.new.publish.tap { |c| c.save }

data/test/integration/concept_collection_assignment_test.rb

@@ -43,7 +43,7 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     visit concept_path(concept, lang: 'en', format: 'html')
 
     click_link_or_button 'Create new version'
-    assert page.has_content? 'Instance copy has been created and locked.'
+    assert page.has_content? 'Instance copy has been created.'
     collection_origins = [@sports_coll, @hobbies_coll].map(&:origin).join(', ')
     fill_in 'concept_assigned_collection_origins', with: collection_origins
 

data/test/integration/create_concept_test.rb

@@ -30,6 +30,21 @@ class CreateConceptTest < ActionDispatch::IntegrationTest
     save_check_and_publish
   end
 
+  test 'send to review with inconsistent concept' do
+    login('administrator')
+    visit dashboard_path(lang: 'en')
+    click_link_or_button 'New Concept'
+
+    # Create invalid preflabel
+    fill_in 'concept_labelings_by_text_labeling_skos_pref_labels_en', with: 'Foo,Foo'
+    click_link_or_button 'Save'
+
+    # Consistency check should run when sending the concept to review.
+    click_link_or_button 'Send to review'
+    assert page.has_content? 'Instance is inconsistent.'
+    assert page.has_content? 'There must be only one preferred Label per language.'
+  end
+
   private
 
   def save_check_and_publish