Merge pull request #23 from rollbar/wj-global-api-mock

Publish API callout mock, so customer org tests will work.
rollbar · Jul 30, 2020 · dc94066 · dc94066
2 parents 74e2061 + 3089e0b
commit dc94066
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/force-app/main/default/tests/NotifierTest.cls b/force-app/main/default/tests/NotifierTest.cls
@@ -3,7 +3,7 @@ public class NotifierTest {
     @isTest
     public static void testLogMessage(){
         insert new RollbarSettings__c(SendReports__c = true);
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         Config config = new Config('foo', 'bar');
 
@@ -31,7 +31,7 @@ public class NotifierTest {
     @isTest
     public static void testLogException(){
         insert new RollbarSettings__c(SendReports__c = true);
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         Config config = new Config('foo', 'bar');
 
@@ -61,7 +61,7 @@ public class NotifierTest {
     @isTest
     public static void testLogExceptionData(){
         insert new RollbarSettings__c(SendReports__c = true);
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         Config config = new Config('foo', 'bar');
 
@@ -101,7 +101,7 @@ public class NotifierTest {
     @isTest
     public static void testSendReportsDisabled(){
         insert new RollbarSettings__c(SendReports__c = false);
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         Config config = new Config('foo', 'bar');
 

diff --git a/force-app/main/default/tests/RollbarExceptionEmailHandlerTest.cls b/force-app/main/default/tests/RollbarExceptionEmailHandlerTest.cls
@@ -3,7 +3,7 @@ private class RollbarExceptionEmailHandlerTest {
 
     @isTest
     public static void testFlowEmail() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiVerifyTelemetryCalloutMock());
+        RollbarTestHelper.setMock(new RollbarApiVerifyTelemetryCalloutMock());
 
         upsert new RollbarSettings__c(AccessToken__c = 'test-token', ReportFlowErrors__c = true);
 
@@ -23,7 +23,7 @@ private class RollbarExceptionEmailHandlerTest {
 
     @isTest
     public static void testFlowEmailDisabled() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiAssertNotCalledMock());
+        RollbarTestHelper.setMock(new RollbarApiAssertNotCalledMock());
 
         upsert new RollbarSettings__c(AccessToken__c = 'test-token', ReportFlowErrors__c = false);
 

diff --git a/force-app/main/default/tests/RollbarTest.cls b/force-app/main/default/tests/RollbarTest.cls
@@ -2,7 +2,7 @@
 public class RollbarTest {
     @isTest
     public static void testLogMessage() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         insert new RollbarSettings__c(SendReports__c = true);
 
@@ -16,7 +16,7 @@ public class RollbarTest {
 
     @isTest
     public static void testLogMessageFuture() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiVerifyRequestCalloutMock());
+        RollbarTestHelper.setMock(new RollbarApiVerifyRequestCalloutMock());
 
         insert new RollbarSettings__c(AccessToken__c = 'test-token', SendReports__c = true);
 
@@ -29,7 +29,7 @@ public class RollbarTest {
 
     @isTest
     public static void testLogMessageEvent() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiVerifyRequestCalloutMock());
+        RollbarTestHelper.setMock(new RollbarApiVerifyRequestCalloutMock());
 
         insert new RollbarSettings__c(AccessToken__c = 'test-token', SendReports__c = true);
 
@@ -42,7 +42,7 @@ public class RollbarTest {
 
     @isTest
     public static void testLogMessageWithCustomDataAndTelemetry() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         insert new RollbarSettings__c(SendReports__c = true);
 
@@ -65,7 +65,7 @@ public class RollbarTest {
 
     @isTest
     public static void testLogException() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         insert new RollbarSettings__c(SendReports__c = true);
 
@@ -79,7 +79,7 @@ public class RollbarTest {
 
     @isTest
     public static void testLogExceptionData() {
-        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+        RollbarTestHelper.setDefaultMock();
 
         insert new RollbarSettings__c(SendReports__c = true);
 

diff --git a/force-app/main/default/tests/RollbarTestHelper.cls b/force-app/main/default/tests/RollbarTestHelper.cls
@@ -0,0 +1,10 @@
+@isTest
+global class RollbarTestHelper {
+    global static void setDefaultMock() {
+        Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
+    }
+
+    global static void setMock(HttpCalloutMock mock) {
+        Test.setMock(HttpCalloutMock.class, mock);
+    }
+}
diff --git a/force-app/main/default/tests/RollbarTestHelper.cls-meta.xml b/force-app/main/default/tests/RollbarTestHelper.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>45.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/manifest/package.xml b/manifest/package.xml
@@ -40,6 +40,7 @@
         <members>RollbarApiVerifyRequestCalloutMock</members>
         <members>RollbarApiVerifyTelemetryCalloutMock</members>
         <members>DataBuilderTestException</members>
+        <members>RollbarTestHelper</members>
     </types>
 
     <types>