Skip to content

Commit dc94066

Browse files
authored
Merge pull request #23 from rollbar/wj-global-api-mock
Publish API callout mock, so customer org tests will work.
2 parents 74e2061 + 3089e0b commit dc94066

File tree

6 files changed

+28
-12
lines changed

6 files changed

+28
-12
lines changed

force-app/main/default/tests/NotifierTest.cls

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ public class NotifierTest {
33
@isTest
44
public static void testLogMessage(){
55
insert new RollbarSettings__c(SendReports__c = true);
6-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
6+
RollbarTestHelper.setDefaultMock();
77

88
Config config = new Config('foo', 'bar');
99

@@ -31,7 +31,7 @@ public class NotifierTest {
3131
@isTest
3232
public static void testLogException(){
3333
insert new RollbarSettings__c(SendReports__c = true);
34-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
34+
RollbarTestHelper.setDefaultMock();
3535

3636
Config config = new Config('foo', 'bar');
3737

@@ -61,7 +61,7 @@ public class NotifierTest {
6161
@isTest
6262
public static void testLogExceptionData(){
6363
insert new RollbarSettings__c(SendReports__c = true);
64-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
64+
RollbarTestHelper.setDefaultMock();
6565

6666
Config config = new Config('foo', 'bar');
6767

@@ -101,7 +101,7 @@ public class NotifierTest {
101101
@isTest
102102
public static void testSendReportsDisabled(){
103103
insert new RollbarSettings__c(SendReports__c = false);
104-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
104+
RollbarTestHelper.setDefaultMock();
105105

106106
Config config = new Config('foo', 'bar');
107107

force-app/main/default/tests/RollbarExceptionEmailHandlerTest.cls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ private class RollbarExceptionEmailHandlerTest {
33

44
@isTest
55
public static void testFlowEmail() {
6-
Test.setMock(HttpCalloutMock.class, new RollbarApiVerifyTelemetryCalloutMock());
6+
RollbarTestHelper.setMock(new RollbarApiVerifyTelemetryCalloutMock());
77

88
upsert new RollbarSettings__c(AccessToken__c = 'test-token', ReportFlowErrors__c = true);
99

@@ -23,7 +23,7 @@ private class RollbarExceptionEmailHandlerTest {
2323

2424
@isTest
2525
public static void testFlowEmailDisabled() {
26-
Test.setMock(HttpCalloutMock.class, new RollbarApiAssertNotCalledMock());
26+
RollbarTestHelper.setMock(new RollbarApiAssertNotCalledMock());
2727

2828
upsert new RollbarSettings__c(AccessToken__c = 'test-token', ReportFlowErrors__c = false);
2929

force-app/main/default/tests/RollbarTest.cls

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
public class RollbarTest {
33
@isTest
44
public static void testLogMessage() {
5-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
5+
RollbarTestHelper.setDefaultMock();
66

77
insert new RollbarSettings__c(SendReports__c = true);
88

@@ -16,7 +16,7 @@ public class RollbarTest {
1616

1717
@isTest
1818
public static void testLogMessageFuture() {
19-
Test.setMock(HttpCalloutMock.class, new RollbarApiVerifyRequestCalloutMock());
19+
RollbarTestHelper.setMock(new RollbarApiVerifyRequestCalloutMock());
2020

2121
insert new RollbarSettings__c(AccessToken__c = 'test-token', SendReports__c = true);
2222

@@ -29,7 +29,7 @@ public class RollbarTest {
2929

3030
@isTest
3131
public static void testLogMessageEvent() {
32-
Test.setMock(HttpCalloutMock.class, new RollbarApiVerifyRequestCalloutMock());
32+
RollbarTestHelper.setMock(new RollbarApiVerifyRequestCalloutMock());
3333

3434
insert new RollbarSettings__c(AccessToken__c = 'test-token', SendReports__c = true);
3535

@@ -42,7 +42,7 @@ public class RollbarTest {
4242

4343
@isTest
4444
public static void testLogMessageWithCustomDataAndTelemetry() {
45-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
45+
RollbarTestHelper.setDefaultMock();
4646

4747
insert new RollbarSettings__c(SendReports__c = true);
4848

@@ -65,7 +65,7 @@ public class RollbarTest {
6565

6666
@isTest
6767
public static void testLogException() {
68-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
68+
RollbarTestHelper.setDefaultMock();
6969

7070
insert new RollbarSettings__c(SendReports__c = true);
7171

@@ -79,7 +79,7 @@ public class RollbarTest {
7979

8080
@isTest
8181
public static void testLogExceptionData() {
82-
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
82+
RollbarTestHelper.setDefaultMock();
8383

8484
insert new RollbarSettings__c(SendReports__c = true);
8585

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@isTest
2+
global class RollbarTestHelper {
3+
global static void setDefaultMock() {
4+
Test.setMock(HttpCalloutMock.class, new RollbarApiCalloutMock());
5+
}
6+
7+
global static void setMock(HttpCalloutMock mock) {
8+
Test.setMock(HttpCalloutMock.class, mock);
9+
}
10+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<apiVersion>45.0</apiVersion>
4+
<status>Active</status>
5+
</ApexClass>

manifest/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<members>RollbarApiVerifyRequestCalloutMock</members>
4141
<members>RollbarApiVerifyTelemetryCalloutMock</members>
4242
<members>DataBuilderTestException</members>
43+
<members>RollbarTestHelper</members>
4344
</types>
4445

4546
<types>

0 commit comments

Comments
 (0)