Merge branch 'master' into tess-1.2

ElixirTeSS · Sep 8, 2022 · 8a56388 · 8a56388
2 parents e2c5905 + 988ec73
commit 8a56388
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/test/controllers/curator_controller_test.rb b/test/controllers/curator_controller_test.rb
@@ -124,11 +124,6 @@ class CuratorControllerTest < ActionController::TestCase
     sign_in users(:admin)
     new_user = users(:unverified_user)
 
-    get :users, params: { with_content: true }
-
-    assert_response :success
-    assert_not_includes assigns(:users), new_user
-
     event = nil
     material = nil
     workflow = nil
@@ -178,6 +173,8 @@ class CuratorControllerTest < ActionController::TestCase
     get :users, params: { with_content: true }
 
     assert_response :success
+    assert_includes assigns(:users), new_user
+    assert_select '.panel-heading a[href=?]', @controller.user_path(new_user), text: new_user.username
 
     User::CREATED_RESOURCE_TYPES.each do |type|
       klass = type.to_s.classify.constantize
@@ -188,7 +185,8 @@ class CuratorControllerTest < ActionController::TestCase
     end
 
     [event, material, workflow, collection, provider, source].each do |resource|
-      assert_select '.curate-user a[href=?]', @controller.polymorphic_path(resource)
+      assert_select '.curate-user a[href=?]', @controller.polymorphic_path(resource), { text: resource.title },
+                    "#{@controller.polymorphic_path(resource)} not found!, \nBody:\n#{response.body}"
     end
   end
 

diff --git a/test/mailers/curation_mailer_test.rb b/test/mailers/curation_mailer_test.rb
@@ -17,6 +17,8 @@ class CurationMailerTest < ActionMailer::TestCase
                                         keywords: ['unverified', 'user', 'material'],
                                         contact: 'main contact',
                                         status: 'active')
+    # Avoids queued emails affecting `assert_email` counts. See: https://github.com/ElixirTeSS/TeSS/issues/719
+    perform_enqueued_jobs
   end
 
   teardown do

diff --git a/test/mailers/subscription_mailer_test.rb b/test/mailers/subscription_mailer_test.rb
@@ -8,6 +8,8 @@ class SubscriptionMailerTest < ActionMailer::TestCase
   setup do
     @url_opts = Rails.application.routes.default_url_options
     Rails.application.routes.default_url_options = Rails.application.config.action_mailer.default_url_options
+    # Avoids queued emails affecting `assert_email` counts. See: https://github.com/ElixirTeSS/TeSS/issues/719
+    perform_enqueued_jobs
   end
 
   teardown do