Cds/reduce assertions per test

.rubocop.yml

@@ -73,9 +73,11 @@ Metrics/ParameterLists:
     - app/models/jupiter_core/search.rb
     - app/models/jupiter_core/solr_services/deferred_faceted_solr_query.rb
 
-# TODO: our tests are quite smelly.  We should be working to get this lower!
 Minitest/MultipleAssertions:
   Max: 15 # default 3
+  Exclude:
+    - test/system/admin_users_show_test.rb
+    - test/system/search_test.rb
 
 Naming/FileName:
   Exclude:

CHANGELOG.md

@@ -9,6 +9,9 @@ New entries in this file should aim to provide a meaningful amount of informatio
 
 ## Unreleased
 
+### Changed
+- Refactored tests into smaller tests [PR#2563](https://github.com/ualbertalib/jupiter/pull/2563)
+
 ## [2.4.4] - 2023-02-17
 ### Added
 - Push collections and communities to preservation on save along with a rake task to do so [#255](https://github.com/ualbertalib/pushmi_pullyu/issues/255)

test/integration/site_for_bots_test.rb

@@ -111,7 +111,7 @@ class SiteForBotsTest < ActionDispatch::IntegrationTest
     assert_select "a[rel='nofollow']", text: @item.subject.first
   end
 
-  test 'structured data for google scholar' do
+  test 'structured thesis data for google scholar' do
     # TODO: can be a lot more complicated see https://scholar.google.com/intl/en/scholar/inclusion.html#indexing
     get item_path @thesis
     assert_select "meta[name='citation_title'][content='#{@thesis.title}']"
@@ -125,7 +125,9 @@ class SiteForBotsTest < ActionDispatch::IntegrationTest
                          ))
     assert_select "meta[name='dc.identifier'][content='#{@item.doi}']"
     assert_select "meta[name='citation_doi'][content='#{@item.doi}']"
+  end
 
+  test 'structured item data for google scholar' do
     get item_path @item
     assert_select "meta[name='citation_title'][content='#{@item.title}']"
     @item.creators.each do |author|

test/jobs/update_user_activity_job_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class UpdateUserActivityJobTest < ActiveSupport::TestCase
+
+  test 'should update the user activity (last seen at and IP) through the job' do
+    user = users(:user_admin)
+    ip = '4.73.73.73'
+    now = Time.now.utc.to_s
+    UpdateUserActivityJob.perform_now(user.id, now, ip)
+    user.reload
+    assert_equal user.last_seen_at.to_s, now
+    assert_equal user.last_seen_ip, ip
+    # Still does not change sign-in information
+    assert_predicate user.last_sign_in_at, :blank?
+    assert_predicate user.last_sign_in_ip, :blank?
+    assert_predicate user.previous_sign_in_at, :blank?
+    assert_predicate user.previous_sign_in_ip, :blank?
+  end
+
+end

test/models/user_test.rb

@@ -23,83 +23,47 @@ class UserTest < ActiveSupport::TestCase
     assert_equal "User:#{user.id}", user.flipper_id
   end
 
-  # rubocop:disable Minitest/MultipleAssertions
-  # TODO: our tests are quite smelly.  This one needs work!
-  test 'should update the activity columns when not signing-in' do
-    user = users(:user_regular)
+  test 'should update the activity columns when not signing-in for new user without activity update' do
+    user = users(:user_admin)
     assert_predicate user.last_seen_at, :blank?
     assert_predicate user.last_sign_in_at, :blank?
     assert_predicate user.previous_sign_in_at, :blank?
+  end
+
+  test 'should update the activity columns when not signing-in' do
+    user = users(:user_regular)
 
-    ip1 = '4.26.50.50'
-    now1 = Time.now.utc.to_s
+    ip = '4.26.50.50'
+    now = Time.now.utc.to_s
 
-    user.update_activity!(now1, ip1)
+    user.update_activity!(now, ip)
     user.reload
 
     assert_predicate user.last_seen_at, :present?
-    assert_equal user.last_seen_at.to_s, now1
-    assert_equal user.last_seen_ip, ip1
+    assert_equal user.last_seen_at.to_s, now
+    assert_equal user.last_seen_ip, ip
     # Does not change sign-in information
     assert_predicate user.last_sign_in_at, :blank?
     assert_predicate user.last_sign_in_ip, :blank?
     assert_predicate user.previous_sign_in_at, :blank?
     assert_predicate user.previous_sign_in_ip, :blank?
-
-    travel 1.hour do
-      ip2 = '4.73.73.73'
-      now2 = Time.now.utc.to_s
-      assert_not_equal now2, now1
-      UpdateUserActivityJob.perform_now(user.id, now2, ip2)
-      user.reload
-      assert_equal user.last_seen_at.to_s, now2
-      assert_equal user.last_seen_ip, ip2
-      # Still does not change sign-in information
-      assert_predicate user.last_sign_in_at, :blank?
-      assert_predicate user.last_sign_in_ip, :blank?
-      assert_predicate user.previous_sign_in_at, :blank?
-      assert_predicate user.previous_sign_in_ip, :blank?
-    end
   end
-  # rubocop:enable Minitest/MultipleAssertions
 
-  # rubocop:disable Minitest/MultipleAssertions
-  # TODO: our tests are quite smelly.  This one needs work!
   test 'should update the activity columns when signing-in' do
     user = users(:user_regular)
-    assert_predicate user.last_seen_at, :blank?
-    assert_predicate user.last_sign_in_at, :blank?
-    assert_predicate user.previous_sign_in_at, :blank?
-
-    ip1 = '4.26.50.50'
-    now1 = Time.now.utc.to_s
+    ip = '4.26.50.50'
+    now = Time.now.utc.to_s
 
-    user.update_activity!(now1, ip1, sign_in: true)
+    user.update_activity!(now, ip, sign_in: true)
     user.reload
     assert_predicate user.last_seen_at, :present?
-    assert_equal user.last_seen_at.to_s, now1
-    assert_equal user.last_seen_ip, ip1
-    assert_equal user.last_sign_in_at.to_s, now1
-    assert_equal user.last_sign_in_ip, ip1
+    assert_equal user.last_seen_at.to_s, now
+    assert_equal user.last_seen_ip, ip
+    assert_equal user.last_sign_in_at.to_s, now
+    assert_equal user.last_sign_in_ip, ip
     assert_predicate user.previous_sign_in_at, :blank?
     assert_predicate user.previous_sign_in_ip, :blank?
-
-    travel 1.hour do
-      ip2 = '4.73.73.73'
-      now2 = Time.now.utc.to_s
-      assert_not_equal now2, now1
-
-      user.update_activity!(now2, ip2, sign_in: true)
-      user.reload
-      assert_equal user.last_seen_at.to_s, now2
-      assert_equal user.last_seen_ip, ip2
-      assert_equal user.last_sign_in_at.to_s, now2
-      assert_equal user.last_sign_in_ip, ip2
-      assert_equal user.previous_sign_in_at, now1
-      assert_equal user.previous_sign_in_ip, ip1
-    end
   end
-  # rubocop:enable Minitest/MultipleAssertions
 
   test 'should validate if it does not have an api key and it is not a system account' do
     user = User.new(