iqvoc 4.13.0 → 4.14.4

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
 
@@ -51,9 +51,9 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Save'
 
     # there should be two collections
-    assert_equal 2, page.all('#assigned_collections ul li a').size
+    assert_equal 2, page.all('#collection_member_bases ul li a').size
 
-    within('#assigned_collections') do
+    within('#collection_member_bases') do
       assert page.has_content? 'Sports'
       assert page.has_content? 'Hobbies'
     end
@@ -64,9 +64,9 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Save'
 
     # there should be one collection left
-    assert_equal 1, page.all('#assigned_collections ul li a').size
+    assert_equal 1, page.all('#collection_member_bases ul li a').size
 
-    within('#assigned_collections') do
+    within('#collection_member_bases') do
       assert page.has_content? 'Sports'
       refute page.has_content? 'Hobbies'
     end
@@ -77,9 +77,9 @@ class ConceptCollectionAssignmentTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Save'
 
     # there should be no collections anymore
-    assert_equal 0, page.all('#assigned_collections ul li a').size
+    assert_equal 0, page.all('#collection_member_bases ul li a').size
 
-    within('#assigned_collections') do
+    within('#collection_member_bases') do
       refute page.has_content?('Sports'), 'Sports should be removed'
       refute page.has_content?('Hobbies'), 'Hobbies should be removed'
     end

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

data/test/integration/reverse_match_job_test.rb

@@ -41,9 +41,13 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
       { rel: 'remove_match', href: 'http://0.0.0.0:3000/airsoft/remove_match', method: 'patch' }
     ]}.to_json
 
-    stub_request(:get, 'http://try.iqvoc.com/')
-      .with(:headers => {'Accept' => 'application/json', 'User-Agent' => 'Faraday v0.9.0'})
-      .to_return(status: 200, body: body, headers: {})
+    stub_request(:get, "http://try.iqvoc.com/").
+      with(
+        headers: {
+          'Accept'=>'application/json',
+          'User-Agent'=>"Faraday v#{Faraday::VERSION}"
+        }).
+      to_return(status: 200, body: body, headers: {})
 
     @worker = Delayed::Worker.new
     DatabaseCleaner.start
@@ -56,7 +60,12 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
   test 'successfull job' do
     status, body = status_and_body(:mapping_added)
     stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft')
-      .with(:headers => {'Accept' => '*/*', 'Content-Type'=>'application/json', 'Referer'=>'http://try.iqvoc.com/', 'User-Agent'=>'Faraday v0.9.0'})
+      .with(headers: {
+        'Accept' => '*/*',
+        'Content-Type' => 'application/json',
+        'Referer' => 'http://try.iqvoc.com/',
+        'User-Agent'=>"Faraday v#{Faraday::VERSION}"
+      })
       .to_return(status: status, body: body.to_json, headers: {})
 
     job = @reverse_match_service.build_job(:add_match, @airsoft, 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
@@ -70,7 +79,8 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
 
   test 'job timeout' do
     status, body = status_and_body(:mapping_added)
-    stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft').to_timeout
+    stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft')
+      .to_timeout
 
     job = @reverse_match_service.build_job(:add_match, @airsoft, 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
     @reverse_match_service.add(job)
@@ -83,9 +93,26 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     assert_equal 'timeout_error', job.error_message
   end
 
+  test 'failed connection' do
+    status, body = status_and_body(:mapping_added)
+    stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft')
+      .to_raise(Errno::ECONNREFUSED)
+
+    job = @reverse_match_service.build_job(:add_match, @airsoft, 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
+    @reverse_match_service.add(job)
+
+    job = Delayed::Job.last
+    @worker.run(job)
+
+    assert_equal 1, @airsoft.jobs.size
+
+    assert_equal 'connection_failed', job.error_message
+  end
+
   test 'unknown resource' do
     status, body = status_and_body(:mapping_added)
-    stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft').to_return(status: 404)
+    stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft')
+      .to_return(status: 404)
 
     job = @reverse_match_service.build_job(:add_match, @airsoft, 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')
     @reverse_match_service.add(job)
@@ -101,7 +128,12 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
   test 'unknown match class' do
     status, body = status_and_body(:unknown_match)
     stub_request(:patch, 'http://0.0.0.0:3000/airsoft/add_match?match_class=match_skos_broadmatch&uri=http://try.iqvoc.com/airsoft')
-      .with(:headers => {'Accept' => '*/*', 'Content-Type'=>'application/json', 'Referer'=>'http://try.iqvoc.com/', 'User-Agent'=>'Faraday v0.9.0'})
+      .with(headers: {
+        'Accept' => '*/*',
+        'Content-Type' => 'application/json',
+        'Referer' => 'http://try.iqvoc.com/',
+        'User-Agent'=>'Faraday v1.10.3'
+      })
       .to_return(status: status, body: body.to_json, headers: {})
 
     job = @reverse_match_service.build_job(:add_match, @airsoft, 'http://try.iqvoc.com', 'Match::SKOS::BroadMatch')

data/test/integration/search_test.rb

@@ -47,9 +47,9 @@ class SearchTest < ActionDispatch::IntegrationTest
     visit search_path(lang: 'en', format: 'html')
 
     [{
-        type: 'Labels', query: 'Forest', query_type: 'contains',
-        amount: 1, result: 'Forest'
-      }].each { |q|
+       type: 'Labels', query: 'Forest', query_type: 'contain keyword',
+       amount: 1, result: 'Forest'
+     }].each { |q|
       find('#t').select q[:type]
       fill_in 'Search term(s)', with: q[:query]
       find('#qt').select q[:query_type]
@@ -62,7 +62,7 @@ class SearchTest < ActionDispatch::IntegrationTest
       click_button('Search')
 
       assert page.has_css?('.search-result', count: q[:amount]),
-      "Page has #{page.all(:css, '.search-result').count} '.search-result' nodes. Should be #{q[:amount]}."
+             "Page has #{page.all(:css, '.search-result').count} '.search-result' nodes. Should be #{q[:amount]}."
 
       within('.search-result') do
         assert page.has_content?(q[:result]), "Could not find '#{q[:result]}' within '.search-result'."
@@ -74,7 +74,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     visit search_path(lang: 'en', format: 'html')
 
     find('#t').select 'Labels'
-    find('#qt').select 'contains'
+    find('#qt').select 'contain keyword'
     fill_in 'Search term(s)', with: 'Alpha'
     click_button('Search')
     assert page.has_css?('.search-result', count: 1)
@@ -101,9 +101,9 @@ class SearchTest < ActionDispatch::IntegrationTest
         with: 'Air'
     click_button 'Save'
 
-    Iqvoc::Concept.base_class.third.update_attributes published_at: Date.today
-    Iqvoc::Concept.base_class.fourth.update_attributes published_at: Date.today
-    Note::Annotated::Base.where(predicate: "created").first.update_attributes value: (Date.today - 10.days).to_s
+    Iqvoc::Concept.base_class.third.update(published_at: Date.today)
+    Iqvoc::Concept.base_class.fourth.update(published_at: Date.today)
+    Note::Annotated::Base.where(predicate: "created").first.update(value: (Date.today - 10.days).to_s)
 
     visit search_path(lang: 'en', format: 'html')
     find('#t').select 'Labels'
@@ -119,7 +119,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     visit search_path(lang: 'en', format: 'html')
 
     find('#t').select 'Labels'
-    find('#qt').select 'contains'
+    find('#qt').select 'contain keyword'
     fill_in 'Search term(s)', with: 'res'
     find('#c').select @collection.to_s
 
@@ -160,7 +160,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     visit search_path(lang: 'en', format: 'html')
 
     find('#t').select 'Notes'
-    find('#qt').select 'contains'
+    find('#qt').select 'contain keyword'
     fill_in 'Search term(s)', with: 'ipsum'
     find('#c').select @collection.to_s
 
@@ -179,7 +179,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     visit search_path(lang: 'en', format: 'html')
 
     find('#t').select 'Labels'
-    find('#qt').select 'exact match'
+    find('#qt').select 'exactly match'
     fill_in 'Search term(s)', with: ''
     find('#c').select @collection.to_s
 
@@ -208,7 +208,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     visit search_path(lang: 'en', format: 'html')
 
     find('#t').select 'Labels'
-    find('#qt').select 'contains'
+    find('#qt').select 'contain keyword'
     fill_in 'Search term(s)', with: 'sample_'
 
     click_button('Search')

data/test/integration/version_page_test.rb

@@ -0,0 +1,26 @@
+# Copyright 2011-2023 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 VersionPageTest < ActionDispatch::IntegrationTest
+
+  test 'visit version page' do
+    visit version_path(lang: 'de')
+
+    assert page.body.include? 'iQvoc core version:'
+    assert page.body.include? Iqvoc::VERSION
+  end
+
+end

data/test/integration_test_helper.rb

@@ -16,12 +16,12 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'capybara/rails'
 require 'capybara/dsl'
-require 'capybara/poltergeist'
+require 'capybara/cuprite'
 require 'webmock'
 require File.expand_path('authentication', File.dirname(__FILE__))
 
 Capybara.server = :webrick
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :cuprite
 
 WebMock.allow_net_connect! # required for integration tests
 

data/test/models/concept_test.rb

@@ -249,4 +249,41 @@ class ConceptTest < ActiveSupport::TestCase
     refute wolf_concept.publishable?
     assert wolf_concept.errors.full_messages_for(:base).include? I18n.t('txt.models.concept.no_self_reference')
   end
+
+  test 'expired concepts scopes' do
+    assert_equal 0, Iqvoc::Concept.base_class.not_expired.count
+    assert_equal 0, Iqvoc::Concept.base_class.expired.count
+
+    wolf_concept = Iqvoc::Concept.base_class.new(origin: 'wolf').publish.tap do |c|
+      RDFAPI.devour c, 'skos:prefLabel', '"Wolf"@en'
+      c.save
+    end
+    refute wolf_concept.expired?
+
+    assert_equal 1, Iqvoc::Concept.base_class.not_expired.count
+    assert_equal 0, Iqvoc::Concept.base_class.expired.count
+
+    # expired until tomorrow
+    wolf_concept.expired_at = Date.tomorrow
+    wolf_concept.save
+    refute wolf_concept.expired?
+
+    assert_equal 1, Iqvoc::Concept.base_class.not_expired.count
+    assert_equal 0, Iqvoc::Concept.base_class.expired.count
+
+    # expired from today
+    wolf_concept.expired_at = Date.today
+    wolf_concept.save
+    assert wolf_concept.expired?
+
+    assert_equal 0, Iqvoc::Concept.base_class.not_expired.count
+    assert_equal 1, Iqvoc::Concept.base_class.expired.count
+
+    wolf_concept.expired_at = Date.yesterday
+    wolf_concept.save
+    assert wolf_concept.expired?
+
+    assert_equal 0, Iqvoc::Concept.base_class.not_expired.count
+    assert_equal 1, Iqvoc::Concept.base_class.expired.count
+  end
 end

data/test/models/deep_cloning_test.rb

@@ -60,14 +60,14 @@ class DeepCloningTest < ActiveSupport::TestCase
 
     @root_collection = Iqvoc::Collection.base_class.new(origin: 'root_collection1').tap do |c|
       RDFAPI.devour c, 'skos:prefLabel', '"Root Collection"@en'
-      RDFAPI.devour c, 'skos:member', @root_concept1
-      RDFAPI.devour c, 'skos:member', @root_concept2
-      RDFAPI.devour c, 'skos:member', @child_concept
-      RDFAPI.devour c, 'skos:member', @sub_collection
       c.publish
       c.save
     end
 
+    @root_collection.concepts << @root_concept1
+    @root_collection.concepts << @root_concept2
+    @root_collection.concepts << @child_concept
+    @root_collection.subcollections << @sub_collection
   end
 
   def after_setup
@@ -78,14 +78,16 @@ class DeepCloningTest < ActiveSupport::TestCase
     assert_equal @root_concept1, @child_concept.broader_relations.first.target
 
     assert_equal 3, @root_collection.concepts.size
-    assert_equal [@root_concept1, @root_concept2, @child_concept], @root_collection.concepts
+    [@root_concept1, @root_concept2, @child_concept].each do |concept|
+      @root_collection.concepts.include? concept
+    end
 
     assert_equal 1, @root_collection.subcollections.size
     assert_equal @sub_collection, @root_collection.subcollections.first
   end
 
   test 'should deep clone concept' do
-    root_concept_dup = @root_concept1.branch @admin
+    root_concept_dup = @root_concept1.branch
     root_concept_dup.save
 
     # test narrower
@@ -103,7 +105,7 @@ class DeepCloningTest < ActiveSupport::TestCase
   end
 
   test 'should deep clone collection' do
-    root_collection_dup = @root_collection.branch @admin
+    root_collection_dup = @root_collection.branch
     root_collection_dup.save
 
     # test subcollections

data/test/models/rdf_sync_test.rb

@@ -16,7 +16,7 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
-class RDFSyncTest < ActiveSupport::TestCase
+class RdfSyncTest < ActiveSupport::TestCase
   setup do
     @rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
     @skos = 'http://www.w3.org/2004/02/skos/core#'
@@ -32,7 +32,7 @@ class RDFSyncTest < ActiveSupport::TestCase
     end
     @view_context = FakeViewContext.new
 
-    @sync = RDFSyncService.new(@base_url, @target_host, username: @username,
+    @sync = RdfSyncService.new(@base_url, @target_host, username: @username,
         view_context: @view_context)
 
     @concepts = 1.upto(15).map do |i|
@@ -104,7 +104,7 @@ class RDFSyncTest < ActiveSupport::TestCase
     concept_count = concepts.count
     batch_count = 3
 
-    sync = RDFSyncService.new(@base_url, @target_host, username: @username,
+    sync = RdfSyncService.new(@base_url, @target_host, username: @username,
         batch_size: (concept_count / batch_count).ceil,
         view_context: @view_context)
 

data/test/models/zeitwerk_compliance_test.rb

@@ -0,0 +1,7 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class ZeitwerkComplianceTest < ActiveSupport::TestCase
+  test "eager loads all files without errors" do
+    assert_nothing_raised { Rails.application.eager_load! }
+  end
+end

data/test/test_helper.rb

@@ -21,3 +21,6 @@ unless defined?(Iqvoc) && Iqvoc.const_defined?(:Engine)
 end
 
 require 'rails/test_help'
+require 'authlogic/test_case'
+
+include Authlogic::TestCase