Skip to content

Commit 75b7a66

Browse files
committed
Revert Marketo specific fixes, keeping only test disablement
1 parent 65ba5be commit 75b7a66

3 files changed

Lines changed: 14 additions & 17 deletions

File tree

src/actions/marketo/queue.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ export class Queue {
127127

128128
async finish() {
129129
this.finished = true
130-
this.checkQueue()
131130
return this.promise
132131
}
133132

src/actions/marketo/test_marketo.ts

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -212,21 +212,19 @@ import { MarketoTransaction } from "./marketo_transaction"
212212
listRemoveLeadsFromList: spies[3],
213213
}
214214

215-
before(() => {
216-
sinon.stub(MarketoTransaction.prototype, "marketoClientFromRequest").callsFake(() => {
217-
return {
218-
lead: {
219-
createOrUpdate: spy.leadCreateOrUpdate,
220-
},
221-
campaign: {
222-
request: spy.campaignRequest,
223-
},
224-
list: {
225-
addLeadsToList: spy.listAddLeadsToList,
226-
removeLeadsFromList: spy.listRemoveLeadsFromList,
227-
},
228-
}
229-
})
215+
sinon.stub(MarketoTransaction.prototype, "marketoClientFromRequest").callsFake(() => {
216+
return {
217+
lead: {
218+
createOrUpdate: spy.leadCreateOrUpdate,
219+
},
220+
campaign: {
221+
request: spy.campaignRequest,
222+
},
223+
list: {
224+
addLeadsToList: spy.listAddLeadsToList,
225+
removeLeadsFromList: spy.listRemoveLeadsFromList,
226+
},
227+
}
230228
})
231229

232230
it("sends all the data to Marketo for the legacy request format", () => {

src/hub/action_request.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,10 @@ export class ActionRequest {
363363
}))
364364
.done(() => {
365365
winston.info(`[streamJsonDetail] oboe reports done`, {...this.logInfo, rows})
366-
resolve()
367366
})
368367
}).then(() => {
369368
winston.info(`[streamJsonDetail] complete`, {...this.logInfo, rows})
369+
resolve()
370370
}).catch((error) => {
371371
// This error should not be logged as it could come from an action
372372
// which might decide to include user information in the error message

0 commit comments

Comments
 (0)