iqvoc 4.14.5 → 4.15.0

data/test/integration/concept_scheme_browsing_test.rb

@@ -18,7 +18,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 
 class ConceptSchemeBrowsingTest < ActionDispatch::IntegrationTest
   test 'list top concepts in rdf scheme' do
-    @concept = Concept::SKOS::Base.new(top_term: true).publish.tap { |c| c.save }
+    @concept = Concept::Skos::Base.new(top_term: true).publish.tap { |c| c.save }
 
     visit '/scheme.ttl'
 
@@ -27,7 +27,7 @@ class ConceptSchemeBrowsingTest < ActionDispatch::IntegrationTest
   end
 
   test 'top concepts rdf' do
-    @concept = Concept::SKOS::Base.new(top_term: true).publish.tap { |c| c.save }
+    @concept = Concept::Skos::Base.new(top_term: true).publish.tap { |c| c.save }
 
     visit "/#{@concept.origin}.ttl"
 
@@ -35,7 +35,7 @@ class ConceptSchemeBrowsingTest < ActionDispatch::IntegrationTest
   end
 
   test 'non-top-concept in scheme' do
-    non_top_concept = Concept::SKOS::Base.new(top_term: false).publish.tap { |c| c.save }
+    non_top_concept = Concept::Skos::Base.new(top_term: false).publish.tap { |c| c.save }
 
     visit "/#{non_top_concept.origin}.ttl"
 
@@ -49,10 +49,10 @@ class ConceptSchemeBrowsingTest < ActionDispatch::IntegrationTest
     assert !page.has_link?('Tree 2', href: 'http://www.example.com/en/concepts/foo_1.html')
     assert !page.has_link?('Tree 2', href: 'http://www.example.com/en/concepts/foo_2.html')
 
-    concept1 = Concept::SKOS::Base.new(origin: 'foo_1', top_term: false).publish.tap { |c| c.save }
-    RDFAPI.devour concept1, 'skos:prefLabel', '"Tree 2"@en'
-    concept2 = Concept::SKOS::Base.new(origin: 'foo_2', top_term: false).publish.tap { |c| c.save }
-    RDFAPI.devour concept2, 'skos:prefLabel', '"Tree 2"@en'
+    concept1 = Concept::Skos::Base.new(origin: 'foo_1', top_term: false).publish.tap { |c| c.save }
+    RdfApi.devour concept1, 'skos:prefLabel', '"Tree 2"@en'
+    concept2 = Concept::Skos::Base.new(origin: 'foo_2', top_term: false).publish.tap { |c| c.save }
+    RdfApi.devour concept2, 'skos:prefLabel', '"Tree 2"@en'
 
     login 'administrator'
     visit edit_scheme_path(lang: :en, format: :html)

data/test/integration/edit_collections_test.rb

@@ -2,7 +2,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 
 class EditCollectionsTest < ActionDispatch::IntegrationTest
   setup do
-    @collection = Collection::SKOS::Unordered.new.publish.tap { |c| c.save }
+    @collection = Collection::Skos::Unordered.new.publish.tap { |c| c.save }
   end
 
   test 'create a new collection version' do

data/test/integration/edit_concepts_test.rb

@@ -18,8 +18,8 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 
 class EditConceptsTest < ActionDispatch::IntegrationTest
   setup do
-    @concept = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"foo"@en'
+    @concept = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"foo"@en'
       c.publish
       c.save
     end

data/test/integration/instance_configuration_browsing_test.rb

@@ -36,7 +36,7 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
     assert_equal '/en/config.html', page.current_path
     assert page.has_css?('input#config_title')
     assert page.has_selector?(:xpath, '//input[@id="config_languages.pref_labeling"]')
-    assert page.has_selector?(:xpath, '//input[@id="config_languages.further_labelings.Labeling::SKOS::AltLabel"]')
+    assert page.has_selector?(:xpath, '//input[@id="config_languages.further_labelings.Labeling::Skos::AltLabel"]')
     assert page.has_selector?(:xpath, '//input[@id="config_languages.notes"]')
 
     # TODO: also test POST

data/test/integration/note_annotations_test.rb

@@ -93,7 +93,7 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
   end
 
   test 'rdf for localized note annotations' do
-    rdfapi = RDFAPI
+    rdfapi = RdfApi
 
     concept = rdfapi.devour *%w(foobar a skos:Concept)
     concept.publish
@@ -101,7 +101,7 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
 
     rdfapi.devour concept, 'skos:prefLabel', '"foo"@en'
 
-    note = Note::RDFS::SeeAlso.create owner: concept, value: 'foo', language: 'en', position: 1
+    note = Note::Rdfs::SeeAlso.create owner: concept, value: 'foo', language: 'en', position: 1
     note.annotations.create namespace: 'dct', predicate: 'title', value: 'Foo Bar', language: 'en'
     note.annotations.create namespace: 'foaf', predicate: 'page', value: 'http://google.de/'
 

data/test/integration/reverse_match_job_test.rb

@@ -21,14 +21,14 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
   include ReverseMatchErrors
 
   setup do
-    @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(origin: 'airsoft').tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Airsoft"@en'
+    @airsoft = Concept::Skos::Base.new(origin: 'airsoft').tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Airsoft"@en'
       c.publish
       c.save
     end
@@ -68,7 +68,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
       })
       .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')
+    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
@@ -82,7 +82,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     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')
+    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
@@ -98,7 +98,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     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')
+    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
@@ -114,7 +114,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
     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')
+    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
@@ -136,7 +136,7 @@ class ReverseMatchJobTest < ActiveSupport::TestCase
       })
       .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')
+    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

data/test/integration/search_test.rb

@@ -20,22 +20,22 @@ class SearchTest < ActionDispatch::IntegrationTest
     Kaminari.config.default_per_page = 5
 
     @concepts = %w("Tree"@en "Forest"@en).map do |literal|
-      Concept::SKOS::Base.new.tap do |c|
-        RDFAPI.devour c, 'skos:prefLabel', literal
+      Concept::Skos::Base.new.tap do |c|
+        RdfApi.devour c, 'skos:prefLabel', literal
         c.publish
         c.save
       end
     end
 
-    @collection = Collection::SKOS::Unordered.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Alpha"@en'
+    @collection = Collection::Skos::Unordered.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Alpha"@en'
       c.publish
       c.save
     end
 
     # assign concepts to collection
     @concepts.each do |c|
-      RDFAPI.devour @collection, 'skos:member', c
+      RdfApi.devour @collection, 'skos:member', c
     end
   end
 
@@ -150,12 +150,12 @@ class SearchTest < ActionDispatch::IntegrationTest
   end
 
   test 'searching specific classes within collections' do
-    concept = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:definition', '"lorem ipsum"@en'
+    concept = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:definition', '"lorem ipsum"@en'
       c.publish
       c.save
     end
-    RDFAPI.devour @collection, 'skos:member', concept
+    RdfApi.devour @collection, 'skos:member', concept
 
     visit search_path(lang: 'en', format: 'html')
 
@@ -198,8 +198,8 @@ class SearchTest < ActionDispatch::IntegrationTest
   test 'pagination' do
     # create a large number of concepts
     1.upto(12) do |i|
-      Concept::SKOS::Base.new.tap do |c|
-        RDFAPI.devour c, 'skos:prefLabel', "\"sample_#{sprintf('_%04d', i)}\"@en"
+      Concept::Skos::Base.new.tap do |c|
+        RdfApi.devour c, 'skos:prefLabel', "\"sample_#{sprintf('_%04d', i)}\"@en"
         c.publish
         c.save
       end
@@ -239,4 +239,14 @@ class SearchTest < ActionDispatch::IntegrationTest
     assert page.source.include?('#result2">')
     assert !page.source.include?('#result3">') # we're on page 3/3
   end
+
+  test 'api searching with empty search query' do
+    %w(ttl nt rdf).each do |format|
+      get search_url(lang: 'en', format: format)
+      assert_response :bad_request, 'should return bad request without search query'
+
+      get search_url(lang: 'en', format: format, query: '')
+      assert_response :bad_request, 'should return bad request with blank search query'
+    end
+  end
 end

data/test/integration/tree_test.rb

@@ -18,15 +18,15 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 
 class TreeTest < ActionDispatch::IntegrationTest
   test 'browse hierarchical concepts tree' do
-    narrower_concept = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Narrower"@en'
+    narrower_concept = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Narrower"@en'
       c.publish
       c.save
     end
 
-    concept = Concept::SKOS::Base.new(top_term: true).tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Foo"@en'
-      RDFAPI.devour c, 'skos:narrower', narrower_concept
+    concept = Concept::Skos::Base.new(top_term: true).tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Foo"@en'
+      RdfApi.devour c, 'skos:narrower', narrower_concept
       c.publish
       c.save
     end

data/test/integration/untranslated_test.rb

@@ -23,9 +23,9 @@ class UntranslatedConceptsTest < ActionDispatch::IntegrationTest
       { en: 'Yen1', de: 'Yde1' },
       { en: 'Yen2' }
     ].each do |hsh|
-      concept = Concept::SKOS::Base.new
+      concept = Concept::Skos::Base.new
       hsh.each do |lang, value|
-        RDFAPI.devour concept, 'skos:prefLabel', "\"#{value}\"@#{lang}"
+        RdfApi.devour concept, 'skos:prefLabel', "\"#{value}\"@#{lang}"
       end
       concept.publish.save
     end

data/test/integration_test_helper.rb

@@ -22,6 +22,13 @@ require File.expand_path('authentication', File.dirname(__FILE__))
 
 Capybara.server = :webrick
 Capybara.javascript_driver = :cuprite
+Capybara.register_driver(:cuprite) do |app|
+  if ENV["CI"].present?
+    Capybara::Cuprite::Driver.new(app, browser_options: { 'no-sandbox': nil })
+  else
+    Capybara::Cuprite::Driver.new(app, window_size: [1200, 800])
+  end
+end
 
 WebMock.allow_net_connect! # required for integration tests
 

data/test/models/concept_scheme_test.rb

@@ -18,18 +18,18 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
 class ConceptSchemeTest < ActiveSupport::TestCase
   test 'singleton concept scheme' do
-    assert_equal 0, Concept::SKOS::Scheme.count
+    assert_equal 0, Concept::Skos::Scheme.count
 
-    assert_difference 'Concept::SKOS::Scheme.count' do
-      Concept::SKOS::Scheme.instance
+    assert_difference 'Concept::Skos::Scheme.count' do
+      Concept::Skos::Scheme.instance
     end
 
-    assert_no_difference 'Concept::SKOS::Scheme.count' do
-      Concept::SKOS::Scheme.instance
+    assert_no_difference 'Concept::Skos::Scheme.count' do
+      Concept::Skos::Scheme.instance
     end
 
     assert_raise TypeError do
-      Concept::SKOS::Scheme.create
+      Concept::Skos::Scheme.create
     end
   end
 end

data/test/models/concept_test.rb

@@ -41,7 +41,7 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'concept with no preflabel' do
-    concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
+    concept = RdfApi.devour 'bear', 'a', 'skos:Concept'
 
     assert concept.save
     refute concept.publishable?
@@ -51,15 +51,15 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'concepts without pref_labels should be saveable but not publishable' do
-    concept =  RDFAPI.devour 'bear', 'a', 'skos:Concept'
+    concept =  RdfApi.devour 'bear', 'a', 'skos:Concept'
     assert_equal [], concept.pref_labels
     assert concept.valid?
     refute concept.publishable?
   end
 
   test 'published concept must have a pref_label of the first pref_label language configured (the main language)' do
-    concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
-    RDFAPI.devour concept, 'skos:prefLabel', '"Bear"@en'
+    concept = RdfApi.devour 'bear', 'a', 'skos:Concept'
+    RdfApi.devour concept, 'skos:prefLabel', '"Bear"@en'
 
     assert concept.save
 
@@ -72,14 +72,14 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'one pref label per language' do
-    concept = Concept::SKOS::Base.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Bear"@en'
+    concept = Concept::Skos::Base.new.tap do |c|
+      RdfApi.devour c, 'skos:prefLabel', '"Bear"@en'
       c.publish
       c.save
     end
 
     assert concept.valid?
-    RDFAPI.devour concept, 'skos:prefLabel', '"Beaaar"@en'
+    RdfApi.devour concept, 'skos:prefLabel', '"Beaaar"@en'
     concept.pref_labelings.reload
     assert_equal 2, concept.pref_labelings.count
     assert_equal concept.pref_labelings.first.target.language, concept.pref_labelings.second.target.language
@@ -87,29 +87,29 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'unique pref label' do
-    bear_one = RDFAPI.devour 'bear_one', 'a', 'skos:Concept'
-    RDFAPI.devour bear_one, 'skos:prefLabel', '"Bear"@en'
+    bear_one = RdfApi.devour 'bear_one', 'a', 'skos:Concept'
+    RdfApi.devour bear_one, 'skos:prefLabel', '"Bear"@en'
 
     assert bear_one.save
     assert bear_one.publishable?
 
-    bear_two = RDFAPI.devour 'bear_two', 'a', 'skos:Concept'
-    RDFAPI.devour bear_two, 'skos:prefLabel', '"Bear"@en'
+    bear_two = RdfApi.devour 'bear_two', 'a', 'skos:Concept'
+    RdfApi.devour bear_two, 'skos:prefLabel', '"Bear"@en'
 
     bear_two.save!
     refute bear_two.publishable?
   end
 
   test 'unique alt labels' do
-    tiger = RDFAPI.devour 'tiger', 'a', 'skos:Concept'
-    RDFAPI.devour tiger, 'skos:prefLabel', '"Tiger"@en'
+    tiger = RdfApi.devour 'tiger', 'a', 'skos:Concept'
+    RdfApi.devour tiger, 'skos:prefLabel', '"Tiger"@en'
 
     assert tiger.save
     assert tiger.publishable?
 
     # two identical alt labels
-    RDFAPI.devour tiger, 'skos:altLabel', '"Big cat"@en'
-    RDFAPI.devour tiger, 'skos:altLabel', '"Big cat"@en'
+    RdfApi.devour tiger, 'skos:altLabel', '"Big cat"@en'
+    RdfApi.devour tiger, 'skos:altLabel', '"Big cat"@en'
 
     tiger.save!
     tiger.reload
@@ -117,14 +117,14 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'distinct labels' do
-    monkey = RDFAPI.devour 'Monkey', 'a', 'skos:Concept'
-    RDFAPI.devour monkey, 'skos:prefLabel', '"Monkey"@en'
+    monkey = RdfApi.devour 'Monkey', 'a', 'skos:Concept'
+    RdfApi.devour monkey, 'skos:prefLabel', '"Monkey"@en'
 
     assert monkey.save
     assert monkey.publishable?
 
     # identical to pref label
-    RDFAPI.devour monkey, 'skos:altLabel', '"Monkey"@en'
+    RdfApi.devour monkey, 'skos:altLabel', '"Monkey"@en'
 
     monkey.save!
     monkey.reload
@@ -132,9 +132,9 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'multiple pref labels of different languages' do
-    concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
-    RDFAPI.devour concept, 'skos:prefLabel', '"Bear"@en'
-    RDFAPI.devour concept, 'skos:prefLabel', '"Bär"@de'
+    concept = RdfApi.devour 'bear', 'a', 'skos:Concept'
+    RdfApi.devour concept, 'skos:prefLabel', '"Bear"@en'
+    RdfApi.devour concept, 'skos:prefLabel', '"Bär"@de'
 
     assert concept.save
     concept.reload
@@ -145,7 +145,7 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'labelings_by_text setter' do
-    concept = Concept::SKOS::Base.new
+    concept = Concept::Skos::Base.new
 
     concept.labelings_by_text = {
       Iqvoc::Concept.pref_labeling_class_name.to_relation_name => {
@@ -181,11 +181,11 @@ class ConceptTest < ActiveSupport::TestCase
     }
     concept = Iqvoc::Concept.base_class.create(form_data)
 
-    assert_equal ['lipsum'], labels_for.call(concept, Labeling::SKOS::PrefLabel)
+    assert_equal ['lipsum'], labels_for.call(concept, Labeling::Skos::PrefLabel)
     assert_equal 'lipsum',
         concept.labelings_by_text('labeling_skos_pref_labels', 'en')
     assert_equal ['foo', 'bar'],
-        labels_for.call(concept, Labeling::SKOS::AltLabel)
+        labels_for.call(concept, Labeling::Skos::AltLabel)
     assert_equal 'foo, bar',
         concept.labelings_by_text('labeling_skos_alt_labels', 'en')
 
@@ -197,24 +197,24 @@ class ConceptTest < ActiveSupport::TestCase
     }
     concept = Iqvoc::Concept.base_class.create(form_data)
 
-    assert_equal ['lipsum'], labels_for.call(concept, Labeling::SKOS::PrefLabel)
+    assert_equal ['lipsum'], labels_for.call(concept, Labeling::Skos::PrefLabel)
     assert_equal 'lipsum',
         concept.labelings_by_text('labeling_skos_pref_labels', 'en')
     assert_equal ['lorem', 'foo, bar', 'ipsum'],
-        labels_for.call(concept, Labeling::SKOS::AltLabel)
+        labels_for.call(concept, Labeling::Skos::AltLabel)
     assert_equal 'lorem, "foo, bar", ipsum',
         concept.labelings_by_text('labeling_skos_alt_labels', 'en')
   end
 
   test 'no narrower and broader concept relation' do
-    bear_concept = RDFAPI.devour 'bear', 'a', 'skos:Concept'
-    RDFAPI.devour bear_concept, 'skos:prefLabel', '"Bear"@en'
+    bear_concept = RdfApi.devour 'bear', 'a', 'skos:Concept'
+    RdfApi.devour bear_concept, 'skos:prefLabel', '"Bear"@en'
     bear_concept.save
 
-    concept = RDFAPI.devour 'forest', 'a', 'skos:Concept'
-    RDFAPI.devour concept, 'skos:prefLabel', '"Forest"@en'
-    RDFAPI.devour concept, 'skos:narrower', bear_concept
-    RDFAPI.devour concept, 'skos:broader', bear_concept
+    concept = RdfApi.devour 'forest', 'a', 'skos:Concept'
+    RdfApi.devour concept, 'skos:prefLabel', '"Forest"@en'
+    RdfApi.devour concept, 'skos:narrower', bear_concept
+    RdfApi.devour concept, 'skos:broader', bear_concept
     assert concept.save!
     assert_equal 1, concept.narrower_relations.count
     assert_equal 1, concept.broader_relations.count
@@ -227,25 +227,25 @@ class ConceptTest < ActiveSupport::TestCase
   end
 
   test 'concept self reference validation' do
-    wolf_concept = RDFAPI.devour 'wolf', 'a', 'skos:Concept'
-    RDFAPI.devour wolf_concept, 'skos:prefLabel', '"Wolf"@en'
+    wolf_concept = RdfApi.devour 'wolf', 'a', 'skos:Concept'
+    RdfApi.devour wolf_concept, 'skos:prefLabel', '"Wolf"@en'
     wolf_concept.save!
 
     assert wolf_concept.publishable?
 
-    RDFAPI.devour wolf_concept, 'skos:narrower', wolf_concept
+    RdfApi.devour wolf_concept, 'skos:narrower', wolf_concept
     refute wolf_concept.publishable?
     assert wolf_concept.errors.full_messages_for(:base).include? I18n.t('txt.models.concept.no_self_reference')
 
     wolf_concept.relations.delete_all
     assert wolf_concept.reload.publishable?
-    RDFAPI.devour wolf_concept, 'skos:broader', wolf_concept
+    RdfApi.devour wolf_concept, 'skos:broader', wolf_concept
     refute wolf_concept.publishable?
     assert wolf_concept.errors.full_messages_for(:base).include? I18n.t('txt.models.concept.no_self_reference')
 
     wolf_concept.relations.delete_all
     assert wolf_concept.reload.publishable?
-    RDFAPI.devour wolf_concept, 'skos:related', wolf_concept
+    RdfApi.devour wolf_concept, 'skos:related', wolf_concept
     refute wolf_concept.publishable?
     assert wolf_concept.errors.full_messages_for(:base).include? I18n.t('txt.models.concept.no_self_reference')
   end
@@ -255,7 +255,7 @@ class ConceptTest < ActiveSupport::TestCase
     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'
+      RdfApi.devour c, 'skos:prefLabel', '"Wolf"@en'
       c.save
     end
     refute wolf_concept.expired?

data/test/models/deep_cloning_test.rb

@@ -34,32 +34,32 @@ class DeepCloningTest < ActiveSupport::TestCase
     #   - Air Sport
     # + Sports
     @child_concept = Iqvoc::Concept.base_class.new.tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Child Concept"@en'
+      RdfApi.devour c, 'skos:prefLabel', '"Child Concept"@en'
       c.publish
       c.save
     end
 
     @root_concept1 = Iqvoc::Concept.base_class.new(top_term: true, origin: 'root_concept1').tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Root Concept 1"@en'
-      RDFAPI.devour c, 'skos:narrower', @child_concept
+      RdfApi.devour c, 'skos:prefLabel', '"Root Concept 1"@en'
+      RdfApi.devour c, 'skos:narrower', @child_concept
       c.publish
       c.save
     end
 
     @root_concept2 = Iqvoc::Concept.base_class.new(top_term: true, origin: 'root_concept2').tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Root Concept 2"@en'
+      RdfApi.devour c, 'skos:prefLabel', '"Root Concept 2"@en'
       c.publish
       c.save
     end
 
     @sub_collection = Iqvoc::Collection.base_class.new(origin: 'sub_collection').tap do |c|
-      RDFAPI.devour c, 'skos:prefLabel', '"Sub Collection"@en'
+      RdfApi.devour c, 'skos:prefLabel', '"Sub Collection"@en'
       c.publish
       c.save
     end
 
     @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:prefLabel', '"Root Collection"@en'
       c.publish
       c.save
     end

data/test/models/note_test.rb

@@ -19,11 +19,11 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 class NoteTest < ActiveSupport::TestCase
   test 'should parse turtle note annotations' do
     str = '[umt:source <aDisBMS>; umt:thsisn "00000001"; dct:date "2010-04-29"]'
-    concept = Concept::SKOS::Base.create(origin: '_00000001', published_at: Time.now)
-    concept.note_skos_change_notes << ::Note::SKOS::ChangeNote.new.from_annotation_list!(str)
+    concept = Concept::Skos::Base.create(origin: '_00000001', published_at: Time.now)
+    concept.note_skos_change_notes << ::Note::Skos::ChangeNote.new.from_annotation_list!(str)
 
-    assert_equal 1, Note::SKOS::ChangeNote.count, 1
-    assert_equal 3, Note::SKOS::ChangeNote.first.annotations.count, 3
+    assert_equal 1, Note::Skos::ChangeNote.count, 1
+    assert_equal 3, Note::Skos::ChangeNote.first.annotations.count, 3
     assert_equal 1, Note::Annotated::Base.where(namespace: 'umt',
         predicate: 'thsisn', value: '"00000001"').count
   end

data/test/models/rdf_sync_test.rb

@@ -36,7 +36,7 @@ class RdfSyncTest < ActiveSupport::TestCase
         view_context: @view_context)
 
     @concepts = 1.upto(15).map do |i|
-      Concept::SKOS::Base.new.publish.tap { |c| c.save }
+      Concept::Skos::Base.new.publish.tap { |c| c.save }
     end
 
     # HTTP request mocking