make use of assert_nothing_raised

test/api_test_helper.rb

@@ -33,7 +33,9 @@ def api_get_test(template, res)
     get member_url(res), as: :json, headers: { 'Authorization' => read_access_auth }
     assert_response :success
 
-    assert validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response")
+    assert_nothing_raised do
+      validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response")
+    end
 
     expected = template
     actual = JSON.parse(response.body)
@@ -48,15 +50,15 @@ def api_get_test(template, res)
 
   def api_post_test(template)
     expected = template
-    assert validate_json(template.to_json, "#/components/schemas/#{singular_name.camelize(:lower)}Post")
+    assert_nothing_raised { validate_json(template.to_json, "#/components/schemas/#{singular_name.camelize(:lower)}Post") }
 
     # debug note: responds with redirect 302 if not really logged in.. could happen if database resets and has no users
     assert_difference(-> { model.count }, 1) do
       post collection_url, params: template, as: :json, headers: { 'Authorization' => write_access_auth }
       assert_response :success
     end
 
-    assert validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response")
+    assert_nothing_raised { validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response") }
 
     actual = JSON.parse(response.body)
 
@@ -80,14 +82,14 @@ def api_patch_test(resource, template)
     assert_response :success
     expected = JSON.parse(response.body)
 
-    assert validate_json(template.to_json, "#/components/schemas/#{singular_name.camelize(:lower)}Patch")
+    assert_nothing_raised { validate_json(template.to_json, "#/components/schemas/#{singular_name.camelize(:lower)}Patch") }
 
     assert_no_difference(-> { model.count }) do
       patch member_url(resource), params: template, as: :json, headers: { 'Authorization' => write_access_auth }
       assert_response :success
     end
 
-    assert validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response")
+    assert_nothing_raised { validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response") }
 
     actual = JSON.parse(response.body)
 
@@ -212,11 +214,9 @@ def validate_json(json, fragment = nil)
       opts[:fragment] = fragment if fragment
       errors = JSON::Validator.fully_validate_json(definitions_path, json, opts)
       raise Minitest::Assertion, errors.join("\n") unless errors.empty?
-      return true
     rescue JSON::Schema::SchemaError => e
       if e.message.start_with?("Invalid fragment resolution for :fragment option")
         warn "#{fragment} is missing from API spec, skipping validation"
-        return true
       else
         raise e
       end

test/integration/api/assay_api_test.rb

@@ -32,7 +32,7 @@ def setup
       assert_no_difference('Assay.count') do
         delete member_url(a), headers: { 'Authorization' => write_access_auth }
         assert_response :forbidden
-        assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+        assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
       end
     end
   end

test/integration/api/data_file_api_test.rb

@@ -71,7 +71,7 @@ def setup
         }
 
     assert_response :forbidden
-    assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     blob = df.content_blob.reload
     assert_nil blob.md5sum
     assert blob.no_content?
@@ -91,7 +91,7 @@ def setup
     }
 
     assert_response :bad_request
-    assert validate_json(response.body, '#/components/schemas/badRequestResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/badRequestResponse') }
     blob = df.content_blob.reload
     assert_equal original_md5, blob.md5sum
     assert blob.file_size > 0
@@ -113,7 +113,7 @@ def setup
     assert_no_difference(-> { model.count }) do
       post collection_url, params: to_post, headers: { 'Authorization' => write_access_auth }
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
     end
 
     h = JSON.parse(response.body)
@@ -137,7 +137,7 @@ def setup
       assert_no_difference(-> { model.count }) do
         post collection_url, params: to_post, as: :json, headers: { 'Authorization' => write_access_auth }
         assert_response :unprocessable_entity
-        assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+        assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       end
     end
 

test/integration/api/investigation_api_test.rb

@@ -21,7 +21,7 @@ def setup
     assert_no_difference('Investigation.count') do
       delete member_url(inv), headers: { 'Authorization' => write_access_auth }
       assert_response :forbidden
-      assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     end
   end
 

test/integration/api/model_api_test.rb

@@ -74,7 +74,7 @@ def setup
     }
 
     assert_response :forbidden
-    assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     blob = pdf_blob.reload
     assert_nil blob.md5sum
     assert blob.no_content?
@@ -97,7 +97,7 @@ def setup
     }
 
     assert_response :bad_request
-    assert validate_json(response.body, '#/components/schemas/badRequestResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/badRequestResponse') }
     blob = pdf_blob.reload
     assert_equal original_md5, blob.md5sum
     assert blob.file_size > 0
@@ -122,7 +122,7 @@ def setup
     assert_no_difference(-> { model.count }) do
       post collection_url, params: to_post, headers: { 'Authorization' => write_access_auth }
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
     end
 
     h = JSON.parse(response.body)

test/integration/api/presentation_api_test.rb

@@ -49,7 +49,7 @@ def setup
     }
 
     assert_response :forbidden
-    assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     blob = pres.content_blob.reload
     assert_nil blob.md5sum
     assert blob.no_content?
@@ -70,7 +70,7 @@ def setup
     }
 
     assert_response :bad_request
-    assert validate_json(response.body, '#/components/schemas/badRequestResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/badRequestResponse') }
     blob = pres.content_blob.reload
     assert_equal original_md5, blob.md5sum
     assert blob.file_size > 0

test/integration/api/programme_api_test.rb

@@ -49,7 +49,7 @@ def setup
     assert_no_difference('Programme.count', -1) do
       delete member_url(prog), headers: { 'Authorization' => write_access_auth }
       assert_response :forbidden
-      assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     end
 
     #no projects ==> can delete
@@ -62,6 +62,6 @@ def setup
 
     get member_url(prog), headers: { 'Authorization' => read_access_auth }
     assert_response :not_found
-    assert validate_json(response.body, '#/components/schemas/notFoundResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/notFoundResponse') }
   end
 end

test/integration/api/read_api_test_suite.rb

@@ -53,7 +53,7 @@ def index_response_fragment
       assert_response :not_implemented
     else
       perform_jsonapi_checks
-      assert validate_json(response.body, index_response_fragment)
+      assert_nothing_raised { validate_json(response.body, index_response_fragment) }
     end
   end
 
@@ -64,13 +64,13 @@ def index_response_fragment
     user_login(FactoryBot.create(:person))
     get member_url(res), headers: { 'Authorization' => read_access_auth }
     assert_response :forbidden
-    assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
   end
 
   test 'getting resource with non-existent ID should throw error' do
     get member_url(MissingItem.new(model)), headers: { 'Authorization' => read_access_auth }
     assert_response :not_found
-    assert validate_json(response.body, '#/components/schemas/notFoundResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/notFoundResponse') }
   end
 
   test 'write show example' do

test/integration/api/sop_api_test.rb

@@ -57,7 +57,7 @@ def setup
 
     parsed_policy = JSON.parse(@response.body)['data']['attributes']['policy']
 
-    assert validate_json(parsed_policy.to_json, "#/components/schemas/policy")
+    assert_nothing_raised { validate_json(parsed_policy.to_json, "#/components/schemas/policy") }
 
     to_patch = {
       data: {

test/integration/api/study_api_test.rb

@@ -20,7 +20,7 @@ def setup
     assert_no_difference('Study.count') do
       delete member_url(study), headers: { 'Authorization' => write_access_auth }
       assert_response :forbidden
-      assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     end
   end
 

test/integration/api/workflow_api_test.rb

@@ -59,7 +59,7 @@ def setup
       post '/workflows.json', params: template, as: :json, headers: { 'Authorization' => write_access_auth }
       assert_response :success
 
-      assert validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response")
+      assert_nothing_raised { validate_json(response.body, "#/components/schemas/#{singular_name.camelize(:lower)}Response") }
       res = JSON.parse(response.body)
       tools = res['data']['attributes']['tools']
       assert_equal 3, tools.length

test/integration/api/write_api_test_suite.rb

@@ -35,7 +35,7 @@ def ignored_attributes
     get member_url(res)
 
     assert_response :not_found
-    assert validate_json(response.body, '#/components/schemas/notFoundResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/notFoundResponse') }
   end
 
   test 'unauthorized user cannot update resource' do
@@ -48,7 +48,7 @@ def ignored_attributes
     patch member_url(res), params: body, headers: { 'Authorization' => write_access_auth }
 
     assert_response :forbidden
-    assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+    assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
   end
 
   test 'unauthorized user cannot delete resource' do
@@ -58,7 +58,7 @@ def ignored_attributes
       delete member_url(res), headers: { 'Authorization' => write_access_auth }
 
       assert_response :forbidden
-      assert validate_json(response.body, '#/components/schemas/forbiddenResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/forbiddenResponse') }
     end
   end
 
@@ -70,7 +70,7 @@ def ignored_attributes
       post collection_url, params: body, headers: { 'Authorization' => write_access_auth }, as: :json
 
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       assert_match 'A POST request is not allowed to specify an id', response.body
     end
   end
@@ -82,7 +82,7 @@ def ignored_attributes
     assert_no_difference(-> { model.count }) do
       post collection_url, params: body, headers: { 'Authorization' => write_access_auth }, as: :json
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       assert_match "The specified data:type does not match the URL's object (#{body['data']['type']} vs. #{plural_name})", response.body
     end
   end
@@ -94,7 +94,7 @@ def ignored_attributes
     assert_no_difference(-> { model.count }) do
       post collection_url, params: body, headers: { 'Authorization' => write_access_auth }, as: :json
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       assert_match "A POST/PUT request must specify a data:type", response.body
     end
   end
@@ -105,7 +105,7 @@ def ignored_attributes
     assert_no_difference(-> { model.count }) do
       put member_url(resource), params: body, headers: { 'Authorization' => write_access_auth }, as: :json
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       assert_match "id specified by the PUT request does not match object-id in the JSON input", response.body
     end
   end
@@ -117,7 +117,7 @@ def ignored_attributes
     assert_no_difference(-> { model.count }) do
       put member_url(resource), params: body, headers: { 'Authorization' => write_access_auth }, as: :json
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       assert_match "The specified data:type does not match the URL's object (#{body['data']['type']} vs. #{plural_name})", response.body
     end
   end
@@ -129,7 +129,7 @@ def ignored_attributes
     assert_no_difference(-> { model.count }) do
       put member_url(resource), params: body, headers: { 'Authorization' => write_access_auth }, as: :json
       assert_response :unprocessable_entity
-      assert validate_json(response.body, '#/components/schemas/unprocessableEntityResponse')
+      assert_nothing_raised { validate_json(response.body, '#/components/schemas/unprocessableEntityResponse') }
       assert_match "A POST/PUT request must specify a data:type", response.body
     end
   end

test/unit/api_examples_test.rb

@@ -16,7 +16,9 @@ class ApiExamplesTest < ActiveSupport::TestCase
       fragment = fragment.sub('PatchResponse', 'Response')
       fragment = fragment.sub(/[a-zA-Z]+sResponse|peopleResponse/, 'indexResponse') unless fragment.end_with?('sampleAttributeTypesResponse')
       define_method("test_#{item.sub('.', '_')}") do
-        assert validate_json(example.to_json, fragment)
+        assert_nothing_raised do
+          validate_json(example.to_json, fragment)
+        end
       end
     end
 end

test/unit/exception_forwarder_test.rb

@@ -37,8 +37,12 @@ class ExceptionForwarderTest < ActiveSupport::TestCase
   test 'send notification' do
     with_config_value(:email_enabled, true) do
       with_config_value(:exception_notification_enabled, true) do
-        Seek::Errors::ExceptionForwarder.send_notification(StandardError.new('test'),data:{})
-        assert true # no errors thrown. Not possible to test if emails sent, as they are disable except in production
+
+        # no errors thrown. Not possible to test if emails sent, as they are disable except in production
+        assert_nothing_raised do
+          Seek::Errors::ExceptionForwarder.send_notification(StandardError.new('test'),data:{})
+        end
+
       end
     end
   end

test/unit/jobs/reindex_all_job_test.rb

@@ -5,8 +5,9 @@ class ReindexAllJobTest < ActiveSupport::TestCase
   # simple sanity check, to catch interface or gem change bugs
   test 'perform' do
     FactoryBot.create(:person)
-    ReindexAllJob.new('Person').perform_now
-    assert true
+    assert_nothing_raised do
+      ReindexAllJob.new('Person').perform_now
+    end
   end
 
 end

test/unit/ontologies/ontology_reader_test.rb

@@ -89,9 +89,8 @@ def default_parent_class_uri
     reader = SubOntologyReader.instance
     begin
       reader.class_hierarchy
-      assert true
     rescue NotImplementedError => error
-      assert !error.nil?
+      assert error.present?
     end
   end
 end