iqvoc 4.12.1 → 4.13.0

data/test/controllers/hierarchy_test.rb

@@ -46,7 +46,7 @@ boot:
     @concepts.merge! create_hierarchy(additional_concepts, @rel_class, {})
     @concepts['boot'].update_attribute('top_term', true)
 
-    get :index, { lang: 'en', format: 'ttl' }
+    get :index, params: { lang: 'en', format: 'ttl' }
     assert_response 200
     %w(root foo bar alpha bravo uno dos boot zoo car).each do |id|
       assert @response.body.include?(":#{id} a skos:Concept;"), "#{id} missing"
@@ -57,7 +57,7 @@ boot:
     end
 
     Iqvoc.config['performance.unbounded_hierarchy'] = true
-    get :index, { lang: 'en', format: 'ttl' }
+    get :index, params: { lang: 'en', format: 'ttl' }
     assert_response 200
 
     %w(root foo bar alpha bravo uno dos lorem ipsum boot zoo car).each do |id|
@@ -66,7 +66,7 @@ boot:
   end
 
   test 'permission handling' do
-    get :show, lang: 'en', format: 'html', root: 'root'
+    get :show, params: { lang: 'en', format: 'html', root: 'root' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Root'], entries
     entries = get_entries('ul.concept-hierarchy > li > ul > li')
@@ -80,7 +80,7 @@ boot:
 
     @concepts['bar'].update_attribute('published_at', nil)
 
-    get :show, lang: 'en', format: 'html', root: 'root'
+    get :show, params: { lang: 'en', format: 'html', root: 'root' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Root'], entries
     entries = get_entries('ul.concept-hierarchy > li > ul > li')
@@ -90,31 +90,28 @@ boot:
   end
 
   test 'caching' do
-    params = { lang: 'en', format: 'ttl', root: 'root' }
-
     # ETag generation & cache control
-
-    get :show, params
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     etag = @response.headers['ETag']
     assert_response 200
     assert etag
     assert @response.headers['Cache-Control'].include?('public')
 
-    get :show, params
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
     assert_equal etag, @response.headers['ETag']
 
-    get :show, params.merge(published: '0')
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root', published: 0 }
     assert_response 200
     assert @response.headers['Cache-Control'].include?('private')
 
     # ETag keyed on params
 
-    get :show, params.merge(depth: 4)
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' , depth: 4 }
     assert_response 200
     assert_not_equal etag, @response.headers['ETag']
 
-    get :show, params.merge(published: 0)
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root', published: 0 }
     assert_response 200
     assert_not_equal etag, @response.headers['ETag']
 
@@ -125,13 +122,13 @@ boot:
 
     dummy = create_concept('dummy', 'Dummy', 'en', false)
     dummy.update_attribute('updated_at', t1)
-    get :show, params
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
     assert_equal etag, @response.headers['ETag']
 
     dummy.update_attribute('published_at', t0)
     dummy.update_attribute('updated_at', t1)
-    get :show, params
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
     new_etag = @response.headers['ETag']
     assert_not_equal etag, new_etag
@@ -139,19 +136,19 @@ boot:
     # conditional caching
 
     @request.env['HTTP_IF_NONE_MATCH'] = new_etag
-    get :show, params
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 304
     assert_equal 0, @response.body.strip.length
 
     @request.env['HTTP_IF_NONE_MATCH'] = 'dummy'
-    get :show, params
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
   end
 
   test 'RDF representations' do
     # Turtle
 
-    get :show, lang: 'en', format: 'ttl', root: 'root'
+    get :show, params: { lang: 'en', format: 'ttl', root: 'root' }
     assert_response 200
     assert_equal @response.content_type, 'text/turtle'
     assert @response.body =~ /:root[^\.]+skos:topConceptOf[^\.]+:scheme/m
@@ -181,7 +178,7 @@ boot:
      skos:prefLabel "Dos"@en.
     EOS
 
-    get :show, lang: 'en', format: 'ttl', root: 'lorem', dir: 'up'
+    get :show, params: { lang: 'en', format: 'ttl', root: 'lorem', dir: 'up' }
     assert_response 200
     assert_equal @response.content_type, 'text/turtle'
     assert @response.body.include?(<<-EOS)
@@ -211,30 +208,30 @@ boot:
 
     # RDF/XML
 
-    get :show, lang: 'en', format: 'rdf', root: 'root'
+    get :show, params: { lang: 'en', format: 'rdf', root: 'root' }
     assert_response 200
     assert_equal @response.content_type, 'application/rdf+xml'
   end
 
   test 'root parameter handling' do
     assert_raises ActionController::UrlGenerationError do
-      get :show, format: 'html'
+      get :show, params: { format: 'html' }
     end
 
-    get :show, lang: 'en', format: 'html', root: 'N/A'
+    get :show, params: { lang: 'en', format: 'html', root: 'N/A' }
     assert_response 404
     assert_equal 'no concept matching root parameter', flash[:error]
     entries = css_select('ul.concept-hierarchy li')
     assert_equal 0, entries.length
 
-    get :show, lang: 'en', format: 'html', root: 'root'
+    get :show, params: { lang: 'en', format: 'html', root: 'root' }
     assert_response 200
     assert_nil flash[:error]
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal 1, entries.length
     assert_equal 'Root', entries[0]
 
-    get :show, lang: 'en', format: 'html', root: 'root'
+    get :show, params: { lang: 'en', format: 'html', root: 'root' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Root'], entries
     entries = get_entries('ul.concept-hierarchy > li > ul > li')
@@ -246,7 +243,7 @@ boot:
     entries = css_select('ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li')
     assert_equal 0, entries.length # exceeded default depth
 
-    get :show, lang: 'en', format: 'html', root: 'bravo'
+    get :show, params: { lang: 'en', format: 'html', root: 'bravo' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Bravo'], entries
     entries = get_entries('ul.concept-hierarchy > li > ul > li')
@@ -256,7 +253,7 @@ boot:
     entries = css_select('ul.concept-hierarchy > li > ul > li > ul > li > ul > li')
     assert_equal 0, entries.length
 
-    get :show, lang: 'en', format: 'html', root: 'lorem'
+    get :show, params: { lang: 'en', format: 'html', root: 'lorem' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Lorem'], entries
     entries = css_select('ul.concept-hierarchy > li > ul > li')
@@ -266,15 +263,15 @@ boot:
   test 'depth handling' do
     selector = 'ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li'
 
-    get :show, lang: 'en', format: 'html', root: 'root'
+    get :show, params: { lang: 'en', format: 'html', root: 'root' }
     entries = css_select(selector)
     assert_equal 0, entries.length # default depth is 3
 
-    get :show, lang: 'en', format: 'html', root: 'root', depth: 4
+    get :show, params: { lang: 'en', format: 'html', root: 'root', depth: 4 }
     entries = css_select(selector)
     assert_equal 2, entries.length
 
-    get :show, lang: 'en', format: 'html', root: 'root', depth: 1
+    get :show, params: { lang: 'en', format: 'html', root: 'root', depth: 1 }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Root'], entries
     entries = get_entries('ul.concept-hierarchy > li > ul > li')
@@ -284,36 +281,36 @@ boot:
 
     old_config_value = Iqvoc.config['performance.unbounded_hierarchy']
     Iqvoc.config['performance.unbounded_hierarchy'] = false
-    get :show, lang: 'en', format: 'html', root: 'root', depth: 5
+    get :show, params: { lang: 'en', format: 'html', root: 'root', depth: 5 }
     assert_response 403
     assert_equal 'excessive depth', flash[:error]
     Iqvoc.config['performance.unbounded_hierarchy'] = old_config_value
 
-    get :show, lang: 'en', format: 'html', root: 'root', depth: 'invalid'
+    get :show, params: { lang: 'en', format: 'html', root: 'root', depth: 'invalid' }
     assert_response 400
     assert_equal 'invalid depth parameter', flash[:error]
   end
 
   test 'direction handling' do
-    get :show, lang: 'en', format: 'html', root: 'root'
+    get :show, params: { lang: 'en', format: 'html', root: 'root' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Root'], entries
     entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li > ul > li')
     assert_equal ['Dos', 'Uno'], entries
 
-    get :show, lang: 'en', format: 'html', root: 'root', dir: 'up'
+    get :show, params: { lang: 'en', format: 'html', root: 'root', dir: 'up' }
     entries = get_entries('ul.concept-hierarchy li')
     assert_equal ['Root'], entries
     entries = css_select('ul.concept-hierarchy li li')
     assert_equal 0, entries.length
 
-    get :show, lang: 'en', format: 'html', root: 'lorem'
+    get :show, params: {  lang: 'en', format: 'html', root: 'lorem' }
     entries = get_entries('ul.concept-hierarchy li')
     assert_equal ['Lorem'], entries
     entries = css_select('ul.concept-hierarchy li li')
     assert_equal 0, entries.length
 
-    get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up'
+    get :show, params: { lang: 'en', format: 'html', root: 'lorem', dir: 'up' }
     entries = get_entries('ul.concept-hierarchy > li')
     assert_equal ['Lorem'], entries
     entries = get_entries('ul.concept-hierarchy li > ul > li > ul > li > ul > li')
@@ -321,7 +318,7 @@ boot:
     entries = css_select('ul.concept-hierarchy li > ul > li > ul > li > ul > li > ul > li')
     assert_equal 0, entries.length
 
-    get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up', depth: 4
+    get :show, params: { lang: 'en', format: 'html', root: 'lorem', dir: 'up', depth: 4 }
     page.all('ul.concept-hierarchy li').
         map { |node| node.native.children.first.text }
     entries = get_entries('ul.concept-hierarchy > li > ul > li > ul > li > ul > li > ul > li')
@@ -329,29 +326,27 @@ boot:
   end
 
   test 'siblings handling' do
-    get :show, lang: 'en', format: 'html', root: 'foo'
+    get :show, params: { lang: 'en', format: 'html', root: 'foo' }
     entries = get_all_entries('ul.concept-hierarchy li')
     assert_equal ['Foo'], entries
 
-    get :show, lang: 'en', format: 'html', root: 'foo', siblings: 'true'
+    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, lang: 'en', format: 'html', root: 'lorem'
+    get :show, params: { lang: 'en', format: 'html', root: 'lorem' }
     entries = get_all_entries('ul.concept-hierarchy li')
     assert_equal ['Lorem'], entries
 
-    get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up',
-        siblings: 'true'
+    get :show, params: { lang: 'en', format: 'html', root: 'lorem', dir: 'up', siblings: 'true' }
     entries = get_all_entries('ul.concept-hierarchy li')
     assert_equal 8, entries.length
     ['Lorem', 'Ipsum', 'Uno', 'Dos', 'Alpha', 'Bravo', 'Bar', 'Foo'].each do |name|
       assert entries.include?(name), "missing entry: #{name}"
     end
 
-    get :show, lang: 'en', format: 'html', root: 'lorem', dir: 'up',
-        siblings: '1', depth: 4
+    get :show, params: { lang: 'en', format: 'html', root: 'lorem', dir: 'up', siblings: '1', depth: 4 }
     entries = get_all_entries('ul.concept-hierarchy li')
     assert_equal 9, entries.length
     ['Lorem', 'Ipsum', 'Uno', 'Dos', 'Alpha', 'Bravo', 'Bar', 'Foo', 'Root'].each do |name|
@@ -360,7 +355,7 @@ boot:
   end
 
   test 'avoid duplication' do # in response to a bug report
-    get :show, lang: 'en', format: 'ttl', root: 'uno', dir: 'up'
+    get :show, params: { lang: 'en', format: 'ttl', root: 'uno', dir: 'up' }
     assert_response 200
     assert_equal 'text/turtle', @response.content_type
     assert @response.body.include?(<<-EOS)

data/test/controllers/rdf_rendering_test.rb

@@ -42,9 +42,7 @@ root:
   test 'individual concept representations' do
     @controller = ConceptsController.new
 
-    params = { lang: 'en', format: 'ttl' }
-
-    get :show, params.merge(id: 'root')
+    get :show, params: { lang: 'en', id: 'root', format: 'ttl' }
     assert_response 200
     assert @response.body.include? ':root a skos:Concept'
     assert @response.body.include? 'skos:narrower :foo'
@@ -53,7 +51,7 @@ root:
     assert @response.body.include? ':foo skos:prefLabel "Foo"@en.'
     assert @response.body.include? ':bar skos:prefLabel "Bar"@en.'
 
-    get :show, params.merge(id: 'foo')
+    get :show, params: { lang: 'en', id: 'foo', format: 'ttl' }
     assert_response 200
     assert @response.body.include? ':foo a skos:Concept'
     assert @response.body.include? 'skos:broader :root'

data/test/controllers/reverse_match_test.rb

@@ -57,10 +57,11 @@ class ReverseMatchTest < ActionController::TestCase
 
   test 'remove non existing match' do
     m = Match::SKOS::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
-    patch :remove_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_relatedmatch',
-          uri: 'http://iqvoc.net'
+    patch :remove_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_relatedmatch',
+      uri: 'http://iqvoc.net'
+    }
     assert_response 400
     body = JSON.parse response.body
     assert_equal body['type'], "unknown_relation"
@@ -68,10 +69,11 @@ class ReverseMatchTest < ActionController::TestCase
 
   test 'remove match' do
     m = Match::SKOS::NarrowMatch.create concept_id: @achievement_hobbies.id, value: 'http://iqvoc.net'
-    patch :remove_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://iqvoc.net'
+    patch :remove_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://iqvoc.net'
+    }
     assert_response 200
     body = JSON.parse response.body
     assert_equal body['type'], 'mapping_removed'
@@ -81,10 +83,11 @@ class ReverseMatchTest < ActionController::TestCase
   end
 
   test 'add match' do
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://google.de'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://google.de'
+    }
     assert_response 200
     body = JSON.parse response.body
     assert_equal body['type'], 'mapping_added'
@@ -94,10 +97,11 @@ class ReverseMatchTest < ActionController::TestCase
   end
 
   test 'add already existing match' do
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://google.de'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://google.de'
+    }
     assert_response 200
     body = JSON.parse response.body
     assert_equal body['type'], 'mapping_added'
@@ -105,10 +109,11 @@ class ReverseMatchTest < ActionController::TestCase
     new_concept_version = Iqvoc::Concept.base_class.by_origin(@achievement_hobbies.origin).last
     assert_equal 2, new_concept_version.rev
 
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://google.de'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://google.de'
+    }
     assert_response 409
     body = JSON.parse response.body
     assert_equal body['type'], 'mapping_exists'
@@ -120,20 +125,22 @@ class ReverseMatchTest < ActionController::TestCase
 
   test 'no referer' do
     @request.env['HTTP_REFERER'] = nil
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://google.de'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://google.de'
+    }
     assert_response 400
     body = JSON.parse response.body
     assert_equal body['type'], "no_referer"
   end
 
   test 'unknown match class' do
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'UnknownMatch',
-          uri: 'http://google.de'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'UnknownMatch',
+      uri: 'http://google.de'
+    }
     assert_response 400
     body = JSON.parse response.body
     assert_equal body['type'], "unknown_match"
@@ -141,29 +148,32 @@ class ReverseMatchTest < ActionController::TestCase
 
   test 'unknown referer' do
     @request.env['HTTP_REFERER'] = 'http://iqvoc.net'
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://iqvoc.net'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://iqvoc.net'
+    }
     assert_response 403
     body = JSON.parse response.body
     assert_equal body['type'], "unknown_referer"
   end
 
   test 'concept with a version' do
-    patch :add_match,
-          origin: @airsoft.origin,
-          match_class: 'match_skos_broadmatch',
-          uri: 'http://iqvoc.net'
+    patch :add_match, params: {
+      origin: @airsoft.origin,
+      match_class: 'match_skos_broadmatch',
+      uri: 'http://iqvoc.net'
+    }
     assert_response 403
     body = JSON.parse response.body
     assert_equal body['type'], "in_processing"
   end
 
   test 'missing parameter' do
-    patch :add_match,
-          origin: @achievement_hobbies.origin,
-          uri: 'http://google.de'
+    patch :add_match, params: {
+      origin: @achievement_hobbies.origin,
+      uri: 'http://google.de'
+    }
     assert_response 400
     body = JSON.parse response.body
     assert_equal body['type'], "parameter_missing"

data/test/integration/authentication_test.rb

@@ -20,7 +20,7 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
   test 'sign in' do
     user
     visit dashboard_path(lang: :de)
-    assert page.has_content?('Keine Berechtigung')
+    assert page.has_content?(I18n.t('txt.views.errors.access_denied.message'))
     visit new_user_session_path(lang: :de)
     fill_in 'E-Mail', with: user.email
     fill_in 'Passwort', with: user.password

data/test/integration/browse_concepts_and_labels_test.rb

@@ -65,7 +65,9 @@ class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
     end
 
     visit hierarchical_concepts_path(lang: 'en')
-    click_link_or_button('Expired')
+    within('#sidebar') do
+      click_link_or_button('Expired')
+    end
     click_link_or_button('M')
     assert page.has_content?(concepts.first.pref_label.to_s), 'should have one expired concept'
   end

data/test/integration/client_edit_concept_test.rb

@@ -20,7 +20,7 @@ require 'database_cleaner'
 DatabaseCleaner.strategy = :truncation
 
 class ClientEditConceptsTest < ActionDispatch::IntegrationTest
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   setup do
     @concept = Concept::SKOS::Base.new.publish

data/test/integration/export_test.rb

@@ -27,12 +27,12 @@ class ExportTest < ActionDispatch::IntegrationTest
   test 'export privileges' do
     # guest
     visit exports_path(lang: 'en')
-    assert page.has_content? 'No permission'
+    assert page.has_content?(I18n.t('txt.views.errors.access_denied.message'))
 
     ['reader', 'editor', 'publisher'].each do |role|
       login role
       visit exports_path(lang: 'en')
-      assert page.has_content?('No permission'), "#{role} must not access exports"
+      assert page.has_content?(I18n.t('txt.views.errors.access_denied.message')), "#{role} must not access exports"
       logout
     end
 

data/test/integration/import_test.rb

@@ -25,12 +25,12 @@ class ImportTest < ActionDispatch::IntegrationTest
   test 'import privileges' do
     # guest
     visit imports_path(lang: 'en')
-    assert page.has_content? 'No permission'
+    assert page.has_content?(I18n.t('txt.views.errors.access_denied.message'))
 
     ['reader', 'editor', 'publisher'].each do |role|
       login role
       visit imports_path(lang: 'en')
-      assert page.has_content?('No permission'), "#{role} must not access exports"
+      assert page.has_content?(I18n.t('txt.views.errors.access_denied.message')), "#{role} must not access exports"
       logout
     end
 

data/test/integration/instance_configuration_browsing_test.rb

@@ -22,12 +22,12 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
 
     # guest
     visit uri
-    assert page.has_content?('No permission')
+    assert page.has_content?(I18n.t('txt.views.errors.access_denied.message'))
 
     ['reader', 'editor', 'publisher'].each do |role|
       login role
       visit uri
-      assert page.has_content?('No permission'), "#{role} must not access instance configuration"
+      assert page.has_content?(I18n.t('txt.views.errors.access_denied.message')), "#{role} must not access instance configuration"
       logout
     end
 

data/test/integration/navigation_test.rb

@@ -30,7 +30,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
 
     visit '/en'
 
-    nav = page.first('.navbar-fixed-top')
+    nav = page.first('.fixed-top')
 
     assert nav.has_link?('root element 1'),
       'Configured navbar element is missing or not in expected position'
@@ -39,7 +39,34 @@ class NavigationTest < ActionDispatch::IntegrationTest
 
     dropdown = nav.all('.dropdown-menu')[1]
 
-    assert_equal 1, dropdown.all('li').size
-    assert dropdown.first('li').has_link?('extension 1')
+    assert_equal 1, dropdown.all('a').size
+    assert dropdown.has_link?('extension 1')
+  end
+
+  test 'remove navigation element' do
+    Iqvoc::Configuration::Navigation.add({
+      text: 'root element X',
+      href: 'http://foo.local/'
+    })
+    Iqvoc::Configuration::Navigation.add({
+      text: 'root element Y',
+      href: 'http://foo.local/'
+    })
+
+    visit '/en'
+
+    nav = page.first('.fixed-top')
+
+    assert nav.has_link?('root element X'), 'Configured navbar element is missing or not in expected position'
+    assert nav.has_link?('root element Y'), 'Configured navbar element is missing or not in expected position'
+
+    Iqvoc::Configuration::Navigation.remove('root element X')
+
+    visit '/en'
+
+    nav2 = page.first('.fixed-top')
+
+    refute nav2.has_link?('root element X'), 'Removed navbar element is still showing'
+    assert nav2.has_link?('root element Y'), 'Configured navbar element is missing or not in expected position'
   end
 end

data/test/integration/note_annotations_test.rb

@@ -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'
+    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/search_test.rb

@@ -214,9 +214,9 @@ class SearchTest < ActionDispatch::IntegrationTest
     click_button('Search')
 
     assert page.has_css?('.search-result', count: 5)
-    assert page.has_css?('.pagination .page', count: 3)
+    assert page.has_css?('.pagination .page-item', count: 5)
 
-    find('.pagination').all('.page').last.find('a').click
+    find('.pagination').all('.page-item').last.find('a').click
 
     assert page.has_css?('.search-result', count: 2)
 

data/test/integration_test_helper.rb

@@ -20,6 +20,7 @@ require 'capybara/poltergeist'
 require 'webmock'
 require File.expand_path('authentication', File.dirname(__FILE__))
 
+Capybara.server = :webrick
 Capybara.javascript_driver = :poltergeist
 
 WebMock.allow_net_connect! # required for integration tests

data/test/models/hygiene_test.rb

@@ -29,7 +29,7 @@ class HygieneTest < ActiveSupport::TestCase
 
   def assert_no_occurrence(pattern, error_message, extended = false)
     extra_options = extended ? 'E' : ''
-    lines = `git grep -In#{extra_options} '#{pattern}' | grep -v '^vendor/'`
+    lines = `git grep -In#{extra_options} '#{pattern}' | grep -v '^vendor/' | grep -v '^node_modules/'`
     assert_not_equal 0, $?.to_i, "#{error_message}:\n#{lines}"
   end
 end

data/test/test_helper.rb

@@ -14,11 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if ENV['COVERAGE'] == '1'
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
-
 ENV['RAILS_ENV'] ||= 'test'
 
 unless defined?(Iqvoc) && Iqvoc.const_defined?(:Engine)