From 78ff2a600b29f05f522f8e8818967dac88394fd6 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Tue, 28 Mar 2017 13:32:58 -0400
Subject: [PATCH] 7709: Dispatch assert_equal to assert_nil when needed to
 accommodate MT6.

---
 services/api/test/test_helper.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index 6d8fa9fefb..38f44c5d9b 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -66,6 +66,14 @@ class ActiveSupport::TestCase
     User.invalidate_permissions_cache
   end
 
+  def assert_equal(expect, *args)
+    if expect.nil?
+      assert_nil(*args)
+    else
+      super
+    end
+  end
+
   def assert_not_allowed
     # Provide a block that calls a Rails boolean "true or false" success value,
     # like model.save or model.destroy.  This method will test that it either
-- 
2.30.2