Updated some tests about notification counting

maxrossello · Jan 15, 2020 · 28c7a8a · 28c7a8a
1 parent 86a9fa4
commit 28c7a8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb
@@ -103,9 +103,9 @@ def test_with_sub_uri
 #    assert_select "link[rel=stylesheet][href^=?]", "/foo/themes/#{@theme.dir}/stylesheets/application.css"
 #    assert_select "script[src^=?]", "/foo/themes/#{@theme.dir}/javascripts/theme.js"
 #    assert_select 'link[rel="shortcut icon"][href^=?]', "/foo/themes/#{@theme.dir}/favicon/a.ico"
-    assert_select "link[rel=stylesheet]:match('href',?)", /\/foo\/(plugin_assets\/redmine_themes)?\/themes\/#{@theme.dir}\/stylesheets\/application\.css/
-    assert_select "script:match('src',?)", /\/foo\/(plugin_assets\/redmine_themes)?\/themes\/#{@theme.dir}\/javascripts\/theme\.js/
-    assert_select 'link[rel="shortcut icon"]:match("href",?)', /\/foo\/(plugin_assets\/redmine_themes)?\/themes\/#{@theme.dir}\/favicon\/a\.ico/
+    assert_select "link[rel=stylesheet]:match('href',?)", /\/foo(\/plugin_assets\/redmine_themes)?\/themes\/#{@theme.dir}\/stylesheets\/application\.css/
+    assert_select "script:match('src',?)", /\/foo(\/plugin_assets\/redmine_themes)?\/themes\/#{@theme.dir}\/javascripts\/theme\.js/
+    assert_select 'link[rel="shortcut icon"]:match("href",?)', /\/foo(\/plugin_assets\/redmine_themes)?\/themes\/#{@theme.dir}\/favicon\/a\.ico/
   ensure
     Redmine::Utils.relative_url_root = ''
   end

diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb
@@ -166,7 +166,9 @@ def test_create_should_not_send_email_notification_without_issue_assignee_update
     issue.assigned_to = User.find(3)
 
     with_settings :notified_events => [] do
-      assert issue.save 
+      perform_enqueued_jobs do  # redmine_testsuites
+        assert issue.save
+      end 
     end
     assert_equal 0, ActionMailer::Base.deliveries.size
   end
@@ -192,7 +194,9 @@ def test_create_should_not_send_email_notification_without_issue_priority_update
     issue.priority = IssuePriority.last
 
     with_settings :notified_events => [] do
-      assert issue.save
+      perform_enqueued_jobs do  # redmine_testsuites
+        assert issue.save
+      end
     end
     assert_equal 0, ActionMailer::Base.deliveries.size
   end
@@ -204,7 +208,9 @@ def test_create_should_send_email_notification_with_issue_fixed_version_updated
       issue.init_journal(user)
       issue.fixed_version = versions(:versions_003)
 
-      assert issue.save
+      perform_enqueued_jobs do  # redmine_testsuites
+        assert issue.save
+      end
       assert_equal 2, ActionMailer::Base.deliveries.size
     end
   end
@@ -216,7 +222,9 @@ def test_create_should_not_send_email_notification_without_issue_fixed_version_u
       issue.init_journal(user)
       issue.fixed_version = versions(:versions_003)
 
-      assert issue.save
+      perform_enqueued_jobs do  # redmine_testsuites
+        assert issue.save
+      end
       assert_equal 0, ActionMailer::Base.deliveries.size
     end
   end