iqvoc 4.14.5 → 4.15.0

data/lib/iqvoc/environments/production.rb

@@ -1,96 +1,99 @@
 require "active_support/core_ext/integer/time"
 require 'iqvoc'
 
-module Iqvoc::Environments
-  def self.setup_production(config)
-    # Settings specified here will take precedence over those in config/application.rb.
+module Iqvoc
+  module Environments
+    module Production
+      def self.setup(config)
+        # Settings specified here will take precedence over those in config/application.rb.
 
-    # Code is not reloaded between requests.
-    config.cache_classes = true
+        # Code is not reloaded between requests.
+        config.enable_reloading = false
 
-    # Eager load code on boot. This eager loads most of Rails and
-    # your application in memory, allowing both threaded web servers
-    # and those relying on copy on write to perform better.
-    # Rake tasks automatically ignore this option for performance.
-    config.eager_load = true
+        # Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
+        config.eager_load = true
 
-    # Full error reports are disabled and caching is turned on.
-    config.consider_all_requests_local       = false
-    config.action_controller.perform_caching = true
+        # Full error reports are disabled.
+        config.consider_all_requests_local = false
 
-    # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
-    # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
-    # config.require_master_key = true
+        # Turn on fragment caching in view templates.
+        config.action_controller.perform_caching = true
 
-    # 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?
+        # Cache assets for far-future expiry since they are all digest stamped.
+        config.public_file_server.headers = {
+          'cache-control' => "public, s-maxage=#{365.days.to_i}, max-age=#{365.days.to_i}, immutable",
+          'expires' => 1.year.from_now.to_formatted_s(:rfc822)
+        }
 
-    # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-    # config.asset_host = "http://assets.example.com"
+        # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+        # 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
+        # Store uploaded files on the local file system (see config/storage.yml for options).
+        config.active_storage.service = :local
 
-    # Store uploaded files on the local file system (see config/storage.yml for options).
-    config.active_storage.service = :local
+        # Assume all access to the app is happening through a SSL-terminating reverse proxy.
+        # config.assume_ssl = true
 
-    # 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.*/ ]
+        # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+        # config.force_ssl = true
 
-    # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-    # config.force_ssl = true
+        # Skip http-to-https redirect for the default health check endpoint.
+        # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
 
-    # 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)
+        # Log to STDOUT with the current request id as a default log tag.
+        # config.log_tags = [ :request_id ]
+        config.logger = ActiveSupport::Logger.new(STDOUT)
 
-    # Prepend all log lines with the following tags.
-    config.log_tags = [ :request_id ]
+        # Change to "debug" to log everything (including potentially personally-identifiable information!)
+        config.log_level = ENV.fetch("LOG_LEVEL", "info")
 
-    # Use a different cache store in production.
-    # config.cache_store = :mem_cache_store
+        # Prevent health checks from clogging up the logs.
+        config.silence_healthcheck_path = "/up"
 
-    # 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_production"
+        # Don't log any deprecations.
+        config.active_support.report_deprecations = false
 
-    config.action_mailer.perform_caching = false
+        # Replace the default in-process memory cache store with a durable alternative.
+        # config.cache_store = :mem_cache_store
 
-    # Ignore bad email addresses and do not raise email delivery errors.
-    # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-    # config.action_mailer.raise_delivery_errors = false
+        # Replace the default in-process and non-durable queuing backend for Active Job.
+        # config.active_job.queue_adapter = :resque
 
-    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation cannot be found).
-    config.i18n.fallbacks = true
+        # Ignore bad email addresses and do not raise email delivery errors.
+        # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+        # config.action_mailer.raise_delivery_errors = false
 
-    # Send deprecation notices to registered listeners.
-    config.active_support.deprecation = :notify
+        # Set host to be used by links generated in mailer templates.
+        config.action_mailer.default_url_options = { host: "example.com" }
 
-    # Log disallowed deprecations.
-    config.active_support.disallowed_deprecation = :log
+        # Specify outgoing SMTP server. Remember to add smtp/* credentials via bin/rails credentials:edit.
+        # config.action_mailer.smtp_settings = {
+        #   user_name: Rails.application.credentials.dig(:smtp, :user_name),
+        #   password: Rails.application.credentials.dig(:smtp, :password),
+        #   address: "smtp.example.com",
+        #   port: 587,
+        #   authentication: :plain
+        # }
 
-    # Tell Active Support which deprecation messages to disallow.
-    config.active_support.disallowed_deprecation_warnings = []
+        # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+        # the I18n.default_locale when a translation cannot be found).
+        config.i18n.fallbacks = true
 
-    # Use default logging formatter so that PID and timestamp are not suppressed.
-    config.log_formatter = ::Logger::Formatter.new
+        # Do not dump schema after migrations.
+        config.active_record.dump_schema_after_migration = false
 
-    # Use a different logger for distributed setups.
-    # require "syslog/logger"
-    # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
+        # Only use :id for inspections in production.
+        config.active_record.attributes_for_inspect = [ :id ]
 
-    if ENV["RAILS_LOG_TO_STDOUT"].present?
-      logger           = ActiveSupport::Logger.new(STDOUT)
-      logger.formatter = config.log_formatter
-      config.logger    = ActiveSupport::TaggedLogging.new(logger)
+        # Enable DNS rebinding protection and other `Host` header attacks.
+        # config.hosts = [
+        #   "example.com",     # Allow requests from example.com
+        #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+        # ]
+        #
+        # Skip DNS rebinding protection for the default health check endpoint.
+        # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
+      end
     end
-
-    # Do not dump schema after migrations.
-    config.active_record.dump_schema_after_migration = false
   end
 end

data/lib/iqvoc/environments/test.rb

@@ -1,57 +1,63 @@
 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!
+module Iqvoc
+  module Environments
+    module Test
+      def self.setup(config)
+        # Settings specified here will take precedence over those in config/application.rb.
 
-    config.cache_classes = true
+        # While tests run files are not watched, reloading is not necessary.
+        config.enable_reloading = false
 
-    # Do not eager load code on boot. This avoids loading your whole application
-    # just for the purpose of running a single test. If you are using a tool that
-    # preloads Rails for running tests, you may have to set it to true.
-    config.eager_load = false
+        # Eager loading loads your entire application. When running a single test locally,
+        # this is usually not necessary, and can slow down your test suite. However, it's
+        # recommended that you enable it in continuous integration systems to ensure eager
+        # loading is working properly before deploying your code.
+        config.eager_load = ENV["CI"].present?
 
-    # 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}"
-    }
+        # Configure public file server for tests with cache-control for performance.
+        config.public_file_server.headers = { "cache-control" => "public, max-age=3600" }
 
-    # Show full error reports and disable caching.
-    config.consider_all_requests_local       = true
-    config.action_controller.perform_caching = false
-    config.cache_store = :null_store
+        # Show full error reports.
+        config.consider_all_requests_local = true
+        config.cache_store = :null_store
 
-    # Raise exceptions instead of rendering exception templates.
-    config.action_dispatch.show_exceptions = false
+        # Render exception templates for rescuable exceptions and raise for other exceptions.
+        config.action_dispatch.show_exceptions = :rescuable
 
-    # Disable request forgery protection in test environment.
-    config.action_controller.allow_forgery_protection = false
+        # 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.
-    config.active_storage.service = :test
+        # Store uploaded files on the local file system in a temporary directory.
+        config.active_storage.service = :test
 
-    config.action_mailer.perform_caching = false
+        # Tell Action Mailer not to deliver emails to the real world.
+        # The :test delivery method accumulates sent emails in the
+        # ActionMailer::Base.deliveries array.
+        config.action_mailer.delivery_method = :test
 
-    # Tell Action Mailer not to deliver emails to the real world.
-    # The :test delivery method accumulates sent emails in the
-    # ActionMailer::Base.deliveries array.
-    config.action_mailer.delivery_method = :test
+        # Set host to be used by links generated in mailer templates.
+        config.action_mailer.default_url_options = { host: "example.com" }
 
-    # Print deprecation notices to the stderr.
-    config.active_support.deprecation = :stderr
+        # Print deprecation notices to the stderr.
+        config.active_support.deprecation = :stderr
 
-    # Raise exceptions for disallowed deprecations.
-    config.active_support.disallowed_deprecation = :raise
+        # Raises error for missing translations.
+        config.i18n.raise_on_missing_translations = true
 
-    # Tell Active Support which deprecation messages to disallow.
-    config.active_support.disallowed_deprecation_warnings = []
+        # Annotate rendered view with file names.
+        # config.action_view.annotate_rendered_view_with_filenames = true
 
-    # Raises error for missing translations.
-    config.i18n.raise_on_missing_translations = true
+        # Raise error when a before_action's only/except options reference missing actions.
+        config.action_controller.raise_on_missing_callback_actions = true
 
-    # Annotate rendered view with file names.
-    # config.action_view.annotate_rendered_view_with_filenames = true
+        config.autoload_paths << Rails.root.join('test/support')
+      end
+    end
   end
 end

data/lib/iqvoc/version.rb

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

data/test/controllers/concepts_movement_controller_test.rb

@@ -36,19 +36,19 @@ class ConceptsMovementControllerTest < ActionController::TestCase
     #   - Air Sport
     # + Sports
     #
-    @air_sports = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
+    @air_sports = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Air sports"@en'
       c.publish
       c.save
     end
-    @achievement_hobbies = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
-      RDFAPI.devour c, 'skos:narrower', @air_sports
+    @achievement_hobbies = Concept::Skos::Base.new(top_term: true).tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+      RdfApi.devour c, 'skos:narrower', @air_sports
       c.publish
       c.save
     end
-    @sports = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
+    @sports = Concept::Skos::Base.new(top_term: true).tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Sports"@en'
       c.publish
       c.save
     end
@@ -128,17 +128,17 @@ class ConceptsMovementControllerTest < ActionController::TestCase
     UserSession.create(@admin)
 
     # create unpublished concepts
-    @air_sports = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
+    @air_sports = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Air sports"@en'
       c.save
     end
-    @achievement_hobbies = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
-      RDFAPI.devour c, 'skos:narrower', @air_sports
+    @achievement_hobbies = Concept::Skos::Base.new(top_term: true).tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+      RdfApi.devour c, 'skos:narrower', @air_sports
       c.save
     end
-    @sports = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
+    @sports = Concept::Skos::Base.new(top_term: true).tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Sports"@en'
       c.save
     end
 

data/test/controllers/hierarchy_test.rb

@@ -332,7 +332,6 @@ boot:
 
     get :show, params: { lang: 'en', format: 'html', root: 'foo', siblings: 'true' }
     entries = get_all_entries('ul.concept-hierarchy li')
-    # binding.pry
     assert_equal ['Bar', 'Foo'], entries
 
     get :show, params: { lang: 'en', format: 'html', root: 'lorem' }

data/test/controllers/reverse_match_test.rb

@@ -33,14 +33,14 @@ class ReverseMatchTest < ActionController::TestCase
 
     Iqvoc.config['sources.iqvoc'] = ['http://try.iqvoc.net']
 
-    @achievement_hobbies = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
+    @achievement_hobbies = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Achievement hobbies"@en'
       c.publish
       c.save
     end
 
-    @airsoft = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
+    @airsoft = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Airsoft"@en'
       c.publish
       c.save
       new_version = c.branch
@@ -56,7 +56,7 @@ class ReverseMatchTest < ActionController::TestCase
   end
 
   test 'remove non existing match' do
-    m = Match::SKOS::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
+    m = Match::Skos::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
     patch :remove_match, params: {
       origin: @achievement_hobbies.origin,
       match_class: 'match_skos_relatedmatch',
@@ -68,7 +68,7 @@ class ReverseMatchTest < ActionController::TestCase
   end
 
   test 'remove match' do
-    m = Match::SKOS::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
+    m = Match::Skos::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
     patch :remove_match, params: {
       origin: @achievement_hobbies.origin,
       match_class: 'match_skos_broadmatch',

data/test/integration/alphabetical_test.rb

@@ -24,17 +24,17 @@ class AlphabeticalConceptsTest < ActionDispatch::IntegrationTest
     ]
 
     data.each_with_index do |hsh, i|
-      concept = RDFAPI.devour "concept_#{i}", 'a', 'skos:Concept'
+      concept = RdfApi.devour "concept_#{i}", 'a', 'skos:Concept'
       labelings = []
       hsh.each do |lang, val|
-        RDFAPI.devour concept, 'skos:prefLabel', "\"#{val}\"@#{lang}"
+        RdfApi.devour concept, 'skos:prefLabel', "\"#{val}\"@#{lang}"
       end
       concept.publish.save
     end
 
-    Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Air sports"@en'
-      RDFAPI.devour c, 'skos:altLabel', '"Berta"@en'
+    Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Air sports"@en'
+      RdfApi.devour c, 'skos:altLabel', '"Berta"@en'
       c.publish
       c.save
     end

data/test/integration/browse_concepts_and_labels_test.rb

@@ -19,9 +19,9 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
   setup do
     @concepts = %w("Tree"@en "Forest"@en "Baum"@de "Forst"@de).map do |literal|
-      concept = Concept::SKOS::Base.new.publish
+      concept = Concept::Skos::Base.new.publish
       concept.save
-      RDFAPI.devour concept, 'skos:prefLabel', literal
+      RdfApi.devour concept, 'skos:prefLabel', literal
       concept
     end
   end
@@ -57,10 +57,10 @@ class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
   test 'showing expired concepts' do
     # prepare database with expired concept
     concepts = %w("Method"@en "Methode"@de).map do |literal|
-      concept = Concept::SKOS::Base.create! do |c|
+      concept = Concept::Skos::Base.create! do |c|
         c.expired_at = 2.days.ago
       end
-      RDFAPI.devour concept, 'skos:prefLabel', literal
+      RdfApi.devour concept, 'skos:prefLabel', literal
       concept
     end
 

data/test/integration/client_edit_concept_test.rb

@@ -23,7 +23,7 @@ class ClientEditConceptsTest < ActionDispatch::IntegrationTest
   self.use_transactional_tests = false
 
   setup do
-    @concept = Concept::SKOS::Base.new.publish
+    @concept = Concept::Skos::Base.new.publish
     @concept.save
 
     Capybara.current_driver = Capybara.javascript_driver

data/test/integration/collection_browsing_test.rb

@@ -21,12 +21,12 @@ class CollectionBrowsingTest < ActionDispatch::IntegrationTest
     login('administrator')
 
     @indoor = Iqvoc::Collection.base_class.new.publish.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Indoors"@en'
+      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'
+      RdfApi.devour c, 'skos:prefLabel', '"Outdoors"@en'
       c.save
     end
   end

data/test/integration/collection_circularity_test.rb

@@ -21,18 +21,18 @@ class CollectionCircularityTest < ActionDispatch::IntegrationTest
     login('administrator')
 
     @coll1 = Iqvoc::Collection.base_class.new.tap { |c| c.save }
-    RDFAPI.devour @coll1, 'skos:prefLabel', '"coll1"@en'
+    RdfApi.devour @coll1, 'skos:prefLabel', '"coll1"@en'
     @coll2 = Iqvoc::Collection.base_class.new.tap { |c| c.save }
-    RDFAPI.devour @coll2, 'skos:prefLabel', '"coll2"@en'
+    RdfApi.devour @coll2, 'skos:prefLabel', '"coll2"@en'
     @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 }
-    RDFAPI.devour @concept1, 'skos:prefLabel', '"concept1"@en'
-    @concept2 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    RDFAPI.devour @concept2, 'skos:prefLabel', '"concept2"@en'
-    @concept3 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    RDFAPI.devour @concept3, 'skos:prefLabel', '"concept3"@en'
+    RdfApi.devour @coll3, 'skos:prefLabel', '"coll3"@en'
+
+    @concept1 = Concept::Skos::Base.new.publish.tap { |c| c.save }
+    RdfApi.devour @concept1, 'skos:prefLabel', '"concept1"@en'
+    @concept2 = Concept::Skos::Base.new.publish.tap { |c| c.save }
+    RdfApi.devour @concept2, 'skos:prefLabel', '"concept2"@en'
+    @concept3 = Concept::Skos::Base.new.publish.tap { |c| c.save }
+    RdfApi.devour @concept3, 'skos:prefLabel', '"concept3"@en'
   end
 
   test 'inline assignments are persisted' do

data/test/integration/collection_test.rb

@@ -0,0 +1,79 @@
+# encoding: UTF-8
+
+# Copyright 2011-2013 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 CollectionTest < ActionDispatch::IntegrationTest
+  test 'collection creation' do
+    login('administrator')
+    visit dashboard_path(lang: 'en')
+
+    click_link_or_button 'New Collection'
+
+    # fill in english pref label
+    fill_in 'concept_labelings_by_text_labeling_skos_pref_labels_en', with: 'Test-Collection'
+
+    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 Collection'
+
+    # 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 collection to review.
+    click_link_or_button 'Send to review'
+    assert has_content? 'Instance is inconsistent.'
+  end
+
+  test 'editing collection' do
+    login('administrator')
+    visit dashboard_path(lang: 'en')
+
+    click_link_or_button 'New Collection'
+
+    # fill in english pref label
+    fill_in 'concept_labelings_by_text_labeling_skos_pref_labels_en', with: 'Test-Collection'
+    fill_in 'concept_note_skos_definitions_attributes_0_value', with: 'Test-Definition for Test-Collection'
+
+    save_check_and_publish
+    assert has_content? 'Test-Definition for Test-Collection'
+
+    click_link_or_button 'Create new version'
+    fill_in 'concept_note_skos_definitions_attributes_0_value', with: 'Updated Test-Definition for Test-Collection'
+
+    save_check_and_publish
+    assert has_content? 'Updated Test-Definition for Test-Collection'
+  end
+
+  private
+
+  def save_check_and_publish
+    click_link_or_button 'Save'
+
+    assert has_content? 'The collection has been successfully saved'
+
+    click_link_or_button 'Check consistency'
+    assert has_content? 'Instance is consistent.'
+
+    click_link_or_button 'Publish'
+    assert has_content? 'Instance has been successfully published.'
+  end
+end

data/test/integration/concept_browsing_test.rb

@@ -18,9 +18,9 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 
 class ConceptBrowsingTest < ActionDispatch::IntegrationTest
   setup do
-    @concept1 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    @concept2 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
-    @concept3 = Concept::SKOS::Base.new.publish.tap { |c| c.save }
+    @concept1 = Concept::Skos::Base.new.publish.tap { |c| c.save }
+    @concept2 = Concept::Skos::Base.new.publish.tap { |c| c.save }
+    @concept3 = Concept::Skos::Base.new.publish.tap { |c| c.save }
   end
 
   test 'showing published concept' do

data/test/integration/concept_collection_assignment_test.rb

@@ -21,21 +21,21 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     login 'administrator'
 
     @sports_coll = Iqvoc::Collection.base_class.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Sports"@en'
+      RdfApi.devour c, 'skos:prefLabel', '"Sports"@en'
       c.publish
       c.save
     end
 
     @hobbies_coll = Iqvoc::Collection.base_class.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Hobbies"@en'
+      RdfApi.devour c, 'skos:prefLabel', '"Hobbies"@en'
       c.publish
       c.save
     end
   end
 
   test 'concept collection assignment' do
-    concept = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Testcollection"@en'
+    concept = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Testcollection"@en'
       c.publish
       c.save
     end