iqvoc_skosxl 2.9.1 → 2.11.4

data/test/controllers/rdf_rendering_test.rb

@@ -0,0 +1,19 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class RdfRenderingTest < ActionController::TestCase
+    setup do
+      @label = Iqvoc::XLLabel.base_class.create(
+          language: 'en', value: 'Forest', origin: 'forest', published_at: 3.days.ago)
+
+    end
+
+  test 'label representations' do
+    @controller = RdfController.new
+
+    get :show, params: { lang: 'en', id: @label.origin, format: 'ttl' }
+    assert_response 200
+    assert @response.body.include? '@prefix skosxl: <http://www.w3.org/2008/05/skos-xl#>.'
+    assert @response.body.include? ':forest a skosxl:Label'
+    assert @response.body.include? 'skosxl:literalForm "Forest"@en'
+  end
+end

data/test/controllers/routing_test.rb

@@ -10,7 +10,11 @@ class RoutingTest < ActionController::TestCase
   end
 
   test 'routing' do
-    get :show, lang: 'en', format: 'html', id: @label.origin
+    get :show, params: {
+      lang: 'en',
+      format: 'html',
+      id: @label.origin
+    }
     assert_response :success
   end
 end

data/test/integration/concept_label_language_test.rb

@@ -73,9 +73,7 @@ class ConceptLabelLanguageTest < ActionDispatch::IntegrationTest
     # create, then edit concept
     visit new_concept_path(lang: 'de', format: 'html')
     click_button 'Speichern'
-    visit dashboard_path(lang: 'de', format: 'html')
-    page.find('td a').click
-    page.click_link_or_button 'Bearbeitung fortsetzen'
+    page.click_link_or_button 'Bearbeiten'
 
     # NB: label languages do not match relation languages
     fill_in 'labeling_skosxl_pref_labels_en',

data/test/integration/dashboard_test.rb

@@ -26,7 +26,7 @@ class DashboardTest < ActionDispatch::IntegrationTest
     assert !@label.published?
     login('administrator')
 
-    visit dashboard_path(lang: 'de', format: 'html')
+    visit label_dashboard_path(lang: 'de', format: 'html')
     assert page.has_link?(@label.value.to_s), "Couldn't find Label link '#{@label.value.to_s}' in dashboards concepts + labels list"
     click_link_or_button(@label.value.to_s)
     assert_equal label_path(@label, lang: 'de', format: 'html'), current_path

data/test/integration/duplicate_label_test.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+
+# Copyright 2011-2017 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 DuplicateLabelTest < ActionDispatch::IntegrationTest
+  setup do
+    @label = Iqvoc::XLLabel.base_class.create(
+      language: 'de', value: 'Wald', published_at: 3.days.ago)
+  end
+
+  test 'Duplicate a label' do
+    assert @label.published?
+    login('administrator')
+
+    visit label_path(@label, lang: 'de', format: 'html')
+    assert page.has_link?('Duplizieren')
+    click_link_or_button('Duplizieren')
+    assert_equal label_duplicate_path(@label, lang: 'de', format: 'html'), current_path
+
+    click_link_or_button('Speichern')
+
+    assert !page.has_button?('Neue Version erstellen')
+    assert !page.has_link?('Duplizieren')
+    assert page.has_button?('Veröffentlichen')
+    assert page.has_content? 'Das Label wurde aktualisiert.'
+    assert page.has_content? 'Wald [Kopie]'
+
+    # check initial created-ChangeNote
+    change_note_relation_name = Iqvoc::change_note_class_name.to_relation_name
+    within("\##{change_note_relation_name}") do
+      assert page.has_css?('.translation', count: 1)
+      assert page.has_content? 'Initiale Version'
+      assert page.has_content? 'dct:created'
+    end
+
+  end
+
+end

data/test/integration/edit_labels_test.rb

@@ -16,13 +16,13 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
-class EditConceptsTest < ActionDispatch::IntegrationTest
+class EditLabelsTest < ActionDispatch::IntegrationTest
   setup do
     @label = Iqvoc::XLLabel.base_class.create(
       language: 'en', value: 'Forest', published_at: 3.days.ago)
   end
 
-  test 'Create a new concept version' do
+  test 'Create a new label version' do
     assert @label.published?
     login('administrator')
 

data/test/integration/label_creation_test.rb

@@ -68,4 +68,12 @@ class LabelCreationTest < ActionDispatch::IntegrationTest
     click_link_or_button 'Konsistenz prüfen'
     assert page.has_content? 'Instanz ist inkonsistent.'
   end
+
+  test 'inconsistent label that is sent for review' do
+    visit new_label_path(lang: 'de', language: 'de')
+    fill_in 'Vorlageform', with: ''
+    click_link_or_button 'Speichern'
+    click_link_or_button 'Zur Freigabe vorlegen'
+    assert page.has_content? 'Instanz ist inkonsistent.'
+  end
 end

data/test/integration/label_relation_test.rb

@@ -61,7 +61,7 @@ class LabelsRelationTest < ActionDispatch::IntegrationTest
     visit label_path(@dog_en, lang: 'en', format: 'html')
     click_link_or_button('Create new version')
     assert_equal edit_label_path(@dog_en, lang: 'en', format: 'html'), current_path
-    assert page.has_content? 'Instance copy has been created and locked.'
+    assert page.has_content? 'Instance copy has been created.'
 
     # add translation dog_en => dog_de
     fill_in 'label_relation_skosxl_translations', with: 'dog_de'
@@ -101,7 +101,7 @@ class LabelsRelationTest < ActionDispatch::IntegrationTest
     visit label_path(@dog_en, lang: 'en', format: 'html')
     click_link_or_button('Create new version')
     assert_equal edit_label_path(@dog_en, lang: 'en', format: 'html'), current_path
-    assert page.has_content? 'Instance copy has been created and locked.'
+    assert page.has_content? 'Instance copy has been created.'
 
     # add translation dog_en => dog_de
     fill_in 'label_relation_skosxl_unidirectional_relations', with: 'dog_de'

data/test/integration/labels_order_test.rb

@@ -17,8 +17,8 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class LabelsOrderTest < ActionDispatch::IntegrationTest
-  test 'label order is not case-sensitive' do
-    names = ['aaa', 'bbb', 'abc', 'ABC']
+  test 'label order' do
+    names = ['haltestelle', 'test12', 'test1', 'test']
     lang = 'en'
     # create a few labels
     names.each_with_index do |name, index|
@@ -35,9 +35,9 @@ class LabelsOrderTest < ActionDispatch::IntegrationTest
     data = JSON.parse(@response.body)
 
     assert_response :success
-    assert_equal 'aaa (en)', data[0]['name'] # hacky test fix "(en)" will be injected by javascript widget
-    assert_equal 'abc (en)', data[1]['name']
-    assert_equal 'ABC (en)', data[2]['name'] # XXX: do we care about order of "ABC" vs. "abc"?
-    assert_equal 'bbb (en)', data[3]['name']
+    assert_equal 'test (en)', data[0]['name'] # hacky test fix "(en)" will be injected by javascript widget
+    assert_equal 'test1 (en)', data[1]['name']
+    assert_equal 'test12 (en)', data[2]['name'] # XXX: do we care about order of "ABC" vs. "abc"?
+    assert_equal 'haltestelle (en)', data[3]['name']
   end
 end

data/test/integration/search_test.rb

@@ -0,0 +1,117 @@
+# encoding: UTF-8
+
+# Copyright 2011-2017 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 SearchTest < ActionDispatch::IntegrationTest
+
+  test 'filtering concepts by change note date' do
+    login 'administrator'
+
+    visit new_label_path(lang: 'en', format: 'html', published: 0)
+    fill_in 'label_value', with: 'Water'
+    click_button 'Save'
+    click_link_or_button 'Publish'
+
+    visit new_concept_path(lang: 'en', format: 'html', published: 0)
+    fill_in 'labeling_skosxl_pref_labels_en', with: Iqvoc::XLLabel.base_class.first.origin
+    click_button 'Save'
+    click_link_or_button 'Publish'
+
+    visit new_label_path(lang: 'en', format: 'html', published: 0)
+    fill_in 'label_value', with: 'Air'
+    click_button 'Save'
+    click_link_or_button 'Publish'
+
+    visit new_concept_path(lang: 'en', format: 'html', published: 0)
+    fill_in 'labeling_skosxl_pref_labels_en', with: Iqvoc::XLLabel.base_class.second.origin
+    click_button 'Save'
+    click_link_or_button 'Publish'
+
+    Note::Annotated::Base.where(predicate: "created").second.update(value: (DateTime.now - 10.days).to_s)
+
+    visit search_path(lang: 'en', format: 'html')
+    find('#t').select 'Labels'
+    find('#change_note_type').select 'creation date'
+    fill_in 'change_note_date_from', with: Date.today
+    click_button('Search')
+
+    refute page.find('.search-results').has_content?('Water')
+    assert page.find('.search-results').has_content?('Air')
+  end
+
+  test 'filtering xl-labels by change note date' do
+    apple_label = Iqvoc::XLLabel.base_class.create!(language: 'de', value: 'Apple', origin: 'apple', published_at: Time.now)
+    apple_label.note_skos_change_notes.create!(language: 'de').tap do |note|
+      note.annotations.create!(namespace: 'dct', predicate: 'creator', value: 'Arnulf Beckenbauer')
+      note.annotations.create!(namespace: 'dct', predicate: 'created', value: '2017-06-01')
+    end
+
+    banana_label = Iqvoc::XLLabel.base_class.create!(language: 'de', value: 'Banana', origin: 'banana', published_at: Time.now)
+    banana_label.note_skos_change_notes.create!(language: 'de').tap do |note|
+      note.annotations.create!(namespace: 'dct', predicate: 'creator', value: 'Arnulf Beckenbauer')
+      note.annotations.create!(namespace: 'dct', predicate: 'modified', value: '2017-06-10')
+    end
+
+    peach_label = Iqvoc::XLLabel.base_class.create!(language: 'de', value: 'Peach', origin: 'peach', published_at: Time.now)
+    peach_label.note_skos_change_notes.create!(language: 'de').tap do |note|
+      note.annotations.create!(namespace: 'dct', predicate: 'creator', value: 'Arnulf Beckenbauer')
+      note.annotations.create!(namespace: 'dct', predicate: 'created', value: '2017-06-11')
+    end
+
+    visit search_path(lang: 'en', format: 'html')
+    find('#t').select 'XL Labels'
+
+    # should find Apple and Banana labels
+    fill_in 'change_note_date_from', with: '2017-06-01'
+    fill_in 'change_note_date_to', with: '2017-06-10'
+    click_button('Search')
+    assert_equal 2, page.find('ul.search-results').all('li').count
+    assert page.find('.search-results').has_content?('Apple')
+    assert page.find('.search-results').has_content?('Banana')
+    refute page.find('.search-results').has_content?('Peach')
+
+    # should find Apple label
+    fill_in 'change_note_date_from', with: '2017-06-01'
+    fill_in 'change_note_date_to', with: '2017-06-02'
+    click_button('Search')
+    page.has_content? 'Search results (1)'
+    assert_equal 1, page.find('ul.search-results').all('li').count
+    assert page.find('.search-results').has_content?('Apple')
+    refute page.find('.search-results').has_content?('Banana')
+    refute page.find('.search-results').has_content?('Peach')
+
+    # should find Banana label
+    fill_in 'change_note_date_from', with: '2017-06-10'
+    fill_in 'change_note_date_to', with: '2017-06-10'
+    click_button('Search')
+    assert_equal 1, page.find('ul.search-results').all('li').count
+    assert page.find('.search-results').has_content?('Banana')
+    refute page.find('.search-results').has_content?('Apple')
+    refute page.find('.search-results').has_content?('Peach')
+
+    # should find Apple & Peach label (the only ones with created change note)
+    fill_in 'change_note_date_from', with: '2017-06-01'
+    fill_in 'change_note_date_to', with: '2017-07-01'
+    find('#change_note_type').select 'creation date'
+    click_button('Search')
+    assert_equal 2, page.find('ul.search-results').all('li').count
+    assert page.find('.search-results').has_content?('Apple')
+    assert page.find('.search-results').has_content?('Peach')
+    refute page.find('.search-results').has_content?('Banana')
+  end
+
+end

data/test/integration_test_helper.rb

@@ -16,10 +16,10 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'capybara/rails'
 require 'capybara/dsl'
-require 'capybara/poltergeist'
+require 'capybara/cuprite'
 require Iqvoc.root.join('test', 'authentication')
 
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :cuprite
 
 module ActionDispatch
   class IntegrationTest

data/test/models/concept_test.rb

@@ -58,6 +58,18 @@ class ConceptTest < ActiveSupport::TestCase
     assert alt_label.publishable?
   end
 
+  test 'additional unpublished label revision do not prevent published' do
+    dog = RDFAPI.devour 'Dog', 'a', 'skos:Concept'
+    dog.pref_labels << Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Dog', published_at: 3.days.ago)
+    dog.alt_labels << Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Hound', published_at: nil)
+
+    assert dog.save
+    assert dog.publishable?
+    assert dog.publish
+  end
+
   test 'concepts pref label language change' do
     dog = RDFAPI.devour 'Dog', 'a', 'skos:Concept'
     refute dog.publishable?

data/test/models/skos_importer_test.rb

@@ -6,7 +6,7 @@ class SkosImporterTest < ActiveSupport::TestCase
   TEST_DATA = File.open(File.expand_path('../../fixtures/hobbies.nt', __FILE__))
 
   setup do
-    Iqvoc.rdf_namespaces['test'] = 'http://foo.bar/xl#'
+    Iqvoc.rdf_namespaces[:test] = 'http://foo.bar/xl#'
 
     class TestRelation < Label::Relation::SKOSXL::Base
       self.rdf_namespace = 'test'

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