From df35bd548c9b1b4f9c11286d6542d7b58fbedfa3 Mon Sep 17 00:00:00 2001
From: Massimo Rossello <counseling.mr@gmail.com>
Date: Sat, 9 Mar 2024 17:17:51 +0100
Subject: [PATCH] Version 5.0.8

---
 test/application_system_test_case.rb    | 7 ++++++-
 test/system/inline_autocomplete_test.rb | 2 ++
 test/system/issues_test.rb              | 1 -
 test/system/timelog_test.rb             | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index bfa78cc73..67e91205c 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -74,7 +74,12 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   # using default browser locale which depend on system locale for "real" browsers drivers
   def log_user(login, password)
     visit '/my/page'
-    loop until page.evaluate_script('jQuery.active').zero? # redmine_testsuites
+    # redmine_testsuites start
+    if current_path != '/login'
+      reset_session!
+      visit '/my/page'
+    end
+    # redmine_testsuites end 
     assert_equal '/login', current_path
     within('#login-form form') do
       fill_in 'username', :with => login
diff --git a/test/system/inline_autocomplete_test.rb b/test/system/inline_autocomplete_test.rb
index 7b1f9170c..d717ccc7b 100644
--- a/test/system/inline_autocomplete_test.rb
+++ b/test/system/inline_autocomplete_test.rb
@@ -59,6 +59,7 @@ def test_inline_autocomplete_for_issues_with_double_hash_keep_syntax
       assert page.has_text? 'Bug #11: Closed issue on a closed version'
       assert page.has_text? 'Bug #8: Closed issue'
 
+      loop until page.evaluate_script('jQuery.active').zero? # redmine_testsuites
       first('li').click
     end
 
@@ -165,6 +166,7 @@ def test_inline_autocompletion_of_wiki_page_links
     end
 
     fill_in 'Description', :with => '[[page'
+    loop until page.evaluate_script('jQuery.active').zero? # redmine_testsuites
     within('.tribute-container') do
       assert page.has_text? 'Page_with_sections'
       assert page.has_text? 'Another_page'
diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 0330ed3fa..8bccab6c6 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -443,7 +443,6 @@ def test_bulk_edit
 
     page.find('#issue_status_id').select('Assigned')
     assert_no_difference 'Issue.count' do
-      #submit_buttons[0].click   redmine_testsuites
       click_button('commit')
       # wait for ajax response
       assert page.has_css?('#flash_notice')
diff --git a/test/system/timelog_test.rb b/test/system/timelog_test.rb
index ff78024aa..04e6292d5 100644
--- a/test/system/timelog_test.rb
+++ b/test/system/timelog_test.rb
@@ -67,6 +67,7 @@ def test_bulk_edit_with_failure
     page.first(:button, 'Submit').click
 
     assert page.has_css?('#errorExplanation')
+    fill_in 'Hours', :with => '' # redmine_testsuites
     fill_in 'Hours', :with => '7'
     page.first(:button, 'Submit').click