iqvoc_skosxl 2.3.1 → 2.5.0

data/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-Iqvoc::SKOSXL::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!

data/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/config/initializers/cookies_serializer.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]

data/config/initializers/inflections.rb

@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end

data/config/initializers/iqvoc.rb

@@ -2,6 +2,52 @@ silence_warnings do
   Iqvoc::Label = nil
 end
 
-Iqvoc.searchable_class_names = { 'Labeling::SKOSXL::Base' => 'labels',
-  'Labeling::SKOSXL::PrefLabel' => 'pref_labels',
-  'Labeling::SKOSXL::AltLabel' => 'alt_labels' }
+Iqvoc.searchable_class_names = {
+    'Labeling::SKOSXL::Base' => 'labels',
+    'Labeling::SKOSXL::PrefLabel' => 'pref_labels',
+    'Labeling::SKOSXL::AltLabel' => 'alt_labels'
+}
+
+module SkosXlExporterExtensions
+  extend ActiveSupport::Concern
+  include LabelsHelper
+
+  def add_skos_xl_labels(document)
+    @logger.info 'Exporting xl labels...'
+
+    offset = 0
+    while true
+      labels = Iqvoc::XLLabel.base_class.published.published.order('id').limit(100).offset(offset)
+      limit = labels.size < 100 ? labels.size : 100
+      break if labels.size == 0
+
+      labels.each do |label|
+        render_label_rdf(document, label)
+      end
+
+      @logger.info "Labels #{offset+1}-#{offset+limit} exported."
+      offset += labels.size # Size is important!
+    end
+
+    @logger.info "Finished exporting xl labels (#{offset} labels exported)."
+  end
+end
+
+module Iqvoc
+  class SkosExporter
+    include SkosXlExporterExtensions
+  end
+end
+
+ActiveSupport.on_load :rdf_export_before_save do
+  add_skos_xl_labels(@document)
+end
+
+ActiveSupport.on_load :skos_importer do
+  Iqvoc::SkosImporter.prepend_first_level_object_classes(Iqvoc::XLLabel.base_class)
+  Iqvoc::SkosImporter.second_level_object_classes +=
+    [Label::SKOSXL::Properties::LiteralForm] +
+    Iqvoc::XLLabel.note_classes +
+    Iqvoc::XLLabel.relation_classes +
+    Iqvoc::XLLabel.additional_association_classes.keys
+end

data/config/initializers/mime_types.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf

data/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 if Iqvoc::SKOSXL.const_defined?(:Application)
-  Iqvoc::SKOSXL::Application.config.session_store :cookie_store, :key => '_iqvoc_skosxl_session'
+  Iqvoc::SKOSXL::Application.config.session_store :cookie_store, key: '_iqvoc_skosxl_session'
 end
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end

data/config/routes.rb

@@ -1,10 +1,18 @@
-Iqvoc.localized_routes << lambda do |routing|
-  routing.resources :labels
+Rails.application.routes.draw do
+  scope ':lang', constraints: Iqvoc.routing_constraint do
+    resources :labels
 
-  routing.post "labels/versions/:origin/branch(.:format)"      => "labels/versions#branch",    :as => "label_versions_branch"
-  routing.post "labels/versions/:origin/merge(.:format)"       => "labels/versions#merge",     :as => "label_versions_merge"
-  routing.post "labels/versions/:origin/lock(.:format)"        => "labels/versions#lock",      :as => "label_versions_lock"
-  routing.post "labels/versions/:origin/unlock(.:format)"      => "labels/versions#unlock",    :as => "label_versions_unlock"
-  routing.post "labels/versions/:origin/to_review(.:format)"   => "labels/versions#to_review", :as => "label_versions_to_review"
-  routing.get "labels/versions/:origin/consistency_check(.:format)" => "labels/versions#consistency_check", :as => "label_versions_consistency_check"
+    post 'labels/versions/:origin/branch' => 'labels/versions#branch',
+        :as => 'label_versions_branch'
+    post 'labels/versions/:origin/merge' => 'labels/versions#merge',
+        :as => 'label_versions_merge'
+    post 'labels/versions/:origin/lock' => 'labels/versions#lock',
+        :as => 'label_versions_lock'
+    post 'labels/versions/:origin/unlock' => 'labels/versions#unlock',
+        :as => 'label_versions_unlock'
+    post 'labels/versions/:origin/to_review' => 'labels/versions#to_review',
+        :as => 'label_versions_to_review'
+    get 'labels/versions/:origin/consistency_check' => 'labels/versions#consistency_check',
+        :as => 'label_versions_consistency_check'
+  end
 end

data/config/secrets.yml

@@ -0,0 +1,11 @@
+development:
+  secret_key_base: development
+
+test:
+  secret_key_base: test
+
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
+heroku:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/db/migrate/20110408121540_extend_label.rb

@@ -1,14 +1,13 @@
 class ExtendLabel < ActiveRecord::Migration
-
   FIELDS = [
-    {"rev" => {:type => :integer, :options => {:default => 1}}},
-    {"published_version_id" => {:type => :integer}},
-    {"published_at" => {:type => :date}},
-    {"locked_by" => {:type => :integer}},
-    {"expired_at" => {:type => :date}},
-    {"follow_up" => {:type => :date}},
-    {"to_review" => {:type => :boolean}},
-    {"rdf_updated_at" => {:type => :date}}
+    {'rev' => {type: :integer, options: {default: 1}}},
+    {'published_version_id' => {type: :integer}},
+    {'published_at' => {type: :date}},
+    {'locked_by' => {type: :integer}},
+    {'expired_at' => {type: :date}},
+    {'follow_up' => {type: :date}},
+    {'to_review' => {type: :boolean}},
+    {'rdf_updated_at' => {type: :date}}
   ]
 
   def self.up
@@ -20,8 +19,7 @@ class ExtendLabel < ActiveRecord::Migration
       end
     end
 
-    add_index :labels, "published_version_id", :name => "ix_labels_on_published_v" unless index_exists?(:labels, "published_version_id", :name => "ix_labels_on_published_v")
-
+    add_index :labels, 'published_version_id', name: 'ix_labels_on_published_v' unless index_exists?(:labels, 'published_version_id', name: 'ix_labels_on_published_v')
   end
 
   def self.down
@@ -33,5 +31,4 @@ class ExtendLabel < ActiveRecord::Migration
       end
     end
   end
-
 end

data/db/migrate/20110408123644_add_label_relations.rb

@@ -1,24 +1,22 @@
 class AddLabelRelations < ActiveRecord::Migration
-
   def self.up
-    unless table_exists?("label_relations")
-      create_table "label_relations", :force => true do |t|
-        t.string   "type"
-        t.integer  "domain_id"
-        t.integer  "range_id"
-        t.datetime "created_at"
-        t.datetime "updated_at"
+    unless table_exists?('label_relations')
+      create_table 'label_relations', force: true do |t|
+        t.string   'type'
+        t.integer  'domain_id'
+        t.integer  'range_id'
+        t.datetime 'created_at'
+        t.datetime 'updated_at'
       end
 
-      add_index "label_relations", ["domain_id", "range_id", "type"], :name => "ix_label_rel_dom_rng_type"
-      add_index "label_relations", ["type"], :name => "ix_label_relations_on_type"
+      add_index 'label_relations', ['domain_id', 'range_id', 'type'], name: 'ix_label_rel_dom_rng_type'
+      add_index 'label_relations', ['type'], name: 'ix_label_relations_on_type'
     end
   end
 
   def self.down
-    if table_exists?("label_relations")
-      drop_table("label_relations")
+    if table_exists?('label_relations')
+      drop_table('label_relations')
     end
   end
-
 end

data/iqvoc_skosxl.gemspec

@@ -1,22 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "iqvoc/skosxl/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'iqvoc/skosxl/version'
 
 Gem::Specification.new do |s|
-  s.name        = "iqvoc_skosxl"
+  s.name        = 'iqvoc_skosxl'
   s.version     = Iqvoc::SKOSXL::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Robert Glaser", "Till Schulte-Coerne", "Frederik Dohr"]
-  s.email       = ["till.schulte-coerne@innoq.com"]
-  s.homepage    = "http://innoq.com"
-  s.summary     = "iQvoc SKOS-XL extension"
-  s.description = ""
+  s.authors     = ['Robert Glaser', 'Till Schulte-Coerne', 'Frederik Dohr']
+  s.email       = ['till.schulte-coerne@innoq.com']
+  s.homepage    = 'http://iqvoc.net'
+  s.summary     = 'iQvoc SKOS-XL extension'
+  s.license     = 'Apache License 2.0'
+  s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
 
-  s.add_dependency "iqvoc", "~> 4.3.0"
-  s.add_dependency "bundler"
+  s.add_dependency 'iqvoc', '>= 4.5.0', '~> 4.6'
+  s.add_development_dependency 'bundler', '~> 1.6'
 
-  s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) + Dir.glob("{app,config,db,public,lib,test}/**/*")
-  s.test_files = Dir.glob("{test}/**/*")
-  s.executables = Dir.glob("{bin}/**/*")
-  s.require_paths = ["lib"]
+  s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) +
+      Dir.glob('{app,config,db,public,lib,test}/**/*')
+  s.test_files = s.files.grep(%r{^test/})
+  s.require_paths = ['lib']
 end

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "2.3.1"
+    VERSION = '2.5.0'
   end
 end

data/lib/iqvoc/xllabel.rb

@@ -1,7 +1,5 @@
 module Iqvoc
-
   module XLLabel # These are the settings when using SKOS-XL
-
     Iqvoc.first_level_class_configuration_modules << self
 
     mattr_accessor :base_class_name,
@@ -20,7 +18,7 @@ module Iqvoc
 
     self.additional_association_class_names = {}
 
-    self.view_sections = ["main", "concepts", "relations", "notes"]
+    self.view_sections = ['main', 'concepts', 'relations', 'notes']
 
     # Set this to true if you're having a migration which extends the labels table
     # and you want to be able to edit these fields.
@@ -54,7 +52,5 @@ module Iqvoc
         hash[class_name.constantize] = additional_association_class_names[class_name]
       end
     end
-
   end
-
 end

data/lib/iqvoc_skosxl.rb

@@ -1,28 +1,29 @@
 module IqvocSKOSXL
-
-  require File.join(File.dirname(__FILE__), '../config/engine') unless Iqvoc.const_defined?(:SKOSXL) && Iqvoc::SKOSXL.const_defined?(:Application)
+  unless Iqvoc.const_defined?(:SKOSXL) && Iqvoc::SKOSXL.const_defined?(:Application)
+    require File.join(File.dirname(__FILE__), '../config/engine')
+  end
 
   ActiveSupport.on_load(:after_iqvoc_config) do
     require 'iqvoc'
 
     Iqvoc.config do |cfg|
-      prefix = "languages.further_labelings."
+      prefix = 'languages.further_labelings.'
       cfg.deregister_setting("#{prefix}Labeling::SKOS::AltLabel") # iQvoc core default
       cfg.register_settings({
-        "title" => "iQvoc SKOS-XL",
-        "#{prefix}Labeling::SKOSXL::AltLabel" => ["en", "de"]
+        'title' => 'iQvoc SKOS-XL',
+        "#{prefix}Labeling::SKOSXL::AltLabel" => ['en', 'de']
       })
     end
 
-    Iqvoc.rdf_namespaces[:skosxl] = "http://www.w3.org/2008/05/skos-xl#" unless Iqvoc.rdf_namespaces[:skosxl]
-
-    Iqvoc.default_rdf_namespace_helper_methods << :iqvoc_skosxl_default_rdf_namespaces
-
-    Iqvoc::Concept.include_module_names << "Concept::SKOSXL::Extension"
+    unless Iqvoc.rdf_namespaces[:skosxl]
+      Iqvoc.rdf_namespaces[:skosxl] = 'http://www.w3.org/2008/05/skos-xl#'
+    end
 
+    Iqvoc::Concept.include_module_names << 'Concept::SKOSXL::Extension'
     Iqvoc::Concept.pref_labeling_class_name = 'Labeling::SKOSXL::PrefLabel'
 
-    #   TODO     Iqvoc.searchable_class_names = Iqvoc::Concept.labeling_class_names.keys + Iqvoc::Concept.note_class_names
+    # TODO
+    # Iqvoc.searchable_class_names = Iqvoc::Concept.labeling_class_names.keys +
+    #    Iqvoc::Concept.note_class_names
   end
-
 end

data/test/{functional → controllers}/routing_test.rb

@@ -4,16 +4,14 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 require 'iqvoc/rdfapi' # XXX: only required with Zeus
 
 class RoutingTest < ActionController::TestCase
-
   setup do
     @controller = LabelsController.new
-    @label = Iqvoc::XLLabel.base_class.create :value => "foo",
-        :language => "en", :published_at => Time.now
+    @label = Iqvoc::XLLabel.base_class.create value: 'foo',
+        language: 'en', published_at: Time.now
   end
 
-  test "routing" do
-    get :show, :lang => "en", :format => "html", :id => @label.origin
+  test 'routing' do
+    get :show, lang: 'en', format: 'html', id: @label.origin
     assert_response :success
   end
-
 end

data/test/fixtures/hobbies.nt

@@ -0,0 +1,11 @@
+<http://hobbies.com/computer_programming> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
+<http://hobbies.com/computer_programming> <http://www.w3.org/2004/02/skos/core#prefLabel> "Computer programming"@en .
+<http://hobbies.com/computer_programming> <http://www.w3.org/2008/05/skos-xl#prefLabel> <http://hobbies.com/computer_programming-xl-preflabel-en> .
+<http://hobbies.com/computer_programming> <http://www.w3.org/2008/05/skos-xl#altLabel> <http://hobbies.com/computer_programming-xl-altlabel-en> .
+<http://hobbies.com/computer_programming-xl-preflabel-en> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://hobbies.com/computer_programming-xl-preflabel-en> <http://www.w3.org/2008/05/skos-xl#literalForm> "Computer programming (used as xl:prefLabel)"@en .
+<http://hobbies.com/computer_programming-xl-preflabel-en> <http://www.w3.org/2004/02/skos/core#definition> "Bla bla bla"@en .
+<http://hobbies.com/computer_programming-xl-altlabel-en> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://hobbies.com/computer_programming-xl-altlabel-en> <http://www.w3.org/2008/05/skos-xl#literalForm> "Computer programming (used as xl:altLabel)"@en .
+<http://hobbies.com/computer_programming-xl-altlabel-en> <http://www.w3.org/2004/02/skos/core#definition> "Yadda yadda"@en .
+<http://hobbies.com/computer_programming-xl-altlabel-en> <http://foo.bar/xl#test-relation> <http://hobbies.com/computer_programming-xl-preflabel-en> .

data/test/integration/concept_label_language_test.rb

@@ -14,82 +14,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require Iqvoc::Engine.root.join('test', 'integration_test_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class ConceptLabelLanguageTest < ActionDispatch::IntegrationTest
-
   setup do
     # create a few XL labels
     @labels = {}
     {
-      "English" => "en",
-      "Deutsch" => "de"
+      'English' => 'en',
+      'Deutsch' => 'de'
     }.each { |name, lang|
-      @labels[name] = FactoryGirl.create(:xllabel, :origin => "_#{name}",
-          :language => lang, :value => name, :published_at => Time.now)
+      @labels[name] = Iqvoc::XLLabel.base_class.create(
+        origin: "_#{name}", language: lang, value: name, published_at: Time.now)
     }
   end
 
-  test "invalid alt label languages are rejected" do
-    login("administrator")
+  test 'invalid alt label languages are rejected' do
+    login('administrator')
 
-    visit new_concept_path(:lang => "de", :format => "html")
+    visit new_concept_path(lang: 'de', format: 'html')
     # NB: label language does not match relation language
-    fill_in "labeling_skosxl_alt_labels_en",
-        :with => "#{@labels["Deutsch"].origin},"
-    click_button "Speichern"
+    fill_in 'labeling_skosxl_alt_labels_en',
+        with: "#{@labels['Deutsch'].origin},"
+    click_button 'Speichern'
 
-    assert page.has_css?(".alert-error")
-    assert page.has_css?("#new_concept")
+    assert page.has_css?('.alert-danger')
+    assert page.has_css?('#new_concept')
     assert page.source.include?( # XXX: page.has_content? didn't work
-        I18n.t("txt.controllers.versioned_concept.label_error") % "Deutsch")
+        I18n.t('txt.controllers.versioned_concept.label_error') % 'Deutsch')
 
     # ensure concept was not saved
-    visit dashboard_path(:lang => "de", :format => "html")
-    assert page.has_no_css?("td")
+    visit dashboard_path(lang: 'de', format: 'html')
+    assert page.has_no_css?('td')
   end
 
-  test "invalid pref label languages are rejected during creation" do
-    login("administrator")
+  test 'invalid pref label languages are rejected during creation' do
+    login('administrator')
 
-    visit new_concept_path(:lang => "de", :format => "html")
+    visit new_concept_path(lang: 'de', format: 'html')
     # NB: label language does not match relation language
-    fill_in "labeling_skosxl_pref_labels_en",
-        :with => "#{@labels["Deutsch"].origin},"
-    click_button "Speichern"
+    fill_in 'labeling_skosxl_pref_labels_en',
+        with: "#{@labels['Deutsch'].origin},"
+    click_button 'Speichern'
 
-    assert page.has_css?(".alert-error")
-    assert page.has_css?("#new_concept")
+    assert page.has_css?('.alert-danger')
+    assert page.has_css?('#new_concept')
     assert page.source.include?( # XXX: page.has_content? didn't work
-        I18n.t("txt.controllers.versioned_concept.label_error") % "Deutsch")
+        I18n.t('txt.controllers.versioned_concept.label_error') % 'Deutsch')
 
     # ensure concept was not saved
-    visit dashboard_path(:lang => "de", :format => "html")
-    assert page.has_no_css?("td")
+    visit dashboard_path(lang: 'de', format: 'html')
+    assert page.has_no_css?('td')
   end
 
-  test "invalid label languages are rejected during update" do
-    login("administrator")
+  test 'invalid label languages are rejected during update' do
+    login('administrator')
 
     # 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 "In Bearbeitung versetzen"
+    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 'In Bearbeitung versetzen'
 
     # NB: label languages do not match relation languages
-    fill_in "labeling_skosxl_pref_labels_en",
-        :with => "#{@labels["Deutsch"].origin},"
-    fill_in "labeling_skosxl_alt_labels_de",
-        :with => "#{@labels["English"].origin},"
-    click_button "Speichern"
-
-    assert page.has_css?(".alert-error")
-    assert page.has_css?("#edit_concept")
+    fill_in 'labeling_skosxl_pref_labels_en',
+        with: "#{@labels['Deutsch'].origin},"
+    fill_in 'labeling_skosxl_alt_labels_de',
+        with: "#{@labels['English'].origin},"
+    click_button 'Speichern'
+
+    assert page.has_css?('.alert-danger')
+    assert page.has_css?('#edit_concept')
     assert page.source.include?( # XXX: page.has_content? didn't work
-        I18n.t("txt.controllers.versioned_concept.label_error") % "English")
+        I18n.t('txt.controllers.versioned_concept.label_error') % 'English')
     assert page.source.include?( # XXX: page.has_content? didn't work
-        I18n.t("txt.controllers.versioned_concept.label_error") % "Deutsch")
+        I18n.t('txt.controllers.versioned_concept.label_error') % 'Deutsch')
   end
 end

data/test/integration/dashboard_test.rb

@@ -14,31 +14,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'test_helper'
-require Iqvoc::Engine.root.join('test', 'integration_test_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class DashboardTest < ActionDispatch::IntegrationTest
-
   setup do
-    @label = FactoryGirl.create(:xllabel, :published_at => nil)
+    @label = Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Forest', published_at: nil)
   end
 
-  test "labels appearing in dashboard" do
+  test 'labels appearing in dashboard' do
     assert !@label.published?
     login('administrator')
 
-    visit dashboard_path(:lang => 'de', :format => 'html')
+    visit 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
+    assert_equal label_path(@label, lang: 'de', format: 'html'), current_path
   end
 
-  test "new label link in dashboard" do
+  test 'new label link in dashboard' do
     login('administrator')
 
-    visit dashboard_path(:lang => 'de', :format => 'html')
-    click_link_or_button("de")
-    assert_equal new_label_path(:lang => 'de', :format => 'html'), current_path
+    visit dashboard_path(lang: 'de', format: 'html')
+    click_link_or_button('de')
+    assert_equal new_label_path(lang: 'de', format: 'html'), current_path
   end
-
 end

data/test/integration/edit_labels_test.rb

@@ -14,28 +14,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'test_helper'
-require Iqvoc::Engine.root.join('test', 'integration_test_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class EditConceptsTest < ActionDispatch::IntegrationTest
-
   setup do
-    @label = FactoryGirl.create(:xllabel)
+    @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 concept version' do
     assert @label.published?
     login('administrator')
 
-    visit label_path(@label, :lang => 'de', :format => 'html')
-    assert page.has_button?("Neue Version erstellen"), "Button 'Neue Version erstellen' is missing on labels#show"
-    click_link_or_button("Neue Version erstellen")
-    assert_equal edit_label_path(@label, :lang => 'de', :format => 'html'), current_path
+    visit label_path(@label, lang: 'de', format: 'html')
+    assert page.has_button?('Neue Version erstellen'), "Button 'Neue Version erstellen' is missing on labels#show"
+    click_link_or_button('Neue Version erstellen')
+    assert_equal edit_label_path(@label, lang: 'de', format: 'html'), current_path
 
-    visit label_path(@label, :lang => 'de', :format => 'html')
-    assert !page.has_button?("Neue Version erstellen"), "Button 'Neue Version erstellen' although there already is a new version"
-    assert page.has_link?("Vorschau der Version in Bearbeitung"), "Link 'Vorschau der Version in Bearbeitung' is missing"
-    click_link_or_button("Vorschau der Version in Bearbeitung")
+    visit label_path(@label, lang: 'de', format: 'html')
+    assert !page.has_button?('Neue Version erstellen'), "Button 'Neue Version erstellen' although there already is a new version"
+    assert page.has_link?('Vorschau der Version in Bearbeitung'), "Link 'Vorschau der Version in Bearbeitung' is missing"
+    click_link_or_button('Vorschau der Version in Bearbeitung')
   end
-
 end