From e253a16b20962fa2ac7fef9a14178daf7d60f9c3 Mon Sep 17 00:00:00 2001 From: Sam Harrison Date: Tue, 14 May 2019 11:23:51 -0500 Subject: [PATCH 1/2] Replace string templating with interpolation --- Makefile | 2 +- lib/rest/accounts/v1/credential/aws.js | 8 +-- lib/rest/accounts/v1/credential/publicKey.js | 8 +-- lib/rest/api/v2010/account.js | 8 +-- lib/rest/api/v2010/account/address.js | 8 +-- .../account/address/dependentPhoneNumber.js | 4 +- lib/rest/api/v2010/account/application.js | 8 +-- .../api/v2010/account/authorizedConnectApp.js | 8 +-- .../api/v2010/account/availablePhoneNumber.js | 8 +-- .../account/availablePhoneNumber/local.js | 4 +- .../availablePhoneNumber/machineToMachine.js | 4 +- .../account/availablePhoneNumber/mobile.js | 4 +- .../account/availablePhoneNumber/national.js | 4 +- .../availablePhoneNumber/sharedCost.js | 4 +- .../account/availablePhoneNumber/tollFree.js | 4 +- .../account/availablePhoneNumber/voip.js | 4 +- lib/rest/api/v2010/account/balance.js | 4 +- lib/rest/api/v2010/account/call.js | 8 +-- lib/rest/api/v2010/account/call/feedback.js | 4 +- .../api/v2010/account/call/feedbackSummary.js | 8 +-- .../api/v2010/account/call/notification.js | 8 +-- lib/rest/api/v2010/account/call/recording.js | 8 +-- lib/rest/api/v2010/account/conference.js | 8 +-- .../v2010/account/conference/participant.js | 8 +-- .../api/v2010/account/conference/recording.js | 8 +-- lib/rest/api/v2010/account/connectApp.js | 8 +-- .../api/v2010/account/incomingPhoneNumber.js | 8 +-- .../incomingPhoneNumber/assignedAddOn.js | 8 +-- .../assignedAddOn/assignedAddOnExtension.js | 8 +-- .../account/incomingPhoneNumber/local.js | 4 +- .../account/incomingPhoneNumber/mobile.js | 4 +- .../account/incomingPhoneNumber/tollFree.js | 4 +- lib/rest/api/v2010/account/key.js | 8 +-- lib/rest/api/v2010/account/message.js | 8 +-- .../api/v2010/account/message/feedback.js | 4 +- lib/rest/api/v2010/account/message/media.js | 8 +-- lib/rest/api/v2010/account/newKey.js | 4 +- lib/rest/api/v2010/account/newSigningKey.js | 4 +- lib/rest/api/v2010/account/notification.js | 8 +-- .../api/v2010/account/outgoingCallerId.js | 8 +-- lib/rest/api/v2010/account/queue.js | 8 +-- lib/rest/api/v2010/account/queue/member.js | 8 +-- lib/rest/api/v2010/account/recording.js | 8 +-- .../v2010/account/recording/addOnResult.js | 8 +-- .../account/recording/addOnResult/payload.js | 8 +-- .../v2010/account/recording/transcription.js | 8 +-- lib/rest/api/v2010/account/shortCode.js | 8 +-- lib/rest/api/v2010/account/signingKey.js | 8 +-- .../api/v2010/account/sip/credentialList.js | 8 +-- .../account/sip/credentialList/credential.js | 8 +-- lib/rest/api/v2010/account/sip/domain.js | 8 +-- .../authCallsCredentialListMapping.js | 8 +-- .../authCallsIpAccessControlListMapping.js | 8 +-- .../authRegistrationsCredentialListMapping.js | 8 +-- .../sip/domain/credentialListMapping.js | 8 +-- .../sip/domain/ipAccessControlListMapping.js | 8 +-- .../v2010/account/sip/ipAccessControlList.js | 8 +-- .../sip/ipAccessControlList/ipAddress.js | 8 +-- lib/rest/api/v2010/account/token.js | 4 +- lib/rest/api/v2010/account/transcription.js | 8 +-- lib/rest/api/v2010/account/usage/record.js | 4 +- .../api/v2010/account/usage/record/allTime.js | 4 +- .../api/v2010/account/usage/record/daily.js | 4 +- .../v2010/account/usage/record/lastMonth.js | 4 +- .../api/v2010/account/usage/record/monthly.js | 4 +- .../v2010/account/usage/record/thisMonth.js | 4 +- .../api/v2010/account/usage/record/today.js | 4 +- .../api/v2010/account/usage/record/yearly.js | 4 +- .../v2010/account/usage/record/yesterday.js | 4 +- lib/rest/api/v2010/account/usage/trigger.js | 8 +-- .../api/v2010/account/validationRequest.js | 4 +- lib/rest/authy/v1/form.js | 4 +- lib/rest/authy/v1/service.js | 8 +-- lib/rest/authy/v1/service/entity.js | 8 +-- lib/rest/authy/v1/service/entity/factor.js | 8 +-- .../v1/service/entity/factor/challenge.js | 8 +-- lib/rest/autopilot/v1/assistant.js | 8 +-- lib/rest/autopilot/v1/assistant/defaults.js | 4 +- lib/rest/autopilot/v1/assistant/dialogue.js | 4 +- lib/rest/autopilot/v1/assistant/fieldType.js | 8 +-- .../v1/assistant/fieldType/fieldValue.js | 8 +-- lib/rest/autopilot/v1/assistant/modelBuild.js | 8 +-- lib/rest/autopilot/v1/assistant/query.js | 8 +-- lib/rest/autopilot/v1/assistant/styleSheet.js | 4 +- lib/rest/autopilot/v1/assistant/task.js | 8 +-- lib/rest/autopilot/v1/assistant/task/field.js | 8 +-- .../autopilot/v1/assistant/task/sample.js | 8 +-- .../v1/assistant/task/taskActions.js | 4 +- .../v1/assistant/task/taskStatistics.js | 4 +- lib/rest/chat/v1/credential.js | 8 +-- lib/rest/chat/v1/service.js | 8 +-- lib/rest/chat/v1/service/channel.js | 8 +-- lib/rest/chat/v1/service/channel/invite.js | 8 +-- lib/rest/chat/v1/service/channel/member.js | 8 +-- lib/rest/chat/v1/service/channel/message.js | 8 +-- lib/rest/chat/v1/service/role.js | 8 +-- lib/rest/chat/v1/service/user.js | 8 +-- lib/rest/chat/v1/service/user/userChannel.js | 4 +- lib/rest/chat/v2/credential.js | 8 +-- lib/rest/chat/v2/service.js | 8 +-- lib/rest/chat/v2/service/binding.js | 8 +-- lib/rest/chat/v2/service/channel.js | 8 +-- lib/rest/chat/v2/service/channel/invite.js | 8 +-- lib/rest/chat/v2/service/channel/member.js | 8 +-- lib/rest/chat/v2/service/channel/message.js | 8 +-- lib/rest/chat/v2/service/channel/webhook.js | 8 +-- lib/rest/chat/v2/service/role.js | 8 +-- lib/rest/chat/v2/service/user.js | 8 +-- lib/rest/chat/v2/service/user/userBinding.js | 8 +-- lib/rest/chat/v2/service/user/userChannel.js | 8 +-- lib/rest/fax/v1/fax.js | 8 +-- lib/rest/fax/v1/fax/faxMedia.js | 8 +-- lib/rest/flexApi/v1/configuration.js | 4 +- lib/rest/flexApi/v1/flexFlow.js | 8 +-- lib/rest/insights/v1/summary.js | 4 +- lib/rest/ipMessaging/v1/credential.js | 8 +-- lib/rest/ipMessaging/v1/service.js | 8 +-- lib/rest/ipMessaging/v1/service/channel.js | 8 +-- .../ipMessaging/v1/service/channel/invite.js | 8 +-- .../ipMessaging/v1/service/channel/member.js | 8 +-- .../ipMessaging/v1/service/channel/message.js | 8 +-- lib/rest/ipMessaging/v1/service/role.js | 8 +-- lib/rest/ipMessaging/v1/service/user.js | 8 +-- .../v1/service/user/userChannel.js | 4 +- lib/rest/ipMessaging/v2/credential.js | 8 +-- lib/rest/ipMessaging/v2/service.js | 8 +-- lib/rest/ipMessaging/v2/service/binding.js | 8 +-- lib/rest/ipMessaging/v2/service/channel.js | 8 +-- .../ipMessaging/v2/service/channel/invite.js | 8 +-- .../ipMessaging/v2/service/channel/member.js | 8 +-- .../ipMessaging/v2/service/channel/message.js | 8 +-- .../ipMessaging/v2/service/channel/webhook.js | 8 +-- lib/rest/ipMessaging/v2/service/role.js | 8 +-- lib/rest/ipMessaging/v2/service/user.js | 8 +-- .../v2/service/user/userBinding.js | 8 +-- .../v2/service/user/userChannel.js | 8 +-- lib/rest/lookups/v1/phoneNumber.js | 4 +- lib/rest/messaging/v1/service.js | 8 +-- lib/rest/messaging/v1/service/alphaSender.js | 8 +-- lib/rest/messaging/v1/service/phoneNumber.js | 8 +-- lib/rest/messaging/v1/service/shortCode.js | 8 +-- lib/rest/messaging/v1/session.js | 8 +-- lib/rest/messaging/v1/session/message.js | 8 +-- lib/rest/messaging/v1/session/participant.js | 8 +-- lib/rest/messaging/v1/session/webhook.js | 8 +-- lib/rest/messaging/v1/webhook.js | 4 +- lib/rest/monitor/v1/alert.js | 8 +-- lib/rest/monitor/v1/event.js | 8 +-- lib/rest/notify/v1/credential.js | 8 +-- lib/rest/notify/v1/service.js | 8 +-- lib/rest/notify/v1/service/binding.js | 8 +-- lib/rest/notify/v1/service/notification.js | 4 +- lib/rest/preview/acc_security/service.js | 8 +-- .../acc_security/service/verification.js | 4 +- .../acc_security/service/verificationCheck.js | 4 +- lib/rest/preview/bulk_exports/export.js | 4 +- lib/rest/preview/bulk_exports/export/day.js | 4 +- .../bulk_exports/exportConfiguration.js | 4 +- lib/rest/preview/deployed_devices/fleet.js | 8 +-- .../deployed_devices/fleet/certificate.js | 8 +-- .../deployed_devices/fleet/deployment.js | 8 +-- .../preview/deployed_devices/fleet/device.js | 8 +-- .../preview/deployed_devices/fleet/key.js | 8 +-- .../hosted_numbers/authorizationDocument.js | 8 +-- .../dependentHostedNumberOrder.js | 4 +- .../hosted_numbers/hostedNumberOrder.js | 8 +-- .../preview/marketplace/availableAddOn.js | 8 +-- .../availableAddOn/availableAddOnExtension.js | 8 +-- .../preview/marketplace/installedAddOn.js | 8 +-- .../installedAddOn/installedAddOnExtension.js | 8 +-- lib/rest/preview/sync/service.js | 8 +-- lib/rest/preview/sync/service/document.js | 8 +-- .../service/document/documentPermission.js | 8 +-- lib/rest/preview/sync/service/syncList.js | 8 +-- .../sync/service/syncList/syncListItem.js | 8 +-- .../service/syncList/syncListPermission.js | 8 +-- lib/rest/preview/sync/service/syncMap.js | 8 +-- .../sync/service/syncMap/syncMapItem.js | 8 +-- .../sync/service/syncMap/syncMapPermission.js | 8 +-- lib/rest/preview/understand/assistant.js | 8 +-- .../assistant/assistantFallbackActions.js | 4 +- .../assistant/assistantInitiationActions.js | 4 +- .../preview/understand/assistant/dialogue.js | 4 +- .../preview/understand/assistant/fieldType.js | 8 +-- .../assistant/fieldType/fieldValue.js | 8 +-- .../understand/assistant/modelBuild.js | 8 +-- .../preview/understand/assistant/query.js | 8 +-- .../understand/assistant/styleSheet.js | 4 +- lib/rest/preview/understand/assistant/task.js | 8 +-- .../understand/assistant/task/field.js | 8 +-- .../understand/assistant/task/sample.js | 8 +-- .../understand/assistant/task/taskActions.js | 4 +- .../assistant/task/taskStatistics.js | 4 +- lib/rest/preview/wireless/command.js | 8 +-- lib/rest/preview/wireless/ratePlan.js | 8 +-- lib/rest/preview/wireless/sim.js | 8 +-- lib/rest/preview/wireless/sim/usage.js | 4 +- lib/rest/pricing/v1/messaging/country.js | 8 +-- lib/rest/pricing/v1/phoneNumber/country.js | 8 +-- lib/rest/pricing/v1/voice/country.js | 8 +-- lib/rest/pricing/v1/voice/number.js | 4 +- lib/rest/pricing/v2/voice/country.js | 8 +-- lib/rest/pricing/v2/voice/number.js | 4 +- lib/rest/proxy/v1/service.js | 8 +-- lib/rest/proxy/v1/service/phoneNumber.js | 8 +-- lib/rest/proxy/v1/service/session.js | 8 +-- .../proxy/v1/service/session/interaction.js | 8 +-- .../proxy/v1/service/session/participant.js | 8 +-- .../session/participant/messageInteraction.js | 8 +-- lib/rest/proxy/v1/service/shortCode.js | 8 +-- lib/rest/serverless/v1/service.js | 8 +-- lib/rest/serverless/v1/service/asset.js | 8 +-- .../v1/service/asset/assetVersion.js | 8 +-- lib/rest/serverless/v1/service/build.js | 8 +-- lib/rest/serverless/v1/service/environment.js | 8 +-- .../v1/service/environment/deployment.js | 8 +-- .../v1/service/environment/variable.js | 8 +-- lib/rest/serverless/v1/service/function.js | 8 +-- .../v1/service/function/functionVersion.js | 8 +-- lib/rest/studio/v1/flow.js | 8 +-- lib/rest/studio/v1/flow/engagement.js | 8 +-- .../v1/flow/engagement/engagementContext.js | 4 +- lib/rest/studio/v1/flow/engagement/step.js | 8 +-- .../v1/flow/engagement/step/stepContext.js | 4 +- lib/rest/studio/v1/flow/execution.js | 8 +-- .../v1/flow/execution/executionContext.js | 4 +- .../studio/v1/flow/execution/executionStep.js | 8 +-- .../executionStep/executionStepContext.js | 4 +- lib/rest/sync/v1/service.js | 8 +-- lib/rest/sync/v1/service/document.js | 8 +-- .../v1/service/document/documentPermission.js | 8 +-- lib/rest/sync/v1/service/syncList.js | 8 +-- .../sync/v1/service/syncList/syncListItem.js | 8 +-- .../v1/service/syncList/syncListPermission.js | 8 +-- lib/rest/sync/v1/service/syncMap.js | 8 +-- .../sync/v1/service/syncMap/syncMapItem.js | 8 +-- .../v1/service/syncMap/syncMapPermission.js | 8 +-- lib/rest/sync/v1/service/syncStream.js | 8 +-- .../v1/service/syncStream/streamMessage.js | 4 +- lib/rest/taskrouter/v1/workspace.js | 8 +-- lib/rest/taskrouter/v1/workspace/activity.js | 8 +-- lib/rest/taskrouter/v1/workspace/event.js | 8 +-- lib/rest/taskrouter/v1/workspace/task.js | 8 +-- .../v1/workspace/task/reservation.js | 8 +-- .../taskrouter/v1/workspace/taskChannel.js | 8 +-- lib/rest/taskrouter/v1/workspace/taskQueue.js | 8 +-- .../taskQueueCumulativeStatistics.js | 4 +- .../taskQueue/taskQueueRealTimeStatistics.js | 4 +- .../taskQueue/taskQueueStatistics.js | 4 +- .../taskQueue/taskQueuesStatistics.js | 4 +- lib/rest/taskrouter/v1/workspace/worker.js | 8 +-- .../v1/workspace/worker/reservation.js | 8 +-- .../v1/workspace/worker/workerChannel.js | 8 +-- .../v1/workspace/worker/workerStatistics.js | 4 +- .../worker/workersCumulativeStatistics.js | 4 +- .../worker/workersRealTimeStatistics.js | 4 +- .../v1/workspace/worker/workersStatistics.js | 4 +- lib/rest/taskrouter/v1/workspace/workflow.js | 8 +-- .../workflow/workflowCumulativeStatistics.js | 4 +- .../workflow/workflowRealTimeStatistics.js | 4 +- .../workspace/workflow/workflowStatistics.js | 4 +- .../workspaceCumulativeStatistics.js | 4 +- .../workspace/workspaceRealTimeStatistics.js | 4 +- .../v1/workspace/workspaceStatistics.js | 4 +- lib/rest/trunking/v1/trunk.js | 8 +-- lib/rest/trunking/v1/trunk/credentialList.js | 8 +-- .../trunking/v1/trunk/ipAccessControlList.js | 8 +-- lib/rest/trunking/v1/trunk/originationUrl.js | 8 +-- lib/rest/trunking/v1/trunk/phoneNumber.js | 8 +-- .../trunking/v1/trunk/terminatingSipDomain.js | 8 +-- lib/rest/verify/v2/service.js | 8 +-- lib/rest/verify/v2/service/verification.js | 8 +-- .../verify/v2/service/verificationCheck.js | 4 +- lib/rest/video/v1/composition.js | 8 +-- lib/rest/video/v1/compositionHook.js | 8 +-- lib/rest/video/v1/compositionSettings.js | 4 +- lib/rest/video/v1/recording.js | 8 +-- lib/rest/video/v1/recordingSettings.js | 4 +- lib/rest/video/v1/room.js | 8 +-- lib/rest/video/v1/room/recording.js | 8 +-- lib/rest/video/v1/room/roomParticipant.js | 8 +-- .../roomParticipantPublishedTrack.js | 8 +-- .../roomParticipantSubscribedTrack.js | 4 +- .../dialingPermissions/bulkCountryUpdate.js | 4 +- .../voice/v1/dialingPermissions/country.js | 8 +-- .../country/highriskSpecialPrefix.js | 4 +- .../voice/v1/dialingPermissions/settings.js | 4 +- lib/rest/wireless/v1/command.js | 8 +-- lib/rest/wireless/v1/ratePlan.js | 8 +-- lib/rest/wireless/v1/sim.js | 8 +-- lib/rest/wireless/v1/sim/dataSession.js | 4 +- lib/rest/wireless/v1/sim/usageRecord.js | 4 +- .../rest/accounts/v1/credential.spec.js | 1 - .../rest/accounts/v1/credential/aws.spec.js | 13 +++-- .../accounts/v1/credential/publicKey.spec.js | 13 +++-- .../rest/api/v2010/account.spec.js | 9 ++-- .../rest/api/v2010/account/address.spec.js | 35 ++++++------- .../address/dependentPhoneNumber.spec.js | 11 ++--- .../api/v2010/account/application.spec.js | 35 ++++++------- .../account/authorizedConnectApp.spec.js | 15 +++--- .../account/availablePhoneNumber.spec.js | 12 ++--- .../availablePhoneNumber/local.spec.js | 8 +-- .../machineToMachine.spec.js | 8 +-- .../availablePhoneNumber/mobile.spec.js | 8 +-- .../availablePhoneNumber/national.spec.js | 8 +-- .../availablePhoneNumber/sharedCost.spec.js | 8 +-- .../availablePhoneNumber/tollFree.spec.js | 8 +-- .../account/availablePhoneNumber/voip.spec.js | 8 +-- .../rest/api/v2010/account/balance.spec.js | 5 +- .../rest/api/v2010/account/call.spec.js | 35 ++++++------- .../api/v2010/account/call/feedback.spec.js | 25 ++++------ .../account/call/feedbackSummary.spec.js | 21 +++----- .../v2010/account/call/notification.spec.js | 31 +++++------- .../api/v2010/account/call/recording.spec.js | 49 +++++++------------ .../rest/api/v2010/account/conference.spec.js | 23 ++++----- .../account/conference/participant.spec.js | 49 +++++++------------ .../account/conference/recording.spec.js | 41 ++++++---------- .../rest/api/v2010/account/connectApp.spec.js | 23 ++++----- .../v2010/account/incomingPhoneNumber.spec.js | 35 ++++++------- .../incomingPhoneNumber/assignedAddOn.spec.js | 39 ++++++--------- .../assignedAddOnExtension.spec.js | 25 ++++------ .../account/incomingPhoneNumber/local.spec.js | 11 ++--- .../incomingPhoneNumber/mobile.spec.js | 11 ++--- .../incomingPhoneNumber/tollFree.spec.js | 11 ++--- .../rest/api/v2010/account/key.spec.js | 31 +++++------- .../rest/api/v2010/account/message.spec.js | 35 ++++++------- .../v2010/account/message/feedback.spec.js | 9 ++-- .../api/v2010/account/message/media.spec.js | 31 +++++------- .../rest/api/v2010/account/newKey.spec.js | 5 +- .../api/v2010/account/newSigningKey.spec.js | 5 +- .../api/v2010/account/notification.spec.js | 23 ++++----- .../v2010/account/outgoingCallerId.spec.js | 31 +++++------- .../rest/api/v2010/account/queue.spec.js | 35 ++++++------- .../api/v2010/account/queue/member.spec.js | 31 +++++------- .../rest/api/v2010/account/recording.spec.js | 23 ++++----- .../account/recording/addOnResult.spec.js | 31 +++++------- .../recording/addOnResult/payload.spec.js | 37 ++++++-------- .../account/recording/transcription.spec.js | 31 +++++------- .../rest/api/v2010/account/shortCode.spec.js | 23 ++++----- .../rest/api/v2010/account/signingKey.spec.js | 31 +++++------- .../rest/api/v2010/account/sip.spec.js | 1 - .../v2010/account/sip/credentialList.spec.js | 35 ++++++------- .../sip/credentialList/credential.spec.js | 49 +++++++------------ .../rest/api/v2010/account/sip/domain.spec.js | 35 ++++++------- .../account/sip/domain/authTypes.spec.js | 1 - .../domain/authTypes/authCallsMapping.spec.js | 1 - .../authCallsCredentialListMapping.spec.js | 39 ++++++--------- ...uthCallsIpAccessControlListMapping.spec.js | 39 ++++++--------- .../authRegistrationsMapping.spec.js | 1 - ...RegistrationsCredentialListMapping.spec.js | 39 ++++++--------- .../sip/domain/credentialListMapping.spec.js | 39 ++++++--------- .../domain/ipAccessControlListMapping.spec.js | 39 ++++++--------- .../account/sip/ipAccessControlList.spec.js | 35 ++++++------- .../sip/ipAccessControlList/ipAddress.spec.js | 49 +++++++------------ .../rest/api/v2010/account/token.spec.js | 5 +- .../api/v2010/account/transcription.spec.js | 23 ++++----- .../rest/api/v2010/account/usage.spec.js | 1 - .../api/v2010/account/usage/record.spec.js | 7 ++- .../account/usage/record/allTime.spec.js | 7 ++- .../v2010/account/usage/record/daily.spec.js | 7 ++- .../account/usage/record/lastMonth.spec.js | 7 ++- .../account/usage/record/monthly.spec.js | 7 ++- .../account/usage/record/thisMonth.spec.js | 7 ++- .../v2010/account/usage/record/today.spec.js | 7 ++- .../v2010/account/usage/record/yearly.spec.js | 7 ++- .../account/usage/record/yesterday.spec.js | 7 ++- .../api/v2010/account/usage/trigger.spec.js | 35 ++++++------- .../v2010/account/validationRequest.spec.js | 5 +- spec/integration/rest/authy/v1/form.spec.js | 5 +- .../integration/rest/authy/v1/service.spec.js | 13 +++-- .../rest/authy/v1/service/entity.spec.js | 21 ++++---- .../authy/v1/service/entity/factor.spec.js | 43 +++++++--------- .../service/entity/factor/challenge.spec.js | 47 +++++++----------- .../rest/autopilot/v1/assistant.spec.js | 13 +++-- .../autopilot/v1/assistant/defaults.spec.js | 9 ++-- .../autopilot/v1/assistant/dialogue.spec.js | 9 ++-- .../autopilot/v1/assistant/fieldType.spec.js | 35 ++++++------- .../v1/assistant/fieldType/fieldValue.spec.js | 39 ++++++--------- .../autopilot/v1/assistant/modelBuild.spec.js | 35 ++++++------- .../rest/autopilot/v1/assistant/query.spec.js | 35 ++++++------- .../autopilot/v1/assistant/styleSheet.spec.js | 9 ++-- .../rest/autopilot/v1/assistant/task.spec.js | 35 ++++++------- .../autopilot/v1/assistant/task/field.spec.js | 39 ++++++--------- .../v1/assistant/task/sample.spec.js | 49 +++++++------------ .../v1/assistant/task/taskActions.spec.js | 17 +++---- .../v1/assistant/task/taskStatistics.spec.js | 9 ++-- .../rest/chat/v1/credential.spec.js | 13 +++-- spec/integration/rest/chat/v1/service.spec.js | 13 +++-- .../rest/chat/v1/service/channel.spec.js | 35 ++++++------- .../chat/v1/service/channel/invite.spec.js | 39 ++++++--------- .../chat/v1/service/channel/member.spec.js | 49 +++++++------------ .../chat/v1/service/channel/message.spec.js | 49 +++++++------------ .../rest/chat/v1/service/role.spec.js | 35 ++++++------- .../rest/chat/v1/service/user.spec.js | 35 ++++++------- .../chat/v1/service/user/userChannel.spec.js | 11 ++--- .../rest/chat/v2/credential.spec.js | 13 +++-- spec/integration/rest/chat/v2/service.spec.js | 13 +++-- .../rest/chat/v2/service/binding.spec.js | 23 ++++----- .../rest/chat/v2/service/channel.spec.js | 35 ++++++------- .../chat/v2/service/channel/invite.spec.js | 39 ++++++--------- .../chat/v2/service/channel/member.spec.js | 49 +++++++------------ .../chat/v2/service/channel/message.spec.js | 49 +++++++------------ .../chat/v2/service/channel/webhook.spec.js | 49 +++++++------------ .../rest/chat/v2/service/role.spec.js | 35 ++++++------- .../rest/chat/v2/service/user.spec.js | 35 ++++++------- .../chat/v2/service/user/userBinding.spec.js | 31 +++++------- .../chat/v2/service/user/userChannel.spec.js | 31 +++++------- spec/integration/rest/fax/v1/fax.spec.js | 13 +++-- .../rest/fax/v1/fax/faxMedia.spec.js | 23 ++++----- .../rest/flexApi/v1/configuration.spec.js | 1 - .../rest/flexApi/v1/flexFlow.spec.js | 13 +++-- .../rest/insights/v1/summary.spec.js | 5 +- .../rest/ipMessaging/v1/credential.spec.js | 13 +++-- .../rest/ipMessaging/v1/service.spec.js | 13 +++-- .../ipMessaging/v1/service/channel.spec.js | 35 ++++++------- .../v1/service/channel/invite.spec.js | 39 ++++++--------- .../v1/service/channel/member.spec.js | 49 +++++++------------ .../v1/service/channel/message.spec.js | 49 +++++++------------ .../rest/ipMessaging/v1/service/role.spec.js | 35 ++++++------- .../rest/ipMessaging/v1/service/user.spec.js | 35 ++++++------- .../v1/service/user/userChannel.spec.js | 11 ++--- .../rest/ipMessaging/v2/credential.spec.js | 13 +++-- .../rest/ipMessaging/v2/service.spec.js | 13 +++-- .../ipMessaging/v2/service/binding.spec.js | 23 ++++----- .../ipMessaging/v2/service/channel.spec.js | 35 ++++++------- .../v2/service/channel/invite.spec.js | 39 ++++++--------- .../v2/service/channel/member.spec.js | 49 +++++++------------ .../v2/service/channel/message.spec.js | 49 +++++++------------ .../v2/service/channel/webhook.spec.js | 49 +++++++------------ .../rest/ipMessaging/v2/service/role.spec.js | 35 ++++++------- .../rest/ipMessaging/v2/service/user.spec.js | 35 ++++++------- .../v2/service/user/userBinding.spec.js | 31 +++++------- .../v2/service/user/userChannel.spec.js | 31 +++++------- .../rest/lookups/v1/phoneNumber.spec.js | 5 +- .../rest/messaging/v1/service.spec.js | 13 +++-- .../messaging/v1/service/alphaSender.spec.js | 27 +++++----- .../messaging/v1/service/phoneNumber.spec.js | 27 +++++----- .../messaging/v1/service/shortCode.spec.js | 27 +++++----- .../rest/messaging/v1/session.spec.js | 13 +++-- .../rest/messaging/v1/session/message.spec.js | 35 ++++++------- .../messaging/v1/session/participant.spec.js | 35 ++++++------- .../rest/messaging/v1/session/webhook.spec.js | 35 ++++++------- .../rest/messaging/v1/webhook.spec.js | 1 - .../integration/rest/monitor/v1/alert.spec.js | 9 ++-- .../integration/rest/monitor/v1/event.spec.js | 5 +- .../rest/notify/v1/credential.spec.js | 13 +++-- .../rest/notify/v1/service.spec.js | 13 +++-- .../rest/notify/v1/service/binding.spec.js | 27 +++++----- .../notify/v1/service/notification.spec.js | 5 +- .../rest/preview/acc_security/service.spec.js | 9 ++-- .../acc_security/service/verification.spec.js | 5 +- .../service/verificationCheck.spec.js | 5 +- .../rest/preview/bulk_exports/export.spec.js | 5 +- .../preview/bulk_exports/export/day.spec.js | 7 ++- .../bulk_exports/exportConfiguration.spec.js | 9 ++-- .../preview/deployed_devices/fleet.spec.js | 13 +++-- .../fleet/certificate.spec.js | 35 ++++++------- .../deployed_devices/fleet/deployment.spec.js | 35 ++++++------- .../deployed_devices/fleet/device.spec.js | 35 ++++++------- .../deployed_devices/fleet/key.spec.js | 35 ++++++------- .../authorizationDocument.spec.js | 9 ++-- .../dependentHostedNumberOrder.spec.js | 7 ++- .../hosted_numbers/hostedNumberOrder.spec.js | 13 +++-- .../marketplace/availableAddOn.spec.js | 5 +- .../availableAddOnExtension.spec.js | 15 +++--- .../marketplace/installedAddOn.spec.js | 13 +++-- .../installedAddOnExtension.spec.js | 23 ++++----- .../rest/preview/sync/service.spec.js | 13 +++-- .../preview/sync/service/document.spec.js | 35 ++++++------- .../document/documentPermission.spec.js | 41 ++++++---------- .../preview/sync/service/syncList.spec.js | 27 +++++----- .../service/syncList/syncListItem.spec.js | 49 +++++++------------ .../syncList/syncListPermission.spec.js | 41 ++++++---------- .../rest/preview/sync/service/syncMap.spec.js | 27 +++++----- .../sync/service/syncMap/syncMapItem.spec.js | 49 +++++++------------ .../service/syncMap/syncMapPermission.spec.js | 41 ++++++---------- .../rest/preview/understand/assistant.spec.js | 13 +++-- .../assistantFallbackActions.spec.js | 9 ++-- .../assistantInitiationActions.spec.js | 9 ++-- .../understand/assistant/dialogue.spec.js | 9 ++-- .../understand/assistant/fieldType.spec.js | 35 ++++++------- .../assistant/fieldType/fieldValue.spec.js | 39 ++++++--------- .../understand/assistant/modelBuild.spec.js | 35 ++++++------- .../understand/assistant/query.spec.js | 35 ++++++------- .../understand/assistant/styleSheet.spec.js | 9 ++-- .../preview/understand/assistant/task.spec.js | 35 ++++++------- .../understand/assistant/task/field.spec.js | 39 ++++++--------- .../understand/assistant/task/sample.spec.js | 49 +++++++------------ .../assistant/task/taskActions.spec.js | 17 +++---- .../assistant/task/taskStatistics.spec.js | 9 ++-- .../rest/preview/wireless/command.spec.js | 5 +- .../rest/preview/wireless/ratePlan.spec.js | 13 +++-- .../rest/preview/wireless/sim.spec.js | 9 ++-- .../rest/preview/wireless/sim/usage.spec.js | 5 +- .../rest/pricing/v1/messaging.spec.js | 1 - .../rest/pricing/v1/messaging/country.spec.js | 5 +- .../rest/pricing/v1/phoneNumber.spec.js | 1 - .../pricing/v1/phoneNumber/country.spec.js | 5 +- .../integration/rest/pricing/v1/voice.spec.js | 1 - .../rest/pricing/v1/voice/country.spec.js | 5 +- .../rest/pricing/v1/voice/number.spec.js | 5 +- .../integration/rest/pricing/v2/voice.spec.js | 1 - .../rest/pricing/v2/voice/country.spec.js | 5 +- .../rest/pricing/v2/voice/number.spec.js | 5 +- .../integration/rest/proxy/v1/service.spec.js | 13 +++-- .../rest/proxy/v1/service/phoneNumber.spec.js | 35 ++++++------- .../rest/proxy/v1/service/session.spec.js | 33 +++++-------- .../v1/service/session/interaction.spec.js | 29 +++++------ .../v1/service/session/participant.spec.js | 37 ++++++-------- .../participant/messageInteraction.spec.js | 33 +++++-------- .../rest/proxy/v1/service/shortCode.spec.js | 35 ++++++------- .../rest/serverless/v1/service.spec.js | 9 ++-- .../rest/serverless/v1/service/asset.spec.js | 25 ++++------ .../v1/service/asset/assetVersion.spec.js | 27 ++++------ .../rest/serverless/v1/service/build.spec.js | 17 +++---- .../serverless/v1/service/environment.spec.js | 17 +++---- .../v1/service/environment/deployment.spec.js | 27 ++++------ .../v1/service/environment/variable.spec.js | 37 ++++++-------- .../serverless/v1/service/function.spec.js | 25 ++++------ .../service/function/functionVersion.spec.js | 27 ++++------ spec/integration/rest/studio/v1/flow.spec.js | 9 ++-- .../rest/studio/v1/flow/engagement.spec.js | 25 ++++------ .../flow/engagement/engagementContext.spec.js | 9 ++-- .../studio/v1/flow/engagement/step.spec.js | 19 +++---- .../flow/engagement/step/stepContext.spec.js | 11 ++--- .../rest/studio/v1/flow/execution.spec.js | 25 ++++------ .../flow/execution/executionContext.spec.js | 9 ++-- .../v1/flow/execution/executionStep.spec.js | 19 +++---- .../executionStepContext.spec.js | 11 ++--- spec/integration/rest/sync/v1/service.spec.js | 13 +++-- .../rest/sync/v1/service/document.spec.js | 35 ++++++------- .../document/documentPermission.spec.js | 41 ++++++---------- .../rest/sync/v1/service/syncList.spec.js | 35 ++++++------- .../v1/service/syncList/syncListItem.spec.js | 49 +++++++------------ .../syncList/syncListPermission.spec.js | 41 ++++++---------- .../rest/sync/v1/service/syncMap.spec.js | 35 ++++++------- .../v1/service/syncMap/syncMapItem.spec.js | 49 +++++++------------ .../service/syncMap/syncMapPermission.spec.js | 41 ++++++---------- .../rest/sync/v1/service/syncStream.spec.js | 35 ++++++------- .../service/syncStream/streamMessage.spec.js | 9 ++-- .../rest/taskrouter/v1/workspace.spec.js | 13 +++-- .../taskrouter/v1/workspace/activity.spec.js | 35 ++++++------- .../taskrouter/v1/workspace/event.spec.js | 15 +++--- .../rest/taskrouter/v1/workspace/task.spec.js | 35 ++++++------- .../v1/workspace/task/reservation.spec.js | 31 +++++------- .../v1/workspace/taskChannel.spec.js | 35 ++++++------- .../taskrouter/v1/workspace/taskQueue.spec.js | 35 ++++++------- .../taskQueueCumulativeStatistics.spec.js | 9 ++-- .../taskQueueRealTimeStatistics.spec.js | 9 ++-- .../taskQueue/taskQueueStatistics.spec.js | 9 ++-- .../taskQueue/taskQueuesStatistics.spec.js | 7 ++- .../taskrouter/v1/workspace/worker.spec.js | 35 ++++++------- .../v1/workspace/worker/reservation.spec.js | 31 +++++------- .../v1/workspace/worker/workerChannel.spec.js | 31 +++++------- .../workspace/worker/workerStatistics.spec.js | 9 ++-- .../workersCumulativeStatistics.spec.js | 5 +- .../worker/workersRealTimeStatistics.spec.js | 5 +- .../worker/workersStatistics.spec.js | 5 +- .../taskrouter/v1/workspace/workflow.spec.js | 35 ++++++------- .../workflowCumulativeStatistics.spec.js | 9 ++-- .../workflowRealTimeStatistics.spec.js | 9 ++-- .../workflow/workflowStatistics.spec.js | 9 ++-- .../workspaceCumulativeStatistics.spec.js | 5 +- .../workspaceRealTimeStatistics.spec.js | 5 +- .../v1/workspace/workspaceStatistics.spec.js | 5 +- .../rest/trunking/v1/trunk.spec.js | 13 +++-- .../trunking/v1/trunk/credentialList.spec.js | 27 +++++----- .../v1/trunk/ipAccessControlList.spec.js | 27 +++++----- .../trunking/v1/trunk/originationUrl.spec.js | 35 ++++++------- .../trunking/v1/trunk/phoneNumber.spec.js | 27 +++++----- .../v1/trunk/terminatingSipDomain.spec.js | 27 +++++----- .../rest/verify/v2/service.spec.js | 13 +++-- .../verify/v2/service/verification.spec.js | 15 +++--- .../v2/service/verificationCheck.spec.js | 5 +- .../rest/video/v1/composition.spec.js | 9 ++-- .../rest/video/v1/compositionHook.spec.js | 13 +++-- .../rest/video/v1/compositionSettings.spec.js | 1 - .../rest/video/v1/recording.spec.js | 9 ++-- .../rest/video/v1/recordingSettings.spec.js | 1 - spec/integration/rest/video/v1/room.spec.js | 9 ++-- .../rest/video/v1/room/recording.spec.js | 23 ++++----- .../video/v1/room/roomParticipant.spec.js | 23 ++++----- .../roomParticipantPublishedTrack.spec.js | 19 +++---- .../roomParticipantSubscribedTrack.spec.js | 19 +++---- .../rest/voice/v1/dialingPermissions.spec.js | 1 - .../bulkCountryUpdate.spec.js | 1 - .../v1/dialingPermissions/country.spec.js | 5 +- .../country/highriskSpecialPrefix.spec.js | 7 ++- .../v1/dialingPermissions/settings.spec.js | 1 - .../rest/wireless/v1/command.spec.js | 9 ++-- .../rest/wireless/v1/ratePlan.spec.js | 13 +++-- spec/integration/rest/wireless/v1/sim.spec.js | 13 +++-- .../rest/wireless/v1/sim/dataSession.spec.js | 7 ++- .../rest/wireless/v1/sim/usageRecord.spec.js | 7 ++- 594 files changed, 3099 insertions(+), 5413 deletions(-) diff --git a/Makefile b/Makefile index 1aba51608c..e6c461fcb9 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ test: docs: npm run jsdoc -clean: node_modules +clean: rm -rf node_modules API_DEFINITIONS_SHA=$(shell git log --oneline | grep Regenerated | head -n1 | cut -d ' ' -f 5) diff --git a/lib/rest/accounts/v1/credential/aws.js b/lib/rest/accounts/v1/credential/aws.js index 8411dec7f2..9c8016cbd7 100644 --- a/lib/rest/accounts/v1/credential/aws.js +++ b/lib/rest/accounts/v1/credential/aws.js @@ -49,9 +49,7 @@ AwsList = function AwsList(version) { AwsListInstance._version = version; // Path Solution AwsListInstance._solution = {}; - AwsListInstance._uri = _.template( - '/Credentials/AWS' // jshint ignore:line - )(AwsListInstance._solution); + AwsListInstance._uri = `/Credentials/AWS`; /* jshint ignore:start */ /** * Streams AwsInstance records from the API. @@ -587,9 +585,7 @@ AwsContext = function AwsContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/AWS/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/AWS/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/accounts/v1/credential/publicKey.js b/lib/rest/accounts/v1/credential/publicKey.js index dd453d20e1..b0abc95cb6 100644 --- a/lib/rest/accounts/v1/credential/publicKey.js +++ b/lib/rest/accounts/v1/credential/publicKey.js @@ -49,9 +49,7 @@ PublicKeyList = function PublicKeyList(version) { PublicKeyListInstance._version = version; // Path Solution PublicKeyListInstance._solution = {}; - PublicKeyListInstance._uri = _.template( - '/Credentials/PublicKeys' // jshint ignore:line - )(PublicKeyListInstance._solution); + PublicKeyListInstance._uri = `/Credentials/PublicKeys`; /* jshint ignore:start */ /** * Streams PublicKeyInstance records from the API. @@ -589,9 +587,7 @@ PublicKeyContext = function PublicKeyContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/PublicKeys/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/PublicKeys/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account.js b/lib/rest/api/v2010/account.js index ca48d644fb..99eb311bf2 100644 --- a/lib/rest/api/v2010/account.js +++ b/lib/rest/api/v2010/account.js @@ -78,9 +78,7 @@ AccountList = function AccountList(version) { AccountListInstance._version = version; // Path Solution AccountListInstance._solution = {}; - AccountListInstance._uri = _.template( - '/Accounts.json' // jshint ignore:line - )(AccountListInstance._solution); + AccountListInstance._uri = `/Accounts.json`; /* jshint ignore:start */ /** * create a AccountInstance @@ -991,9 +989,7 @@ AccountContext = function AccountContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Accounts/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${sid}.json`; // Dependents this._addresses = undefined; diff --git a/lib/rest/api/v2010/account/address.js b/lib/rest/api/v2010/account/address.js index 8f0060c5f9..c1dff990a5 100644 --- a/lib/rest/api/v2010/account/address.js +++ b/lib/rest/api/v2010/account/address.js @@ -54,9 +54,7 @@ AddressList = function AddressList(version, accountSid) { AddressListInstance._version = version; // Path Solution AddressListInstance._solution = {accountSid: accountSid}; - AddressListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Addresses.json' // jshint ignore:line - )(AddressListInstance._solution); + AddressListInstance._uri = `/Accounts/${accountSid}/Addresses.json`; /* jshint ignore:start */ /** * create a AddressInstance @@ -699,9 +697,7 @@ AddressContext = function AddressContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Addresses/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Addresses/${sid}.json`; // Dependents this._dependentPhoneNumbers = undefined; diff --git a/lib/rest/api/v2010/account/address/dependentPhoneNumber.js b/lib/rest/api/v2010/account/address/dependentPhoneNumber.js index 10d5553432..31263d4bce 100644 --- a/lib/rest/api/v2010/account/address/dependentPhoneNumber.js +++ b/lib/rest/api/v2010/account/address/dependentPhoneNumber.js @@ -51,9 +51,7 @@ DependentPhoneNumberList = function DependentPhoneNumberList(version, DependentPhoneNumberListInstance._version = version; // Path Solution DependentPhoneNumberListInstance._solution = {accountSid: accountSid, addressSid: addressSid}; - DependentPhoneNumberListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Addresses/<%= addressSid %>/DependentPhoneNumbers.json' // jshint ignore:line - )(DependentPhoneNumberListInstance._solution); + DependentPhoneNumberListInstance._uri = `/Accounts/${accountSid}/Addresses/${addressSid}/DependentPhoneNumbers.json`; /* jshint ignore:start */ /** * Streams DependentPhoneNumberInstance records from the API. diff --git a/lib/rest/api/v2010/account/application.js b/lib/rest/api/v2010/account/application.js index 94de803862..5bccf71f26 100644 --- a/lib/rest/api/v2010/account/application.js +++ b/lib/rest/api/v2010/account/application.js @@ -51,9 +51,7 @@ ApplicationList = function ApplicationList(version, accountSid) { ApplicationListInstance._version = version; // Path Solution ApplicationListInstance._solution = {accountSid: accountSid}; - ApplicationListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Applications.json' // jshint ignore:line - )(ApplicationListInstance._solution); + ApplicationListInstance._uri = `/Accounts/${accountSid}/Applications.json`; /* jshint ignore:start */ /** * create a ApplicationInstance @@ -710,9 +708,7 @@ ApplicationContext = function ApplicationContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Applications/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Applications/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/authorizedConnectApp.js b/lib/rest/api/v2010/account/authorizedConnectApp.js index c6d4166822..9557f7ba27 100644 --- a/lib/rest/api/v2010/account/authorizedConnectApp.js +++ b/lib/rest/api/v2010/account/authorizedConnectApp.js @@ -51,9 +51,7 @@ AuthorizedConnectAppList = function AuthorizedConnectAppList(version, AuthorizedConnectAppListInstance._version = version; // Path Solution AuthorizedConnectAppListInstance._solution = {accountSid: accountSid}; - AuthorizedConnectAppListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AuthorizedConnectApps.json' // jshint ignore:line - )(AuthorizedConnectAppListInstance._solution); + AuthorizedConnectAppListInstance._uri = `/Accounts/${accountSid}/AuthorizedConnectApps.json`; /* jshint ignore:start */ /** * Streams AuthorizedConnectAppInstance records from the API. @@ -529,9 +527,7 @@ AuthorizedConnectAppContext = function AuthorizedConnectAppContext(version, // Path Solution this._solution = {accountSid: accountSid, connectAppSid: connectAppSid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/AuthorizedConnectApps/<%= connectAppSid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/AuthorizedConnectApps/${connectAppSid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/availablePhoneNumber.js b/lib/rest/api/v2010/account/availablePhoneNumber.js index 7bada0e939..f520430794 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber.js @@ -59,9 +59,7 @@ AvailablePhoneNumberCountryList = function AvailablePhoneNumberCountryListInstance._version = version; // Path Solution AvailablePhoneNumberCountryListInstance._solution = {accountSid: accountSid}; - AvailablePhoneNumberCountryListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers.json' // jshint ignore:line - )(AvailablePhoneNumberCountryListInstance._solution); + AvailablePhoneNumberCountryListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers.json`; /* jshint ignore:start */ /** * Streams AvailablePhoneNumberCountryInstance records from the API. @@ -652,9 +650,7 @@ AvailablePhoneNumberCountryContext = function // Path Solution this._solution = {accountSid: accountSid, countryCode: countryCode, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}.json`; // Dependents this._local = undefined; diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/local.js b/lib/rest/api/v2010/account/availablePhoneNumber/local.js index c48d02a2a7..d90a15dad6 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/local.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/local.js @@ -52,9 +52,7 @@ LocalList = function LocalList(version, accountSid, countryCode) { LocalListInstance._version = version; // Path Solution LocalListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - LocalListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Local.json' // jshint ignore:line - )(LocalListInstance._solution); + LocalListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Local.json`; /* jshint ignore:start */ /** * Streams LocalInstance records from the API. diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/machineToMachine.js b/lib/rest/api/v2010/account/availablePhoneNumber/machineToMachine.js index 0a9c8100d4..bd2be6b540 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/machineToMachine.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/machineToMachine.js @@ -53,9 +53,7 @@ MachineToMachineList = function MachineToMachineList(version, accountSid, MachineToMachineListInstance._version = version; // Path Solution MachineToMachineListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - MachineToMachineListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/MachineToMachine.json' // jshint ignore:line - )(MachineToMachineListInstance._solution); + MachineToMachineListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/MachineToMachine.json`; /* jshint ignore:start */ /** * Streams MachineToMachineInstance records from the API. diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/mobile.js b/lib/rest/api/v2010/account/availablePhoneNumber/mobile.js index 269203ec0a..b5079e7b82 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/mobile.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/mobile.js @@ -52,9 +52,7 @@ MobileList = function MobileList(version, accountSid, countryCode) { MobileListInstance._version = version; // Path Solution MobileListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - MobileListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Mobile.json' // jshint ignore:line - )(MobileListInstance._solution); + MobileListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Mobile.json`; /* jshint ignore:start */ /** * Streams MobileInstance records from the API. diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/national.js b/lib/rest/api/v2010/account/availablePhoneNumber/national.js index 1bd2ad9640..05362cd7c6 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/national.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/national.js @@ -52,9 +52,7 @@ NationalList = function NationalList(version, accountSid, countryCode) { NationalListInstance._version = version; // Path Solution NationalListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - NationalListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/National.json' // jshint ignore:line - )(NationalListInstance._solution); + NationalListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/National.json`; /* jshint ignore:start */ /** * Streams NationalInstance records from the API. diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/sharedCost.js b/lib/rest/api/v2010/account/availablePhoneNumber/sharedCost.js index 5732748504..3dd076593c 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/sharedCost.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/sharedCost.js @@ -52,9 +52,7 @@ SharedCostList = function SharedCostList(version, accountSid, countryCode) { SharedCostListInstance._version = version; // Path Solution SharedCostListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - SharedCostListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/SharedCost.json' // jshint ignore:line - )(SharedCostListInstance._solution); + SharedCostListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/SharedCost.json`; /* jshint ignore:start */ /** * Streams SharedCostInstance records from the API. diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/tollFree.js b/lib/rest/api/v2010/account/availablePhoneNumber/tollFree.js index ac4b74a9a1..a129b1d350 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/tollFree.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/tollFree.js @@ -52,9 +52,7 @@ TollFreeList = function TollFreeList(version, accountSid, countryCode) { TollFreeListInstance._version = version; // Path Solution TollFreeListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - TollFreeListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/TollFree.json' // jshint ignore:line - )(TollFreeListInstance._solution); + TollFreeListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/TollFree.json`; /* jshint ignore:start */ /** * Streams TollFreeInstance records from the API. diff --git a/lib/rest/api/v2010/account/availablePhoneNumber/voip.js b/lib/rest/api/v2010/account/availablePhoneNumber/voip.js index 96342f8161..a3eb5c1d35 100644 --- a/lib/rest/api/v2010/account/availablePhoneNumber/voip.js +++ b/lib/rest/api/v2010/account/availablePhoneNumber/voip.js @@ -52,9 +52,7 @@ VoipList = function VoipList(version, accountSid, countryCode) { VoipListInstance._version = version; // Path Solution VoipListInstance._solution = {accountSid: accountSid, countryCode: countryCode}; - VoipListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Voip.json' // jshint ignore:line - )(VoipListInstance._solution); + VoipListInstance._uri = `/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Voip.json`; /* jshint ignore:start */ /** * Streams VoipInstance records from the API. diff --git a/lib/rest/api/v2010/account/balance.js b/lib/rest/api/v2010/account/balance.js index 844d1a0623..cde75154a5 100644 --- a/lib/rest/api/v2010/account/balance.js +++ b/lib/rest/api/v2010/account/balance.js @@ -47,9 +47,7 @@ BalanceList = function BalanceList(version, accountSid) { BalanceListInstance._version = version; // Path Solution BalanceListInstance._solution = {accountSid: accountSid}; - BalanceListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Balance.json' // jshint ignore:line - )(BalanceListInstance._solution); + BalanceListInstance._uri = `/Accounts/${accountSid}/Balance.json`; /* jshint ignore:start */ /** * fetch a BalanceInstance diff --git a/lib/rest/api/v2010/account/call.js b/lib/rest/api/v2010/account/call.js index 514c14e4fa..d7fc89da05 100644 --- a/lib/rest/api/v2010/account/call.js +++ b/lib/rest/api/v2010/account/call.js @@ -55,9 +55,7 @@ CallList = function CallList(version, accountSid) { CallListInstance._version = version; // Path Solution CallListInstance._solution = {accountSid: accountSid}; - CallListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Calls.json' // jshint ignore:line - )(CallListInstance._solution); + CallListInstance._uri = `/Accounts/${accountSid}/Calls.json`; // Components CallListInstance._feedbackSummaries = undefined; @@ -857,9 +855,7 @@ CallContext = function CallContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Calls/${sid}.json`; // Dependents this._recordings = undefined; diff --git a/lib/rest/api/v2010/account/call/feedback.js b/lib/rest/api/v2010/account/call/feedback.js index de219a80c9..1afdb41160 100644 --- a/lib/rest/api/v2010/account/call/feedback.js +++ b/lib/rest/api/v2010/account/call/feedback.js @@ -308,9 +308,7 @@ FeedbackContext = function FeedbackContext(version, accountSid, callSid) { // Path Solution this._solution = {accountSid: accountSid, callSid: callSid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Feedback.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Feedback.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/call/feedbackSummary.js b/lib/rest/api/v2010/account/call/feedbackSummary.js index 1a21f24faa..e65e818610 100644 --- a/lib/rest/api/v2010/account/call/feedbackSummary.js +++ b/lib/rest/api/v2010/account/call/feedbackSummary.js @@ -52,9 +52,7 @@ FeedbackSummaryList = function FeedbackSummaryList(version, accountSid) { FeedbackSummaryListInstance._version = version; // Path Solution FeedbackSummaryListInstance._solution = {accountSid: accountSid}; - FeedbackSummaryListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/FeedbackSummary.json' // jshint ignore:line - )(FeedbackSummaryListInstance._solution); + FeedbackSummaryListInstance._uri = `/Accounts/${accountSid}/Calls/FeedbackSummary.json`; /* jshint ignore:start */ /** * create a FeedbackSummaryInstance @@ -373,9 +371,7 @@ FeedbackSummaryContext = function FeedbackSummaryContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/FeedbackSummary/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Calls/FeedbackSummary/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/call/notification.js b/lib/rest/api/v2010/account/call/notification.js index 25e1220f03..fd9a09c244 100644 --- a/lib/rest/api/v2010/account/call/notification.js +++ b/lib/rest/api/v2010/account/call/notification.js @@ -53,9 +53,7 @@ NotificationList = function NotificationList(version, accountSid, callSid) { NotificationListInstance._version = version; // Path Solution NotificationListInstance._solution = {accountSid: accountSid, callSid: callSid}; - NotificationListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Notifications.json' // jshint ignore:line - )(NotificationListInstance._solution); + NotificationListInstance._uri = `/Accounts/${accountSid}/Calls/${callSid}/Notifications.json`; /* jshint ignore:start */ /** * Streams NotificationInstance records from the API. @@ -590,9 +588,7 @@ NotificationContext = function NotificationContext(version, accountSid, callSid, // Path Solution this._solution = {accountSid: accountSid, callSid: callSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Notifications/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Notifications/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/call/recording.js b/lib/rest/api/v2010/account/call/recording.js index b18bedefbd..c9b1f23fe6 100644 --- a/lib/rest/api/v2010/account/call/recording.js +++ b/lib/rest/api/v2010/account/call/recording.js @@ -53,9 +53,7 @@ RecordingList = function RecordingList(version, accountSid, callSid) { RecordingListInstance._version = version; // Path Solution RecordingListInstance._solution = {accountSid: accountSid, callSid: callSid}; - RecordingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings.json' // jshint ignore:line - )(RecordingListInstance._solution); + RecordingListInstance._uri = `/Accounts/${accountSid}/Calls/${callSid}/Recordings.json`; /* jshint ignore:start */ /** * create a RecordingInstance @@ -668,9 +666,7 @@ RecordingContext = function RecordingContext(version, accountSid, callSid, sid) // Path Solution this._solution = {accountSid: accountSid, callSid: callSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Calls/${callSid}/Recordings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/conference.js b/lib/rest/api/v2010/account/conference.js index 9a074a911e..7793e045c3 100644 --- a/lib/rest/api/v2010/account/conference.js +++ b/lib/rest/api/v2010/account/conference.js @@ -53,9 +53,7 @@ ConferenceList = function ConferenceList(version, accountSid) { ConferenceListInstance._version = version; // Path Solution ConferenceListInstance._solution = {accountSid: accountSid}; - ConferenceListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Conferences.json' // jshint ignore:line - )(ConferenceListInstance._solution); + ConferenceListInstance._uri = `/Accounts/${accountSid}/Conferences.json`; /* jshint ignore:start */ /** * Streams ConferenceInstance records from the API. @@ -631,9 +629,7 @@ ConferenceContext = function ConferenceContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Conferences/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Conferences/${sid}.json`; // Dependents this._participants = undefined; diff --git a/lib/rest/api/v2010/account/conference/participant.js b/lib/rest/api/v2010/account/conference/participant.js index 91da92b8d9..c9e22a12c7 100644 --- a/lib/rest/api/v2010/account/conference/participant.js +++ b/lib/rest/api/v2010/account/conference/participant.js @@ -53,9 +53,7 @@ ParticipantList = function ParticipantList(version, accountSid, conferenceSid) { ParticipantListInstance._version = version; // Path Solution ParticipantListInstance._solution = {accountSid: accountSid, conferenceSid: conferenceSid}; - ParticipantListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants.json' // jshint ignore:line - )(ParticipantListInstance._solution); + ParticipantListInstance._uri = `/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants.json`; /* jshint ignore:start */ /** * create a ParticipantInstance @@ -771,9 +769,7 @@ ParticipantContext = function ParticipantContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, conferenceSid: conferenceSid, callSid: callSid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants/<%= callSid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants/${callSid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/conference/recording.js b/lib/rest/api/v2010/account/conference/recording.js index abfe3bf125..5a392bf983 100644 --- a/lib/rest/api/v2010/account/conference/recording.js +++ b/lib/rest/api/v2010/account/conference/recording.js @@ -54,9 +54,7 @@ RecordingList = function RecordingList(version, accountSid, conferenceSid) { RecordingListInstance._version = version; // Path Solution RecordingListInstance._solution = {accountSid: accountSid, conferenceSid: conferenceSid}; - RecordingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings.json' // jshint ignore:line - )(RecordingListInstance._solution); + RecordingListInstance._uri = `/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings.json`; /* jshint ignore:start */ /** * Streams RecordingInstance records from the API. @@ -614,9 +612,7 @@ RecordingContext = function RecordingContext(version, accountSid, conferenceSid, // Path Solution this._solution = {accountSid: accountSid, conferenceSid: conferenceSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/connectApp.js b/lib/rest/api/v2010/account/connectApp.js index 2e804d100b..91e03c3cdd 100644 --- a/lib/rest/api/v2010/account/connectApp.js +++ b/lib/rest/api/v2010/account/connectApp.js @@ -49,9 +49,7 @@ ConnectAppList = function ConnectAppList(version, accountSid) { ConnectAppListInstance._version = version; // Path Solution ConnectAppListInstance._solution = {accountSid: accountSid}; - ConnectAppListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/ConnectApps.json' // jshint ignore:line - )(ConnectAppListInstance._solution); + ConnectAppListInstance._uri = `/Accounts/${accountSid}/ConnectApps.json`; /* jshint ignore:start */ /** * Streams ConnectAppInstance records from the API. @@ -551,9 +549,7 @@ ConnectAppContext = function ConnectAppContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/ConnectApps/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/ConnectApps/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/incomingPhoneNumber.js b/lib/rest/api/v2010/account/incomingPhoneNumber.js index 214488c37b..5514e5f167 100644 --- a/lib/rest/api/v2010/account/incomingPhoneNumber.js +++ b/lib/rest/api/v2010/account/incomingPhoneNumber.js @@ -57,9 +57,7 @@ IncomingPhoneNumberList = function IncomingPhoneNumberList(version, accountSid) IncomingPhoneNumberListInstance._version = version; // Path Solution IncomingPhoneNumberListInstance._solution = {accountSid: accountSid}; - IncomingPhoneNumberListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers.json' // jshint ignore:line - )(IncomingPhoneNumberListInstance._solution); + IncomingPhoneNumberListInstance._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers.json`; // Components IncomingPhoneNumberListInstance._local = undefined; @@ -860,9 +858,7 @@ IncomingPhoneNumberContext = function IncomingPhoneNumberContext(version, // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/${sid}.json`; // Dependents this._assignedAddOns = undefined; diff --git a/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.js b/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.js index 85c20a174c..a903b036cf 100644 --- a/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.js +++ b/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.js @@ -58,9 +58,7 @@ AssignedAddOnList = function AssignedAddOnList(version, accountSid, resourceSid) AssignedAddOnListInstance._version = version; // Path Solution AssignedAddOnListInstance._solution = {accountSid: accountSid, resourceSid: resourceSid}; - AssignedAddOnListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns.json' // jshint ignore:line - )(AssignedAddOnListInstance._solution); + AssignedAddOnListInstance._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns.json`; /* jshint ignore:start */ /** * Streams AssignedAddOnInstance records from the API. @@ -645,9 +643,7 @@ AssignedAddOnContext = function AssignedAddOnContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, resourceSid: resourceSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${sid}.json`; // Dependents this._extensions = undefined; diff --git a/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.js b/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.js index f0deb94ddf..03b785571d 100644 --- a/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.js +++ b/lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.js @@ -60,9 +60,7 @@ AssignedAddOnExtensionList = function AssignedAddOnExtensionList(version, resourceSid: resourceSid, assignedAddOnSid: assignedAddOnSid }; - AssignedAddOnExtensionListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= assignedAddOnSid %>/Extensions.json' // jshint ignore:line - )(AssignedAddOnExtensionListInstance._solution); + AssignedAddOnExtensionListInstance._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${assignedAddOnSid}/Extensions.json`; /* jshint ignore:start */ /** * Streams AssignedAddOnExtensionInstance records from the API. @@ -580,9 +578,7 @@ AssignedAddOnExtensionContext = function AssignedAddOnExtensionContext(version, assignedAddOnSid: assignedAddOnSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= assignedAddOnSid %>/Extensions/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${assignedAddOnSid}/Extensions/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/incomingPhoneNumber/local.js b/lib/rest/api/v2010/account/incomingPhoneNumber/local.js index 0cb0a52b24..3accd701c2 100644 --- a/lib/rest/api/v2010/account/incomingPhoneNumber/local.js +++ b/lib/rest/api/v2010/account/incomingPhoneNumber/local.js @@ -51,9 +51,7 @@ LocalList = function LocalList(version, accountSid) { LocalListInstance._version = version; // Path Solution LocalListInstance._solution = {accountSid: accountSid}; - LocalListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Local.json' // jshint ignore:line - )(LocalListInstance._solution); + LocalListInstance._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/Local.json`; /* jshint ignore:start */ /** * Streams LocalInstance records from the API. diff --git a/lib/rest/api/v2010/account/incomingPhoneNumber/mobile.js b/lib/rest/api/v2010/account/incomingPhoneNumber/mobile.js index 6461a27728..48d2301558 100644 --- a/lib/rest/api/v2010/account/incomingPhoneNumber/mobile.js +++ b/lib/rest/api/v2010/account/incomingPhoneNumber/mobile.js @@ -51,9 +51,7 @@ MobileList = function MobileList(version, accountSid) { MobileListInstance._version = version; // Path Solution MobileListInstance._solution = {accountSid: accountSid}; - MobileListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Mobile.json' // jshint ignore:line - )(MobileListInstance._solution); + MobileListInstance._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/Mobile.json`; /* jshint ignore:start */ /** * Streams MobileInstance records from the API. diff --git a/lib/rest/api/v2010/account/incomingPhoneNumber/tollFree.js b/lib/rest/api/v2010/account/incomingPhoneNumber/tollFree.js index f80cb31575..a91ae9dd66 100644 --- a/lib/rest/api/v2010/account/incomingPhoneNumber/tollFree.js +++ b/lib/rest/api/v2010/account/incomingPhoneNumber/tollFree.js @@ -51,9 +51,7 @@ TollFreeList = function TollFreeList(version, accountSid) { TollFreeListInstance._version = version; // Path Solution TollFreeListInstance._solution = {accountSid: accountSid}; - TollFreeListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/IncomingPhoneNumbers/TollFree.json' // jshint ignore:line - )(TollFreeListInstance._solution); + TollFreeListInstance._uri = `/Accounts/${accountSid}/IncomingPhoneNumbers/TollFree.json`; /* jshint ignore:start */ /** * Streams TollFreeInstance records from the API. diff --git a/lib/rest/api/v2010/account/key.js b/lib/rest/api/v2010/account/key.js index ab0d87cd77..0c7ced9bbb 100644 --- a/lib/rest/api/v2010/account/key.js +++ b/lib/rest/api/v2010/account/key.js @@ -51,9 +51,7 @@ KeyList = function KeyList(version, accountSid) { KeyListInstance._version = version; // Path Solution KeyListInstance._solution = {accountSid: accountSid}; - KeyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Keys.json' // jshint ignore:line - )(KeyListInstance._solution); + KeyListInstance._uri = `/Accounts/${accountSid}/Keys.json`; /* jshint ignore:start */ /** * Streams KeyInstance records from the API. @@ -538,9 +536,7 @@ KeyContext = function KeyContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Keys/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Keys/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/message.js b/lib/rest/api/v2010/account/message.js index 80bdd1cb1b..58c3c4f91b 100644 --- a/lib/rest/api/v2010/account/message.js +++ b/lib/rest/api/v2010/account/message.js @@ -53,9 +53,7 @@ MessageList = function MessageList(version, accountSid) { MessageListInstance._version = version; // Path Solution MessageListInstance._solution = {accountSid: accountSid}; - MessageListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Messages.json' // jshint ignore:line - )(MessageListInstance._solution); + MessageListInstance._uri = `/Accounts/${accountSid}/Messages.json`; /* jshint ignore:start */ /** * create a MessageInstance @@ -715,9 +713,7 @@ MessageContext = function MessageContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Messages/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Messages/${sid}.json`; // Dependents this._media = undefined; diff --git a/lib/rest/api/v2010/account/message/feedback.js b/lib/rest/api/v2010/account/message/feedback.js index fe8f562fc6..00dfab33f9 100644 --- a/lib/rest/api/v2010/account/message/feedback.js +++ b/lib/rest/api/v2010/account/message/feedback.js @@ -51,9 +51,7 @@ FeedbackList = function FeedbackList(version, accountSid, messageSid) { FeedbackListInstance._version = version; // Path Solution FeedbackListInstance._solution = {accountSid: accountSid, messageSid: messageSid}; - FeedbackListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Feedback.json' // jshint ignore:line - )(FeedbackListInstance._solution); + FeedbackListInstance._uri = `/Accounts/${accountSid}/Messages/${messageSid}/Feedback.json`; /* jshint ignore:start */ /** * create a FeedbackInstance diff --git a/lib/rest/api/v2010/account/message/media.js b/lib/rest/api/v2010/account/message/media.js index 5a1315b498..001f73994e 100644 --- a/lib/rest/api/v2010/account/message/media.js +++ b/lib/rest/api/v2010/account/message/media.js @@ -53,9 +53,7 @@ MediaList = function MediaList(version, accountSid, messageSid) { MediaListInstance._version = version; // Path Solution MediaListInstance._solution = {accountSid: accountSid, messageSid: messageSid}; - MediaListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Media.json' // jshint ignore:line - )(MediaListInstance._solution); + MediaListInstance._uri = `/Accounts/${accountSid}/Messages/${messageSid}/Media.json`; /* jshint ignore:start */ /** * Streams MediaInstance records from the API. @@ -564,9 +562,7 @@ MediaContext = function MediaContext(version, accountSid, messageSid, sid) { // Path Solution this._solution = {accountSid: accountSid, messageSid: messageSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Media/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Messages/${messageSid}/Media/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/newKey.js b/lib/rest/api/v2010/account/newKey.js index b2d640c843..e2331d3983 100644 --- a/lib/rest/api/v2010/account/newKey.js +++ b/lib/rest/api/v2010/account/newKey.js @@ -50,9 +50,7 @@ NewKeyList = function NewKeyList(version, accountSid) { NewKeyListInstance._version = version; // Path Solution NewKeyListInstance._solution = {accountSid: accountSid}; - NewKeyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Keys.json' // jshint ignore:line - )(NewKeyListInstance._solution); + NewKeyListInstance._uri = `/Accounts/${accountSid}/Keys.json`; /* jshint ignore:start */ /** * create a NewKeyInstance diff --git a/lib/rest/api/v2010/account/newSigningKey.js b/lib/rest/api/v2010/account/newSigningKey.js index 219d214b65..43e6f5a908 100644 --- a/lib/rest/api/v2010/account/newSigningKey.js +++ b/lib/rest/api/v2010/account/newSigningKey.js @@ -50,9 +50,7 @@ NewSigningKeyList = function NewSigningKeyList(version, accountSid) { NewSigningKeyListInstance._version = version; // Path Solution NewSigningKeyListInstance._solution = {accountSid: accountSid}; - NewSigningKeyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SigningKeys.json' // jshint ignore:line - )(NewSigningKeyListInstance._solution); + NewSigningKeyListInstance._uri = `/Accounts/${accountSid}/SigningKeys.json`; /* jshint ignore:start */ /** * create a NewSigningKeyInstance diff --git a/lib/rest/api/v2010/account/notification.js b/lib/rest/api/v2010/account/notification.js index c45921a9af..2e1d24d319 100644 --- a/lib/rest/api/v2010/account/notification.js +++ b/lib/rest/api/v2010/account/notification.js @@ -51,9 +51,7 @@ NotificationList = function NotificationList(version, accountSid) { NotificationListInstance._version = version; // Path Solution NotificationListInstance._solution = {accountSid: accountSid}; - NotificationListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Notifications.json' // jshint ignore:line - )(NotificationListInstance._solution); + NotificationListInstance._uri = `/Accounts/${accountSid}/Notifications.json`; /* jshint ignore:start */ /** * Streams NotificationInstance records from the API. @@ -573,9 +571,7 @@ NotificationContext = function NotificationContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Notifications/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Notifications/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/outgoingCallerId.js b/lib/rest/api/v2010/account/outgoingCallerId.js index 9dde10a740..f593136b61 100644 --- a/lib/rest/api/v2010/account/outgoingCallerId.js +++ b/lib/rest/api/v2010/account/outgoingCallerId.js @@ -50,9 +50,7 @@ OutgoingCallerIdList = function OutgoingCallerIdList(version, accountSid) { OutgoingCallerIdListInstance._version = version; // Path Solution OutgoingCallerIdListInstance._solution = {accountSid: accountSid}; - OutgoingCallerIdListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/OutgoingCallerIds.json' // jshint ignore:line - )(OutgoingCallerIdListInstance._solution); + OutgoingCallerIdListInstance._uri = `/Accounts/${accountSid}/OutgoingCallerIds.json`; /* jshint ignore:start */ /** * Streams OutgoingCallerIdInstance records from the API. @@ -567,9 +565,7 @@ OutgoingCallerIdContext = function OutgoingCallerIdContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/OutgoingCallerIds/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/OutgoingCallerIds/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/queue.js b/lib/rest/api/v2010/account/queue.js index 2f8968d3bd..f02cfc694d 100644 --- a/lib/rest/api/v2010/account/queue.js +++ b/lib/rest/api/v2010/account/queue.js @@ -51,9 +51,7 @@ QueueList = function QueueList(version, accountSid) { QueueListInstance._version = version; // Path Solution QueueListInstance._solution = {accountSid: accountSid}; - QueueListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Queues.json' // jshint ignore:line - )(QueueListInstance._solution); + QueueListInstance._uri = `/Accounts/${accountSid}/Queues.json`; /* jshint ignore:start */ /** * Streams QueueInstance records from the API. @@ -621,9 +619,7 @@ QueueContext = function QueueContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Queues/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Queues/${sid}.json`; // Dependents this._members = undefined; diff --git a/lib/rest/api/v2010/account/queue/member.js b/lib/rest/api/v2010/account/queue/member.js index 5e58923c1a..9abd3ba77b 100644 --- a/lib/rest/api/v2010/account/queue/member.js +++ b/lib/rest/api/v2010/account/queue/member.js @@ -51,9 +51,7 @@ MemberList = function MemberList(version, accountSid, queueSid) { MemberListInstance._version = version; // Path Solution MemberListInstance._solution = {accountSid: accountSid, queueSid: queueSid}; - MemberListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Queues/<%= queueSid %>/Members.json' // jshint ignore:line - )(MemberListInstance._solution); + MemberListInstance._uri = `/Accounts/${accountSid}/Queues/${queueSid}/Members.json`; /* jshint ignore:start */ /** * Streams MemberInstance records from the API. @@ -544,9 +542,7 @@ MemberContext = function MemberContext(version, accountSid, queueSid, callSid) { // Path Solution this._solution = {accountSid: accountSid, queueSid: queueSid, callSid: callSid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Queues/<%= queueSid %>/Members/<%= callSid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Queues/${queueSid}/Members/${callSid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/recording.js b/lib/rest/api/v2010/account/recording.js index e658455749..db85173d1f 100644 --- a/lib/rest/api/v2010/account/recording.js +++ b/lib/rest/api/v2010/account/recording.js @@ -53,9 +53,7 @@ RecordingList = function RecordingList(version, accountSid) { RecordingListInstance._version = version; // Path Solution RecordingListInstance._solution = {accountSid: accountSid}; - RecordingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings.json' // jshint ignore:line - )(RecordingListInstance._solution); + RecordingListInstance._uri = `/Accounts/${accountSid}/Recordings.json`; /* jshint ignore:start */ /** * Streams RecordingInstance records from the API. @@ -622,9 +620,7 @@ RecordingContext = function RecordingContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Recordings/${sid}.json`; // Dependents this._transcriptions = undefined; diff --git a/lib/rest/api/v2010/account/recording/addOnResult.js b/lib/rest/api/v2010/account/recording/addOnResult.js index 06b37be27e..e4757a5efc 100644 --- a/lib/rest/api/v2010/account/recording/addOnResult.js +++ b/lib/rest/api/v2010/account/recording/addOnResult.js @@ -53,9 +53,7 @@ AddOnResultList = function AddOnResultList(version, accountSid, referenceSid) { AddOnResultListInstance._version = version; // Path Solution AddOnResultListInstance._solution = {accountSid: accountSid, referenceSid: referenceSid}; - AddOnResultListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults.json' // jshint ignore:line - )(AddOnResultListInstance._solution); + AddOnResultListInstance._uri = `/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults.json`; /* jshint ignore:start */ /** * Streams AddOnResultInstance records from the API. @@ -576,9 +574,7 @@ AddOnResultContext = function AddOnResultContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, referenceSid: referenceSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${sid}.json`; // Dependents this._payloads = undefined; diff --git a/lib/rest/api/v2010/account/recording/addOnResult/payload.js b/lib/rest/api/v2010/account/recording/addOnResult/payload.js index a220045513..bdb4cdc43f 100644 --- a/lib/rest/api/v2010/account/recording/addOnResult/payload.js +++ b/lib/rest/api/v2010/account/recording/addOnResult/payload.js @@ -59,9 +59,7 @@ PayloadList = function PayloadList(version, accountSid, referenceSid, referenceSid: referenceSid, addOnResultSid: addOnResultSid }; - PayloadListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= addOnResultSid %>/Payloads.json' // jshint ignore:line - )(PayloadListInstance._solution); + PayloadListInstance._uri = `/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads.json`; /* jshint ignore:start */ /** * Streams PayloadInstance records from the API. @@ -582,9 +580,7 @@ PayloadContext = function PayloadContext(version, accountSid, referenceSid, addOnResultSid: addOnResultSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= addOnResultSid %>/Payloads/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/recording/transcription.js b/lib/rest/api/v2010/account/recording/transcription.js index 4d75f01caf..23ddc1d092 100644 --- a/lib/rest/api/v2010/account/recording/transcription.js +++ b/lib/rest/api/v2010/account/recording/transcription.js @@ -53,9 +53,7 @@ TranscriptionList = function TranscriptionList(version, accountSid, TranscriptionListInstance._version = version; // Path Solution TranscriptionListInstance._solution = {accountSid: accountSid, recordingSid: recordingSid}; - TranscriptionListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= recordingSid %>/Transcriptions.json' // jshint ignore:line - )(TranscriptionListInstance._solution); + TranscriptionListInstance._uri = `/Accounts/${accountSid}/Recordings/${recordingSid}/Transcriptions.json`; /* jshint ignore:start */ /** * Streams TranscriptionInstance records from the API. @@ -565,9 +563,7 @@ TranscriptionContext = function TranscriptionContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, recordingSid: recordingSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Recordings/<%= recordingSid %>/Transcriptions/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Recordings/${recordingSid}/Transcriptions/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/shortCode.js b/lib/rest/api/v2010/account/shortCode.js index fe75d2088f..8531921860 100644 --- a/lib/rest/api/v2010/account/shortCode.js +++ b/lib/rest/api/v2010/account/shortCode.js @@ -50,9 +50,7 @@ ShortCodeList = function ShortCodeList(version, accountSid) { ShortCodeListInstance._version = version; // Path Solution ShortCodeListInstance._solution = {accountSid: accountSid}; - ShortCodeListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SMS/ShortCodes.json' // jshint ignore:line - )(ShortCodeListInstance._solution); + ShortCodeListInstance._uri = `/Accounts/${accountSid}/SMS/ShortCodes.json`; /* jshint ignore:start */ /** * Streams ShortCodeInstance records from the API. @@ -565,9 +563,7 @@ ShortCodeContext = function ShortCodeContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SMS/ShortCodes/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SMS/ShortCodes/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/signingKey.js b/lib/rest/api/v2010/account/signingKey.js index 68333dfa5f..0cc9df974f 100644 --- a/lib/rest/api/v2010/account/signingKey.js +++ b/lib/rest/api/v2010/account/signingKey.js @@ -51,9 +51,7 @@ SigningKeyList = function SigningKeyList(version, accountSid) { SigningKeyListInstance._version = version; // Path Solution SigningKeyListInstance._solution = {accountSid: accountSid}; - SigningKeyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SigningKeys.json' // jshint ignore:line - )(SigningKeyListInstance._solution); + SigningKeyListInstance._uri = `/Accounts/${accountSid}/SigningKeys.json`; /* jshint ignore:start */ /** * Streams SigningKeyInstance records from the API. @@ -537,9 +535,7 @@ SigningKeyContext = function SigningKeyContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SigningKeys/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SigningKeys/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/credentialList.js b/lib/rest/api/v2010/account/sip/credentialList.js index 76c6b5f12f..97effb9e62 100644 --- a/lib/rest/api/v2010/account/sip/credentialList.js +++ b/lib/rest/api/v2010/account/sip/credentialList.js @@ -52,9 +52,7 @@ CredentialListList = function CredentialListList(version, accountSid) { CredentialListListInstance._version = version; // Path Solution CredentialListListInstance._solution = {accountSid: accountSid}; - CredentialListListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/CredentialLists.json' // jshint ignore:line - )(CredentialListListInstance._solution); + CredentialListListInstance._uri = `/Accounts/${accountSid}/SIP/CredentialLists.json`; /* jshint ignore:start */ /** * Streams CredentialListInstance records from the API. @@ -616,9 +614,7 @@ CredentialListContext = function CredentialListContext(version, accountSid, sid) // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/CredentialLists/${sid}.json`; // Dependents this._credentials = undefined; diff --git a/lib/rest/api/v2010/account/sip/credentialList/credential.js b/lib/rest/api/v2010/account/sip/credentialList/credential.js index 49ef9c7ea2..95658a74fa 100644 --- a/lib/rest/api/v2010/account/sip/credentialList/credential.js +++ b/lib/rest/api/v2010/account/sip/credentialList/credential.js @@ -54,9 +54,7 @@ CredentialList = function CredentialList(version, accountSid, credentialListSid) CredentialListInstance._version = version; // Path Solution CredentialListInstance._solution = {accountSid: accountSid, credentialListSid: credentialListSid}; - CredentialListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials.json' // jshint ignore:line - )(CredentialListInstance._solution); + CredentialListInstance._uri = `/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials.json`; /* jshint ignore:start */ /** * Streams CredentialInstance records from the API. @@ -631,9 +629,7 @@ CredentialContext = function CredentialContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, credentialListSid: credentialListSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/domain.js b/lib/rest/api/v2010/account/sip/domain.js index 3289885a87..29321c15f2 100644 --- a/lib/rest/api/v2010/account/sip/domain.js +++ b/lib/rest/api/v2010/account/sip/domain.js @@ -58,9 +58,7 @@ DomainList = function DomainList(version, accountSid) { DomainListInstance._version = version; // Path Solution DomainListInstance._solution = {accountSid: accountSid}; - DomainListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains.json' // jshint ignore:line - )(DomainListInstance._solution); + DomainListInstance._uri = `/Accounts/${accountSid}/SIP/Domains.json`; /* jshint ignore:start */ /** * Streams DomainInstance records from the API. @@ -714,9 +712,7 @@ DomainContext = function DomainContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/Domains/${sid}.json`; // Dependents this._ipAccessControlListMappings = undefined; diff --git a/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.js b/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.js index 7240542c0b..da920062ff 100644 --- a/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.js +++ b/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.js @@ -57,9 +57,7 @@ AuthCallsCredentialListMappingList = function accountSid: accountSid, domainSid: domainSid }; - AuthCallsCredentialListMappingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings.json' // jshint ignore:line - )(AuthCallsCredentialListMappingListInstance._solution); + AuthCallsCredentialListMappingListInstance._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings.json`; /* jshint ignore:start */ /** * create a AuthCallsCredentialListMappingInstance @@ -612,9 +610,7 @@ AuthCallsCredentialListMappingContext = function // Path Solution this._solution = {accountSid: accountSid, domainSid: domainSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.js b/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.js index 74164c40ec..b7c1faa60f 100644 --- a/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.js +++ b/lib/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.js @@ -57,9 +57,7 @@ AuthCallsIpAccessControlListMappingList = function accountSid: accountSid, domainSid: domainSid }; - AuthCallsIpAccessControlListMappingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings.json' // jshint ignore:line - )(AuthCallsIpAccessControlListMappingListInstance._solution); + AuthCallsIpAccessControlListMappingListInstance._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings.json`; /* jshint ignore:start */ /** * create a AuthCallsIpAccessControlListMappingInstance @@ -624,9 +622,7 @@ AuthCallsIpAccessControlListMappingContext = function // Path Solution this._solution = {accountSid: accountSid, domainSid: domainSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.js b/lib/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.js index ff949ee5f4..9382407af4 100644 --- a/lib/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.js +++ b/lib/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.js @@ -57,9 +57,7 @@ AuthRegistrationsCredentialListMappingList = function accountSid: accountSid, domainSid: domainSid }; - AuthRegistrationsCredentialListMappingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings.json' // jshint ignore:line - )(AuthRegistrationsCredentialListMappingListInstance._solution); + AuthRegistrationsCredentialListMappingListInstance._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings.json`; /* jshint ignore:start */ /** * create a AuthRegistrationsCredentialListMappingInstance @@ -625,9 +623,7 @@ AuthRegistrationsCredentialListMappingContext = function // Path Solution this._solution = {accountSid: accountSid, domainSid: domainSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/domain/credentialListMapping.js b/lib/rest/api/v2010/account/sip/domain/credentialListMapping.js index 3b1de82e18..dfe61dbf25 100644 --- a/lib/rest/api/v2010/account/sip/domain/credentialListMapping.js +++ b/lib/rest/api/v2010/account/sip/domain/credentialListMapping.js @@ -53,9 +53,7 @@ CredentialListMappingList = function CredentialListMappingList(version, CredentialListMappingListInstance._version = version; // Path Solution CredentialListMappingListInstance._solution = {accountSid: accountSid, domainSid: domainSid}; - CredentialListMappingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings.json' // jshint ignore:line - )(CredentialListMappingListInstance._solution); + CredentialListMappingListInstance._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings.json`; /* jshint ignore:start */ /** * create a CredentialListMappingInstance @@ -607,9 +605,7 @@ CredentialListMappingContext = function CredentialListMappingContext(version, // Path Solution this._solution = {accountSid: accountSid, domainSid: domainSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.js b/lib/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.js index 102c488eb0..9c19aca0ed 100644 --- a/lib/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.js +++ b/lib/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.js @@ -53,9 +53,7 @@ IpAccessControlListMappingList = function IpAccessControlListMappingListInstance._version = version; // Path Solution IpAccessControlListMappingListInstance._solution = {accountSid: accountSid, domainSid: domainSid}; - IpAccessControlListMappingListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings.json' // jshint ignore:line - )(IpAccessControlListMappingListInstance._solution); + IpAccessControlListMappingListInstance._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings.json`; /* jshint ignore:start */ /** * create a IpAccessControlListMappingInstance @@ -615,9 +613,7 @@ IpAccessControlListMappingContext = function // Path Solution this._solution = {accountSid: accountSid, domainSid: domainSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/sip/ipAccessControlList.js b/lib/rest/api/v2010/account/sip/ipAccessControlList.js index 178ceae7c6..f3e9fd1d02 100644 --- a/lib/rest/api/v2010/account/sip/ipAccessControlList.js +++ b/lib/rest/api/v2010/account/sip/ipAccessControlList.js @@ -53,9 +53,7 @@ IpAccessControlListList = function IpAccessControlListList(version, accountSid) IpAccessControlListListInstance._version = version; // Path Solution IpAccessControlListListInstance._solution = {accountSid: accountSid}; - IpAccessControlListListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/IpAccessControlLists.json' // jshint ignore:line - )(IpAccessControlListListInstance._solution); + IpAccessControlListListInstance._uri = `/Accounts/${accountSid}/SIP/IpAccessControlLists.json`; /* jshint ignore:start */ /** * Streams IpAccessControlListInstance records from the API. @@ -621,9 +619,7 @@ IpAccessControlListContext = function IpAccessControlListContext(version, // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/IpAccessControlLists/${sid}.json`; // Dependents this._ipAddresses = undefined; diff --git a/lib/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.js b/lib/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.js index 862ecf6ebd..6d100124a1 100644 --- a/lib/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.js +++ b/lib/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.js @@ -57,9 +57,7 @@ IpAddressList = function IpAddressList(version, accountSid, accountSid: accountSid, ipAccessControlListSid: ipAccessControlListSid }; - IpAddressListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses.json' // jshint ignore:line - )(IpAddressListInstance._solution); + IpAddressListInstance._uri = `/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses.json`; /* jshint ignore:start */ /** * Streams IpAddressInstance records from the API. @@ -651,9 +649,7 @@ IpAddressContext = function IpAddressContext(version, accountSid, // Path Solution this._solution = {accountSid: accountSid, ipAccessControlListSid: ipAccessControlListSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/token.js b/lib/rest/api/v2010/account/token.js index 833b0dde65..bc99ae2c8c 100644 --- a/lib/rest/api/v2010/account/token.js +++ b/lib/rest/api/v2010/account/token.js @@ -49,9 +49,7 @@ TokenList = function TokenList(version, accountSid) { TokenListInstance._version = version; // Path Solution TokenListInstance._solution = {accountSid: accountSid}; - TokenListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Tokens.json' // jshint ignore:line - )(TokenListInstance._solution); + TokenListInstance._uri = `/Accounts/${accountSid}/Tokens.json`; /* jshint ignore:start */ /** * create a TokenInstance diff --git a/lib/rest/api/v2010/account/transcription.js b/lib/rest/api/v2010/account/transcription.js index 66e335a115..da759ac297 100644 --- a/lib/rest/api/v2010/account/transcription.js +++ b/lib/rest/api/v2010/account/transcription.js @@ -50,9 +50,7 @@ TranscriptionList = function TranscriptionList(version, accountSid) { TranscriptionListInstance._version = version; // Path Solution TranscriptionListInstance._solution = {accountSid: accountSid}; - TranscriptionListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Transcriptions.json' // jshint ignore:line - )(TranscriptionListInstance._solution); + TranscriptionListInstance._uri = `/Accounts/${accountSid}/Transcriptions.json`; /* jshint ignore:start */ /** * Streams TranscriptionInstance records from the API. @@ -545,9 +543,7 @@ TranscriptionContext = function TranscriptionContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Transcriptions/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Transcriptions/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/usage/record.js b/lib/rest/api/v2010/account/usage/record.js index 5e2c492009..5e7c9f5417 100644 --- a/lib/rest/api/v2010/account/usage/record.js +++ b/lib/rest/api/v2010/account/usage/record.js @@ -60,9 +60,7 @@ RecordList = function RecordList(version, accountSid) { RecordListInstance._version = version; // Path Solution RecordListInstance._solution = {accountSid: accountSid}; - RecordListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records.json' // jshint ignore:line - )(RecordListInstance._solution); + RecordListInstance._uri = `/Accounts/${accountSid}/Usage/Records.json`; // Components RecordListInstance._allTime = undefined; diff --git a/lib/rest/api/v2010/account/usage/record/allTime.js b/lib/rest/api/v2010/account/usage/record/allTime.js index 9e7411259b..4c6867aeb2 100644 --- a/lib/rest/api/v2010/account/usage/record/allTime.js +++ b/lib/rest/api/v2010/account/usage/record/allTime.js @@ -52,9 +52,7 @@ AllTimeList = function AllTimeList(version, accountSid) { AllTimeListInstance._version = version; // Path Solution AllTimeListInstance._solution = {accountSid: accountSid}; - AllTimeListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/AllTime.json' // jshint ignore:line - )(AllTimeListInstance._solution); + AllTimeListInstance._uri = `/Accounts/${accountSid}/Usage/Records/AllTime.json`; /* jshint ignore:start */ /** * Streams AllTimeInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/daily.js b/lib/rest/api/v2010/account/usage/record/daily.js index c2a26a2748..2b642c3cab 100644 --- a/lib/rest/api/v2010/account/usage/record/daily.js +++ b/lib/rest/api/v2010/account/usage/record/daily.js @@ -52,9 +52,7 @@ DailyList = function DailyList(version, accountSid) { DailyListInstance._version = version; // Path Solution DailyListInstance._solution = {accountSid: accountSid}; - DailyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/Daily.json' // jshint ignore:line - )(DailyListInstance._solution); + DailyListInstance._uri = `/Accounts/${accountSid}/Usage/Records/Daily.json`; /* jshint ignore:start */ /** * Streams DailyInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/lastMonth.js b/lib/rest/api/v2010/account/usage/record/lastMonth.js index 8a0e30c2cc..48a995bc30 100644 --- a/lib/rest/api/v2010/account/usage/record/lastMonth.js +++ b/lib/rest/api/v2010/account/usage/record/lastMonth.js @@ -52,9 +52,7 @@ LastMonthList = function LastMonthList(version, accountSid) { LastMonthListInstance._version = version; // Path Solution LastMonthListInstance._solution = {accountSid: accountSid}; - LastMonthListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/LastMonth.json' // jshint ignore:line - )(LastMonthListInstance._solution); + LastMonthListInstance._uri = `/Accounts/${accountSid}/Usage/Records/LastMonth.json`; /* jshint ignore:start */ /** * Streams LastMonthInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/monthly.js b/lib/rest/api/v2010/account/usage/record/monthly.js index 5cf70640ad..4855dd0cbf 100644 --- a/lib/rest/api/v2010/account/usage/record/monthly.js +++ b/lib/rest/api/v2010/account/usage/record/monthly.js @@ -52,9 +52,7 @@ MonthlyList = function MonthlyList(version, accountSid) { MonthlyListInstance._version = version; // Path Solution MonthlyListInstance._solution = {accountSid: accountSid}; - MonthlyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/Monthly.json' // jshint ignore:line - )(MonthlyListInstance._solution); + MonthlyListInstance._uri = `/Accounts/${accountSid}/Usage/Records/Monthly.json`; /* jshint ignore:start */ /** * Streams MonthlyInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/thisMonth.js b/lib/rest/api/v2010/account/usage/record/thisMonth.js index b3a4361437..7b62322f10 100644 --- a/lib/rest/api/v2010/account/usage/record/thisMonth.js +++ b/lib/rest/api/v2010/account/usage/record/thisMonth.js @@ -52,9 +52,7 @@ ThisMonthList = function ThisMonthList(version, accountSid) { ThisMonthListInstance._version = version; // Path Solution ThisMonthListInstance._solution = {accountSid: accountSid}; - ThisMonthListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/ThisMonth.json' // jshint ignore:line - )(ThisMonthListInstance._solution); + ThisMonthListInstance._uri = `/Accounts/${accountSid}/Usage/Records/ThisMonth.json`; /* jshint ignore:start */ /** * Streams ThisMonthInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/today.js b/lib/rest/api/v2010/account/usage/record/today.js index e1232ea0d4..bb6897f841 100644 --- a/lib/rest/api/v2010/account/usage/record/today.js +++ b/lib/rest/api/v2010/account/usage/record/today.js @@ -52,9 +52,7 @@ TodayList = function TodayList(version, accountSid) { TodayListInstance._version = version; // Path Solution TodayListInstance._solution = {accountSid: accountSid}; - TodayListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/Today.json' // jshint ignore:line - )(TodayListInstance._solution); + TodayListInstance._uri = `/Accounts/${accountSid}/Usage/Records/Today.json`; /* jshint ignore:start */ /** * Streams TodayInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/yearly.js b/lib/rest/api/v2010/account/usage/record/yearly.js index ad67c06678..c016952ae8 100644 --- a/lib/rest/api/v2010/account/usage/record/yearly.js +++ b/lib/rest/api/v2010/account/usage/record/yearly.js @@ -52,9 +52,7 @@ YearlyList = function YearlyList(version, accountSid) { YearlyListInstance._version = version; // Path Solution YearlyListInstance._solution = {accountSid: accountSid}; - YearlyListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/Yearly.json' // jshint ignore:line - )(YearlyListInstance._solution); + YearlyListInstance._uri = `/Accounts/${accountSid}/Usage/Records/Yearly.json`; /* jshint ignore:start */ /** * Streams YearlyInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/record/yesterday.js b/lib/rest/api/v2010/account/usage/record/yesterday.js index da32568c9a..d7d1ae2145 100644 --- a/lib/rest/api/v2010/account/usage/record/yesterday.js +++ b/lib/rest/api/v2010/account/usage/record/yesterday.js @@ -52,9 +52,7 @@ YesterdayList = function YesterdayList(version, accountSid) { YesterdayListInstance._version = version; // Path Solution YesterdayListInstance._solution = {accountSid: accountSid}; - YesterdayListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Records/Yesterday.json' // jshint ignore:line - )(YesterdayListInstance._solution); + YesterdayListInstance._uri = `/Accounts/${accountSid}/Usage/Records/Yesterday.json`; /* jshint ignore:start */ /** * Streams YesterdayInstance records from the API. diff --git a/lib/rest/api/v2010/account/usage/trigger.js b/lib/rest/api/v2010/account/usage/trigger.js index 35a607ac18..d378caa20c 100644 --- a/lib/rest/api/v2010/account/usage/trigger.js +++ b/lib/rest/api/v2010/account/usage/trigger.js @@ -51,9 +51,7 @@ TriggerList = function TriggerList(version, accountSid) { TriggerListInstance._version = version; // Path Solution TriggerListInstance._solution = {accountSid: accountSid}; - TriggerListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Triggers.json' // jshint ignore:line - )(TriggerListInstance._solution); + TriggerListInstance._uri = `/Accounts/${accountSid}/Usage/Triggers.json`; /* jshint ignore:start */ /** * create a TriggerInstance @@ -667,9 +665,7 @@ TriggerContext = function TriggerContext(version, accountSid, sid) { // Path Solution this._solution = {accountSid: accountSid, sid: sid, }; - this._uri = _.template( - '/Accounts/<%= accountSid %>/Usage/Triggers/<%= sid %>.json' // jshint ignore:line - )(this._solution); + this._uri = `/Accounts/${accountSid}/Usage/Triggers/${sid}.json`; }; /* jshint ignore:start */ diff --git a/lib/rest/api/v2010/account/validationRequest.js b/lib/rest/api/v2010/account/validationRequest.js index 195700bf4f..acd4828dd9 100644 --- a/lib/rest/api/v2010/account/validationRequest.js +++ b/lib/rest/api/v2010/account/validationRequest.js @@ -49,9 +49,7 @@ ValidationRequestList = function ValidationRequestList(version, accountSid) { ValidationRequestListInstance._version = version; // Path Solution ValidationRequestListInstance._solution = {accountSid: accountSid}; - ValidationRequestListInstance._uri = _.template( - '/Accounts/<%= accountSid %>/OutgoingCallerIds.json' // jshint ignore:line - )(ValidationRequestListInstance._solution); + ValidationRequestListInstance._uri = `/Accounts/${accountSid}/OutgoingCallerIds.json`; /* jshint ignore:start */ /** * create a ValidationRequestInstance diff --git a/lib/rest/authy/v1/form.js b/lib/rest/authy/v1/form.js index eeceadf6b6..0b537ff172 100644 --- a/lib/rest/authy/v1/form.js +++ b/lib/rest/authy/v1/form.js @@ -264,9 +264,7 @@ FormContext = function FormContext(version, formType) { // Path Solution this._solution = {formType: formType, }; - this._uri = _.template( - '/Forms/<%= formType %>' // jshint ignore:line - )(this._solution); + this._uri = `/Forms/${formType}`; }; /* jshint ignore:start */ diff --git a/lib/rest/authy/v1/service.js b/lib/rest/authy/v1/service.js index 9dc3d573c0..d3d8d41ed0 100644 --- a/lib/rest/authy/v1/service.js +++ b/lib/rest/authy/v1/service.js @@ -54,9 +54,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -614,9 +612,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._entities = undefined; diff --git a/lib/rest/authy/v1/service/entity.js b/lib/rest/authy/v1/service/entity.js index 5835f5bf18..44d4f9942c 100644 --- a/lib/rest/authy/v1/service/entity.js +++ b/lib/rest/authy/v1/service/entity.js @@ -55,9 +55,7 @@ EntityList = function EntityList(version, serviceSid) { EntityListInstance._version = version; // Path Solution EntityListInstance._solution = {serviceSid: serviceSid}; - EntityListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Entities' // jshint ignore:line - )(EntityListInstance._solution); + EntityListInstance._uri = `/Services/${serviceSid}/Entities`; /* jshint ignore:start */ /** * create a EntityInstance @@ -609,9 +607,7 @@ EntityContext = function EntityContext(version, serviceSid, identity) { // Path Solution this._solution = {serviceSid: serviceSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Entities/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Entities/${identity}`; // Dependents this._factors = undefined; diff --git a/lib/rest/authy/v1/service/entity/factor.js b/lib/rest/authy/v1/service/entity/factor.js index 3141686804..101b3ffc74 100644 --- a/lib/rest/authy/v1/service/entity/factor.js +++ b/lib/rest/authy/v1/service/entity/factor.js @@ -56,9 +56,7 @@ FactorList = function FactorList(version, serviceSid, identity) { FactorListInstance._version = version; // Path Solution FactorListInstance._solution = {serviceSid: serviceSid, identity: identity}; - FactorListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors' // jshint ignore:line - )(FactorListInstance._solution); + FactorListInstance._uri = `/Services/${serviceSid}/Entities/${identity}/Factors`; /* jshint ignore:start */ /** * create a FactorInstance @@ -660,9 +658,7 @@ FactorContext = function FactorContext(version, serviceSid, identity, sid) { // Path Solution this._solution = {serviceSid: serviceSid, identity: identity, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Entities/${identity}/Factors/${sid}`; // Dependents this._challenges = undefined; diff --git a/lib/rest/authy/v1/service/entity/factor/challenge.js b/lib/rest/authy/v1/service/entity/factor/challenge.js index 601d0bd1b1..4cbbdb715b 100644 --- a/lib/rest/authy/v1/service/entity/factor/challenge.js +++ b/lib/rest/authy/v1/service/entity/factor/challenge.js @@ -63,9 +63,7 @@ ChallengeList = function ChallengeList(version, serviceSid, identity, factorSid) identity: identity, factorSid: factorSid }; - ChallengeListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= factorSid %>/Challenges' // jshint ignore:line - )(ChallengeListInstance._solution); + ChallengeListInstance._uri = `/Services/${serviceSid}/Entities/${identity}/Factors/${factorSid}/Challenges`; /* jshint ignore:start */ /** * create a ChallengeInstance @@ -435,9 +433,7 @@ ChallengeContext = function ChallengeContext(version, serviceSid, identity, // Path Solution this._solution = {serviceSid: serviceSid, identity: identity, factorSid: factorSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= factorSid %>/Challenges/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Entities/${identity}/Factors/${factorSid}/Challenges/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant.js b/lib/rest/autopilot/v1/assistant.js index 778a1c0a84..aecbfec51d 100644 --- a/lib/rest/autopilot/v1/assistant.js +++ b/lib/rest/autopilot/v1/assistant.js @@ -61,9 +61,7 @@ AssistantList = function AssistantList(version) { AssistantListInstance._version = version; // Path Solution AssistantListInstance._solution = {}; - AssistantListInstance._uri = _.template( - '/Assistants' // jshint ignore:line - )(AssistantListInstance._solution); + AssistantListInstance._uri = `/Assistants`; /* jshint ignore:start */ /** * Streams AssistantInstance records from the API. @@ -758,9 +756,7 @@ AssistantContext = function AssistantContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Assistants/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${sid}`; // Dependents this._fieldTypes = undefined; diff --git a/lib/rest/autopilot/v1/assistant/defaults.js b/lib/rest/autopilot/v1/assistant/defaults.js index d2879fd170..48be347df4 100644 --- a/lib/rest/autopilot/v1/assistant/defaults.js +++ b/lib/rest/autopilot/v1/assistant/defaults.js @@ -286,9 +286,7 @@ DefaultsContext = function DefaultsContext(version, assistantSid) { // Path Solution this._solution = {assistantSid: assistantSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Defaults' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Defaults`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/dialogue.js b/lib/rest/autopilot/v1/assistant/dialogue.js index a5caa16de4..1073f56faa 100644 --- a/lib/rest/autopilot/v1/assistant/dialogue.js +++ b/lib/rest/autopilot/v1/assistant/dialogue.js @@ -274,9 +274,7 @@ DialogueContext = function DialogueContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Dialogues/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Dialogues/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/fieldType.js b/lib/rest/autopilot/v1/assistant/fieldType.js index 8ec9b19874..ddd715d667 100644 --- a/lib/rest/autopilot/v1/assistant/fieldType.js +++ b/lib/rest/autopilot/v1/assistant/fieldType.js @@ -56,9 +56,7 @@ FieldTypeList = function FieldTypeList(version, assistantSid) { FieldTypeListInstance._version = version; // Path Solution FieldTypeListInstance._solution = {assistantSid: assistantSid}; - FieldTypeListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes' // jshint ignore:line - )(FieldTypeListInstance._solution); + FieldTypeListInstance._uri = `/Assistants/${assistantSid}/FieldTypes`; /* jshint ignore:start */ /** * Streams FieldTypeInstance records from the API. @@ -645,9 +643,7 @@ FieldTypeContext = function FieldTypeContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/FieldTypes/${sid}`; // Dependents this._fieldValues = undefined; diff --git a/lib/rest/autopilot/v1/assistant/fieldType/fieldValue.js b/lib/rest/autopilot/v1/assistant/fieldType/fieldValue.js index 3d6823300b..db9c177a5f 100644 --- a/lib/rest/autopilot/v1/assistant/fieldType/fieldValue.js +++ b/lib/rest/autopilot/v1/assistant/fieldType/fieldValue.js @@ -57,9 +57,7 @@ FieldValueList = function FieldValueList(version, assistantSid, fieldTypeSid) { FieldValueListInstance._version = version; // Path Solution FieldValueListInstance._solution = {assistantSid: assistantSid, fieldTypeSid: fieldTypeSid}; - FieldValueListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues' // jshint ignore:line - )(FieldValueListInstance._solution); + FieldValueListInstance._uri = `/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues`; /* jshint ignore:start */ /** * Streams FieldValueInstance records from the API. @@ -642,9 +640,7 @@ FieldValueContext = function FieldValueContext(version, assistantSid, // Path Solution this._solution = {assistantSid: assistantSid, fieldTypeSid: fieldTypeSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/modelBuild.js b/lib/rest/autopilot/v1/assistant/modelBuild.js index 1813b4bfec..331e843575 100644 --- a/lib/rest/autopilot/v1/assistant/modelBuild.js +++ b/lib/rest/autopilot/v1/assistant/modelBuild.js @@ -55,9 +55,7 @@ ModelBuildList = function ModelBuildList(version, assistantSid) { ModelBuildListInstance._version = version; // Path Solution ModelBuildListInstance._solution = {assistantSid: assistantSid}; - ModelBuildListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/ModelBuilds' // jshint ignore:line - )(ModelBuildListInstance._solution); + ModelBuildListInstance._uri = `/Assistants/${assistantSid}/ModelBuilds`; /* jshint ignore:start */ /** * Streams ModelBuildInstance records from the API. @@ -629,9 +627,7 @@ ModelBuildContext = function ModelBuildContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/ModelBuilds/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/query.js b/lib/rest/autopilot/v1/assistant/query.js index 0320f05510..9145162117 100644 --- a/lib/rest/autopilot/v1/assistant/query.js +++ b/lib/rest/autopilot/v1/assistant/query.js @@ -55,9 +55,7 @@ QueryList = function QueryList(version, assistantSid) { QueryListInstance._version = version; // Path Solution QueryListInstance._solution = {assistantSid: assistantSid}; - QueryListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Queries' // jshint ignore:line - )(QueryListInstance._solution); + QueryListInstance._uri = `/Assistants/${assistantSid}/Queries`; /* jshint ignore:start */ /** * Streams QueryInstance records from the API. @@ -658,9 +656,7 @@ QueryContext = function QueryContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Queries/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Queries/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/styleSheet.js b/lib/rest/autopilot/v1/assistant/styleSheet.js index e610eb5a01..d207b7268d 100644 --- a/lib/rest/autopilot/v1/assistant/styleSheet.js +++ b/lib/rest/autopilot/v1/assistant/styleSheet.js @@ -288,9 +288,7 @@ StyleSheetContext = function StyleSheetContext(version, assistantSid) { // Path Solution this._solution = {assistantSid: assistantSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/StyleSheet' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/StyleSheet`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/task.js b/lib/rest/autopilot/v1/assistant/task.js index 01ed587147..61bf349085 100644 --- a/lib/rest/autopilot/v1/assistant/task.js +++ b/lib/rest/autopilot/v1/assistant/task.js @@ -60,9 +60,7 @@ TaskList = function TaskList(version, assistantSid) { TaskListInstance._version = version; // Path Solution TaskListInstance._solution = {assistantSid: assistantSid}; - TaskListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks' // jshint ignore:line - )(TaskListInstance._solution); + TaskListInstance._uri = `/Assistants/${assistantSid}/Tasks`; /* jshint ignore:start */ /** * Streams TaskInstance records from the API. @@ -704,9 +702,7 @@ TaskContext = function TaskContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${sid}`; // Dependents this._fields = undefined; diff --git a/lib/rest/autopilot/v1/assistant/task/field.js b/lib/rest/autopilot/v1/assistant/task/field.js index 67728f1c7b..9b2379eb82 100644 --- a/lib/rest/autopilot/v1/assistant/task/field.js +++ b/lib/rest/autopilot/v1/assistant/task/field.js @@ -57,9 +57,7 @@ FieldList = function FieldList(version, assistantSid, taskSid) { FieldListInstance._version = version; // Path Solution FieldListInstance._solution = {assistantSid: assistantSid, taskSid: taskSid}; - FieldListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields' // jshint ignore:line - )(FieldListInstance._solution); + FieldListInstance._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Fields`; /* jshint ignore:start */ /** * Streams FieldInstance records from the API. @@ -622,9 +620,7 @@ FieldContext = function FieldContext(version, assistantSid, taskSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Fields/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/task/sample.js b/lib/rest/autopilot/v1/assistant/task/sample.js index e5ddcf9caa..cd0baa24a5 100644 --- a/lib/rest/autopilot/v1/assistant/task/sample.js +++ b/lib/rest/autopilot/v1/assistant/task/sample.js @@ -56,9 +56,7 @@ SampleList = function SampleList(version, assistantSid, taskSid) { SampleListInstance._version = version; // Path Solution SampleListInstance._solution = {assistantSid: assistantSid, taskSid: taskSid}; - SampleListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples' // jshint ignore:line - )(SampleListInstance._solution); + SampleListInstance._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Samples`; /* jshint ignore:start */ /** * Streams SampleInstance records from the API. @@ -657,9 +655,7 @@ SampleContext = function SampleContext(version, assistantSid, taskSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/task/taskActions.js b/lib/rest/autopilot/v1/assistant/task/taskActions.js index 430b2108f1..cad4d1c91f 100644 --- a/lib/rest/autopilot/v1/assistant/task/taskActions.js +++ b/lib/rest/autopilot/v1/assistant/task/taskActions.js @@ -307,9 +307,7 @@ TaskActionsContext = function TaskActionsContext(version, assistantSid, taskSid) // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Actions' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Actions`; }; /* jshint ignore:start */ diff --git a/lib/rest/autopilot/v1/assistant/task/taskStatistics.js b/lib/rest/autopilot/v1/assistant/task/taskStatistics.js index 891efbe102..142a726069 100644 --- a/lib/rest/autopilot/v1/assistant/task/taskStatistics.js +++ b/lib/rest/autopilot/v1/assistant/task/taskStatistics.js @@ -300,9 +300,7 @@ TaskStatisticsContext = function TaskStatisticsContext(version, assistantSid, // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v1/credential.js b/lib/rest/chat/v1/credential.js index 47d7bc5567..38049b95cf 100644 --- a/lib/rest/chat/v1/credential.js +++ b/lib/rest/chat/v1/credential.js @@ -50,9 +50,7 @@ CredentialList = function CredentialList(version) { CredentialListInstance._version = version; // Path Solution CredentialListInstance._solution = {}; - CredentialListInstance._uri = _.template( - '/Credentials' // jshint ignore:line - )(CredentialListInstance._solution); + CredentialListInstance._uri = `/Credentials`; /* jshint ignore:start */ /** * Streams CredentialInstance records from the API. @@ -614,9 +612,7 @@ CredentialContext = function CredentialContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v1/service.js b/lib/rest/chat/v1/service.js index 1f2801fda2..9fa26ddc1d 100644 --- a/lib/rest/chat/v1/service.js +++ b/lib/rest/chat/v1/service.js @@ -53,9 +53,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -802,9 +800,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._channels = undefined; diff --git a/lib/rest/chat/v1/service/channel.js b/lib/rest/chat/v1/service/channel.js index 030eeb7a9a..bd0974254e 100644 --- a/lib/rest/chat/v1/service/channel.js +++ b/lib/rest/chat/v1/service/channel.js @@ -55,9 +55,7 @@ ChannelList = function ChannelList(version, serviceSid) { ChannelListInstance._version = version; // Path Solution ChannelListInstance._solution = {serviceSid: serviceSid}; - ChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels' // jshint ignore:line - )(ChannelListInstance._solution); + ChannelListInstance._uri = `/Services/${serviceSid}/Channels`; /* jshint ignore:start */ /** * create a ChannelInstance @@ -677,9 +675,7 @@ ChannelContext = function ChannelContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${sid}`; // Dependents this._members = undefined; diff --git a/lib/rest/chat/v1/service/channel/invite.js b/lib/rest/chat/v1/service/channel/invite.js index 95289d1908..89131de867 100644 --- a/lib/rest/chat/v1/service/channel/invite.js +++ b/lib/rest/chat/v1/service/channel/invite.js @@ -54,9 +54,7 @@ InviteList = function InviteList(version, serviceSid, channelSid) { InviteListInstance._version = version; // Path Solution InviteListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - InviteListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites' // jshint ignore:line - )(InviteListInstance._solution); + InviteListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites`; /* jshint ignore:start */ /** * create a InviteInstance @@ -605,9 +603,7 @@ InviteContext = function InviteContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v1/service/channel/member.js b/lib/rest/chat/v1/service/channel/member.js index 990829443d..ffafef3751 100644 --- a/lib/rest/chat/v1/service/channel/member.js +++ b/lib/rest/chat/v1/service/channel/member.js @@ -54,9 +54,7 @@ MemberList = function MemberList(version, serviceSid, channelSid) { MemberListInstance._version = version; // Path Solution MemberListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MemberListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members' // jshint ignore:line - )(MemberListInstance._solution); + MemberListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members`; /* jshint ignore:start */ /** * create a MemberInstance @@ -629,9 +627,7 @@ MemberContext = function MemberContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v1/service/channel/message.js b/lib/rest/chat/v1/service/channel/message.js index 12bb985658..f8143c8c6b 100644 --- a/lib/rest/chat/v1/service/channel/message.js +++ b/lib/rest/chat/v1/service/channel/message.js @@ -52,9 +52,7 @@ MessageList = function MessageList(version, serviceSid, channelSid) { MessageListInstance._version = version; // Path Solution MessageListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MessageListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages' // jshint ignore:line - )(MessageListInstance._solution); + MessageListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages`; /* jshint ignore:start */ /** * create a MessageInstance @@ -631,9 +629,7 @@ MessageContext = function MessageContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v1/service/role.js b/lib/rest/chat/v1/service/role.js index 6b03584887..ae20a5a154 100644 --- a/lib/rest/chat/v1/service/role.js +++ b/lib/rest/chat/v1/service/role.js @@ -51,9 +51,7 @@ RoleList = function RoleList(version, serviceSid) { RoleListInstance._version = version; // Path Solution RoleListInstance._solution = {serviceSid: serviceSid}; - RoleListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Roles' // jshint ignore:line - )(RoleListInstance._solution); + RoleListInstance._uri = `/Services/${serviceSid}/Roles`; /* jshint ignore:start */ /** * create a RoleInstance @@ -607,9 +605,7 @@ RoleContext = function RoleContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Roles/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Roles/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v1/service/user.js b/lib/rest/chat/v1/service/user.js index 17dc43d596..85ee3a2060 100644 --- a/lib/rest/chat/v1/service/user.js +++ b/lib/rest/chat/v1/service/user.js @@ -51,9 +51,7 @@ UserList = function UserList(version, serviceSid) { UserListInstance._version = version; // Path Solution UserListInstance._solution = {serviceSid: serviceSid}; - UserListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users' // jshint ignore:line - )(UserListInstance._solution); + UserListInstance._uri = `/Services/${serviceSid}/Users`; /* jshint ignore:start */ /** * create a UserInstance @@ -644,9 +642,7 @@ UserContext = function UserContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${sid}`; // Dependents this._userChannels = undefined; diff --git a/lib/rest/chat/v1/service/user/userChannel.js b/lib/rest/chat/v1/service/user/userChannel.js index 8cd376502d..81b03bf6fd 100644 --- a/lib/rest/chat/v1/service/user/userChannel.js +++ b/lib/rest/chat/v1/service/user/userChannel.js @@ -51,9 +51,7 @@ UserChannelList = function UserChannelList(version, serviceSid, userSid) { UserChannelListInstance._version = version; // Path Solution UserChannelListInstance._solution = {serviceSid: serviceSid, userSid: userSid}; - UserChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels' // jshint ignore:line - )(UserChannelListInstance._solution); + UserChannelListInstance._uri = `/Services/${serviceSid}/Users/${userSid}/Channels`; /* jshint ignore:start */ /** * Streams UserChannelInstance records from the API. diff --git a/lib/rest/chat/v2/credential.js b/lib/rest/chat/v2/credential.js index 67fe9ff1fd..e71229641c 100644 --- a/lib/rest/chat/v2/credential.js +++ b/lib/rest/chat/v2/credential.js @@ -50,9 +50,7 @@ CredentialList = function CredentialList(version) { CredentialListInstance._version = version; // Path Solution CredentialListInstance._solution = {}; - CredentialListInstance._uri = _.template( - '/Credentials' // jshint ignore:line - )(CredentialListInstance._solution); + CredentialListInstance._uri = `/Credentials`; /* jshint ignore:start */ /** * Streams CredentialInstance records from the API. @@ -617,9 +615,7 @@ CredentialContext = function CredentialContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service.js b/lib/rest/chat/v2/service.js index 7b0325836b..828abfecb3 100644 --- a/lib/rest/chat/v2/service.js +++ b/lib/rest/chat/v2/service.js @@ -54,9 +54,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -750,9 +748,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._channels = undefined; diff --git a/lib/rest/chat/v2/service/binding.js b/lib/rest/chat/v2/service/binding.js index 9a0b02de56..a869e68a8a 100644 --- a/lib/rest/chat/v2/service/binding.js +++ b/lib/rest/chat/v2/service/binding.js @@ -52,9 +52,7 @@ BindingList = function BindingList(version, serviceSid) { BindingListInstance._version = version; // Path Solution BindingListInstance._solution = {serviceSid: serviceSid}; - BindingListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Bindings' // jshint ignore:line - )(BindingListInstance._solution); + BindingListInstance._uri = `/Services/${serviceSid}/Bindings`; /* jshint ignore:start */ /** * Streams BindingInstance records from the API. @@ -553,9 +551,7 @@ BindingContext = function BindingContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Bindings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Bindings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/channel.js b/lib/rest/chat/v2/service/channel.js index 4c34ebb562..0d6eeb2d49 100644 --- a/lib/rest/chat/v2/service/channel.js +++ b/lib/rest/chat/v2/service/channel.js @@ -56,9 +56,7 @@ ChannelList = function ChannelList(version, serviceSid) { ChannelListInstance._version = version; // Path Solution ChannelListInstance._solution = {serviceSid: serviceSid}; - ChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels' // jshint ignore:line - )(ChannelListInstance._solution); + ChannelListInstance._uri = `/Services/${serviceSid}/Channels`; /* jshint ignore:start */ /** * create a ChannelInstance @@ -715,9 +713,7 @@ ChannelContext = function ChannelContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${sid}`; // Dependents this._members = undefined; diff --git a/lib/rest/chat/v2/service/channel/invite.js b/lib/rest/chat/v2/service/channel/invite.js index d83563a5ad..536f13df30 100644 --- a/lib/rest/chat/v2/service/channel/invite.js +++ b/lib/rest/chat/v2/service/channel/invite.js @@ -54,9 +54,7 @@ InviteList = function InviteList(version, serviceSid, channelSid) { InviteListInstance._version = version; // Path Solution InviteListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - InviteListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites' // jshint ignore:line - )(InviteListInstance._solution); + InviteListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites`; /* jshint ignore:start */ /** * create a InviteInstance @@ -607,9 +605,7 @@ InviteContext = function InviteContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/channel/member.js b/lib/rest/chat/v2/service/channel/member.js index 3d8735c362..f6259472b1 100644 --- a/lib/rest/chat/v2/service/channel/member.js +++ b/lib/rest/chat/v2/service/channel/member.js @@ -54,9 +54,7 @@ MemberList = function MemberList(version, serviceSid, channelSid) { MemberListInstance._version = version; // Path Solution MemberListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MemberListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members' // jshint ignore:line - )(MemberListInstance._solution); + MemberListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members`; /* jshint ignore:start */ /** * create a MemberInstance @@ -659,9 +657,7 @@ MemberContext = function MemberContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/channel/message.js b/lib/rest/chat/v2/service/channel/message.js index 9cf05f9348..19cc68483e 100644 --- a/lib/rest/chat/v2/service/channel/message.js +++ b/lib/rest/chat/v2/service/channel/message.js @@ -55,9 +55,7 @@ MessageList = function MessageList(version, serviceSid, channelSid) { MessageListInstance._version = version; // Path Solution MessageListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MessageListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages' // jshint ignore:line - )(MessageListInstance._solution); + MessageListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages`; /* jshint ignore:start */ /** * create a MessageInstance @@ -668,9 +666,7 @@ MessageContext = function MessageContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/channel/webhook.js b/lib/rest/chat/v2/service/channel/webhook.js index a69e3c76e8..f86637eb7e 100644 --- a/lib/rest/chat/v2/service/channel/webhook.js +++ b/lib/rest/chat/v2/service/channel/webhook.js @@ -55,9 +55,7 @@ WebhookList = function WebhookList(version, serviceSid, channelSid) { WebhookListInstance._version = version; // Path Solution WebhookListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - WebhookListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks' // jshint ignore:line - )(WebhookListInstance._solution); + WebhookListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Webhooks`; /* jshint ignore:start */ /** * Streams WebhookInstance records from the API. @@ -646,9 +644,7 @@ WebhookContext = function WebhookContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/role.js b/lib/rest/chat/v2/service/role.js index b8e1c638d4..0d6f10ab41 100644 --- a/lib/rest/chat/v2/service/role.js +++ b/lib/rest/chat/v2/service/role.js @@ -52,9 +52,7 @@ RoleList = function RoleList(version, serviceSid) { RoleListInstance._version = version; // Path Solution RoleListInstance._solution = {serviceSid: serviceSid}; - RoleListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Roles' // jshint ignore:line - )(RoleListInstance._solution); + RoleListInstance._uri = `/Services/${serviceSid}/Roles`; /* jshint ignore:start */ /** * create a RoleInstance @@ -609,9 +607,7 @@ RoleContext = function RoleContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Roles/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Roles/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/user.js b/lib/rest/chat/v2/service/user.js index 139f4b70ed..652648c602 100644 --- a/lib/rest/chat/v2/service/user.js +++ b/lib/rest/chat/v2/service/user.js @@ -53,9 +53,7 @@ UserList = function UserList(version, serviceSid) { UserListInstance._version = version; // Path Solution UserListInstance._solution = {serviceSid: serviceSid}; - UserListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users' // jshint ignore:line - )(UserListInstance._solution); + UserListInstance._uri = `/Services/${serviceSid}/Users`; /* jshint ignore:start */ /** * create a UserInstance @@ -658,9 +656,7 @@ UserContext = function UserContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${sid}`; // Dependents this._userChannels = undefined; diff --git a/lib/rest/chat/v2/service/user/userBinding.js b/lib/rest/chat/v2/service/user/userBinding.js index 7b69df3d51..d13c750097 100644 --- a/lib/rest/chat/v2/service/user/userBinding.js +++ b/lib/rest/chat/v2/service/user/userBinding.js @@ -54,9 +54,7 @@ UserBindingList = function UserBindingList(version, serviceSid, userSid) { UserBindingListInstance._version = version; // Path Solution UserBindingListInstance._solution = {serviceSid: serviceSid, userSid: userSid}; - UserBindingListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings' // jshint ignore:line - )(UserBindingListInstance._solution); + UserBindingListInstance._uri = `/Services/${serviceSid}/Users/${userSid}/Bindings`; /* jshint ignore:start */ /** * Streams UserBindingInstance records from the API. @@ -570,9 +568,7 @@ UserBindingContext = function UserBindingContext(version, serviceSid, userSid, // Path Solution this._solution = {serviceSid: serviceSid, userSid: userSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${userSid}/Bindings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/chat/v2/service/user/userChannel.js b/lib/rest/chat/v2/service/user/userChannel.js index 86fe7d0de3..7c27109583 100644 --- a/lib/rest/chat/v2/service/user/userChannel.js +++ b/lib/rest/chat/v2/service/user/userChannel.js @@ -52,9 +52,7 @@ UserChannelList = function UserChannelList(version, serviceSid, userSid) { UserChannelListInstance._version = version; // Path Solution UserChannelListInstance._solution = {serviceSid: serviceSid, userSid: userSid}; - UserChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels' // jshint ignore:line - )(UserChannelListInstance._solution); + UserChannelListInstance._uri = `/Services/${serviceSid}/Users/${userSid}/Channels`; /* jshint ignore:start */ /** * Streams UserChannelInstance records from the API. @@ -571,9 +569,7 @@ UserChannelContext = function UserChannelContext(version, serviceSid, userSid, // Path Solution this._solution = {serviceSid: serviceSid, userSid: userSid, channelSid: channelSid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels/<%= channelSid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${userSid}/Channels/${channelSid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/fax/v1/fax.js b/lib/rest/fax/v1/fax.js index ece6215c67..0dec8100b4 100644 --- a/lib/rest/fax/v1/fax.js +++ b/lib/rest/fax/v1/fax.js @@ -54,9 +54,7 @@ FaxList = function FaxList(version) { FaxListInstance._version = version; // Path Solution FaxListInstance._solution = {}; - FaxListInstance._uri = _.template( - '/Faxes' // jshint ignore:line - )(FaxListInstance._solution); + FaxListInstance._uri = `/Faxes`; /* jshint ignore:start */ /** * Streams FaxInstance records from the API. @@ -681,9 +679,7 @@ FaxContext = function FaxContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Faxes/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Faxes/${sid}`; // Dependents this._media = undefined; diff --git a/lib/rest/fax/v1/fax/faxMedia.js b/lib/rest/fax/v1/fax/faxMedia.js index 113fc05dcd..9c81bf2e83 100644 --- a/lib/rest/fax/v1/fax/faxMedia.js +++ b/lib/rest/fax/v1/fax/faxMedia.js @@ -54,9 +54,7 @@ FaxMediaList = function FaxMediaList(version, faxSid) { FaxMediaListInstance._version = version; // Path Solution FaxMediaListInstance._solution = {faxSid: faxSid}; - FaxMediaListInstance._uri = _.template( - '/Faxes/<%= faxSid %>/Media' // jshint ignore:line - )(FaxMediaListInstance._solution); + FaxMediaListInstance._uri = `/Faxes/${faxSid}/Media`; /* jshint ignore:start */ /** * Streams FaxMediaInstance records from the API. @@ -538,9 +536,7 @@ FaxMediaContext = function FaxMediaContext(version, faxSid, sid) { // Path Solution this._solution = {faxSid: faxSid, sid: sid, }; - this._uri = _.template( - '/Faxes/<%= faxSid %>/Media/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Faxes/${faxSid}/Media/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/flexApi/v1/configuration.js b/lib/rest/flexApi/v1/configuration.js index f24b45242f..f0db88dca7 100644 --- a/lib/rest/flexApi/v1/configuration.js +++ b/lib/rest/flexApi/v1/configuration.js @@ -345,9 +345,7 @@ ConfigurationContext = function ConfigurationContext(version) { // Path Solution this._solution = {}; - this._uri = _.template( - '/Configuration' // jshint ignore:line - )(this._solution); + this._uri = `/Configuration`; }; /* jshint ignore:start */ diff --git a/lib/rest/flexApi/v1/flexFlow.js b/lib/rest/flexApi/v1/flexFlow.js index c9803097da..ee78ee1265 100644 --- a/lib/rest/flexApi/v1/flexFlow.js +++ b/lib/rest/flexApi/v1/flexFlow.js @@ -50,9 +50,7 @@ FlexFlowList = function FlexFlowList(version) { FlexFlowListInstance._version = version; // Path Solution FlexFlowListInstance._solution = {}; - FlexFlowListInstance._uri = _.template( - '/FlexFlows' // jshint ignore:line - )(FlexFlowListInstance._solution); + FlexFlowListInstance._uri = `/FlexFlows`; /* jshint ignore:start */ /** * Streams FlexFlowInstance records from the API. @@ -656,9 +654,7 @@ FlexFlowContext = function FlexFlowContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/FlexFlows/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/FlexFlows/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/insights/v1/summary.js b/lib/rest/insights/v1/summary.js index 7ed06cd31f..7651dd5607 100644 --- a/lib/rest/insights/v1/summary.js +++ b/lib/rest/insights/v1/summary.js @@ -295,9 +295,7 @@ CallSummaryContext = function CallSummaryContext(version, callSid) { // Path Solution this._solution = {callSid: callSid, }; - this._uri = _.template( - '/Voice/<%= callSid %>/Summary' // jshint ignore:line - )(this._solution); + this._uri = `/Voice/${callSid}/Summary`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v1/credential.js b/lib/rest/ipMessaging/v1/credential.js index 7b12de086f..8e6bbcb30c 100644 --- a/lib/rest/ipMessaging/v1/credential.js +++ b/lib/rest/ipMessaging/v1/credential.js @@ -50,9 +50,7 @@ CredentialList = function CredentialList(version) { CredentialListInstance._version = version; // Path Solution CredentialListInstance._solution = {}; - CredentialListInstance._uri = _.template( - '/Credentials' // jshint ignore:line - )(CredentialListInstance._solution); + CredentialListInstance._uri = `/Credentials`; /* jshint ignore:start */ /** * Streams CredentialInstance records from the API. @@ -614,9 +612,7 @@ CredentialContext = function CredentialContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v1/service.js b/lib/rest/ipMessaging/v1/service.js index 0b87f37611..feacd2a93d 100644 --- a/lib/rest/ipMessaging/v1/service.js +++ b/lib/rest/ipMessaging/v1/service.js @@ -53,9 +53,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -802,9 +800,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._channels = undefined; diff --git a/lib/rest/ipMessaging/v1/service/channel.js b/lib/rest/ipMessaging/v1/service/channel.js index 89e8c4b7e7..8cc64c210a 100644 --- a/lib/rest/ipMessaging/v1/service/channel.js +++ b/lib/rest/ipMessaging/v1/service/channel.js @@ -55,9 +55,7 @@ ChannelList = function ChannelList(version, serviceSid) { ChannelListInstance._version = version; // Path Solution ChannelListInstance._solution = {serviceSid: serviceSid}; - ChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels' // jshint ignore:line - )(ChannelListInstance._solution); + ChannelListInstance._uri = `/Services/${serviceSid}/Channels`; /* jshint ignore:start */ /** * create a ChannelInstance @@ -677,9 +675,7 @@ ChannelContext = function ChannelContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${sid}`; // Dependents this._members = undefined; diff --git a/lib/rest/ipMessaging/v1/service/channel/invite.js b/lib/rest/ipMessaging/v1/service/channel/invite.js index fc77da5bfc..91a527189b 100644 --- a/lib/rest/ipMessaging/v1/service/channel/invite.js +++ b/lib/rest/ipMessaging/v1/service/channel/invite.js @@ -54,9 +54,7 @@ InviteList = function InviteList(version, serviceSid, channelSid) { InviteListInstance._version = version; // Path Solution InviteListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - InviteListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites' // jshint ignore:line - )(InviteListInstance._solution); + InviteListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites`; /* jshint ignore:start */ /** * create a InviteInstance @@ -605,9 +603,7 @@ InviteContext = function InviteContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v1/service/channel/member.js b/lib/rest/ipMessaging/v1/service/channel/member.js index a91c651ce4..aac1e69035 100644 --- a/lib/rest/ipMessaging/v1/service/channel/member.js +++ b/lib/rest/ipMessaging/v1/service/channel/member.js @@ -54,9 +54,7 @@ MemberList = function MemberList(version, serviceSid, channelSid) { MemberListInstance._version = version; // Path Solution MemberListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MemberListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members' // jshint ignore:line - )(MemberListInstance._solution); + MemberListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members`; /* jshint ignore:start */ /** * create a MemberInstance @@ -629,9 +627,7 @@ MemberContext = function MemberContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v1/service/channel/message.js b/lib/rest/ipMessaging/v1/service/channel/message.js index aae0396b53..d24f583c47 100644 --- a/lib/rest/ipMessaging/v1/service/channel/message.js +++ b/lib/rest/ipMessaging/v1/service/channel/message.js @@ -52,9 +52,7 @@ MessageList = function MessageList(version, serviceSid, channelSid) { MessageListInstance._version = version; // Path Solution MessageListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MessageListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages' // jshint ignore:line - )(MessageListInstance._solution); + MessageListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages`; /* jshint ignore:start */ /** * create a MessageInstance @@ -631,9 +629,7 @@ MessageContext = function MessageContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v1/service/role.js b/lib/rest/ipMessaging/v1/service/role.js index 32c0124da5..80e5a38c52 100644 --- a/lib/rest/ipMessaging/v1/service/role.js +++ b/lib/rest/ipMessaging/v1/service/role.js @@ -51,9 +51,7 @@ RoleList = function RoleList(version, serviceSid) { RoleListInstance._version = version; // Path Solution RoleListInstance._solution = {serviceSid: serviceSid}; - RoleListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Roles' // jshint ignore:line - )(RoleListInstance._solution); + RoleListInstance._uri = `/Services/${serviceSid}/Roles`; /* jshint ignore:start */ /** * create a RoleInstance @@ -607,9 +605,7 @@ RoleContext = function RoleContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Roles/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Roles/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v1/service/user.js b/lib/rest/ipMessaging/v1/service/user.js index 72fa2cc77a..c19cd351df 100644 --- a/lib/rest/ipMessaging/v1/service/user.js +++ b/lib/rest/ipMessaging/v1/service/user.js @@ -51,9 +51,7 @@ UserList = function UserList(version, serviceSid) { UserListInstance._version = version; // Path Solution UserListInstance._solution = {serviceSid: serviceSid}; - UserListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users' // jshint ignore:line - )(UserListInstance._solution); + UserListInstance._uri = `/Services/${serviceSid}/Users`; /* jshint ignore:start */ /** * create a UserInstance @@ -644,9 +642,7 @@ UserContext = function UserContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${sid}`; // Dependents this._userChannels = undefined; diff --git a/lib/rest/ipMessaging/v1/service/user/userChannel.js b/lib/rest/ipMessaging/v1/service/user/userChannel.js index 739c7c2a25..a8dde8283b 100644 --- a/lib/rest/ipMessaging/v1/service/user/userChannel.js +++ b/lib/rest/ipMessaging/v1/service/user/userChannel.js @@ -51,9 +51,7 @@ UserChannelList = function UserChannelList(version, serviceSid, userSid) { UserChannelListInstance._version = version; // Path Solution UserChannelListInstance._solution = {serviceSid: serviceSid, userSid: userSid}; - UserChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels' // jshint ignore:line - )(UserChannelListInstance._solution); + UserChannelListInstance._uri = `/Services/${serviceSid}/Users/${userSid}/Channels`; /* jshint ignore:start */ /** * Streams UserChannelInstance records from the API. diff --git a/lib/rest/ipMessaging/v2/credential.js b/lib/rest/ipMessaging/v2/credential.js index 16a21d6f55..67d386e75e 100644 --- a/lib/rest/ipMessaging/v2/credential.js +++ b/lib/rest/ipMessaging/v2/credential.js @@ -50,9 +50,7 @@ CredentialList = function CredentialList(version) { CredentialListInstance._version = version; // Path Solution CredentialListInstance._solution = {}; - CredentialListInstance._uri = _.template( - '/Credentials' // jshint ignore:line - )(CredentialListInstance._solution); + CredentialListInstance._uri = `/Credentials`; /* jshint ignore:start */ /** * Streams CredentialInstance records from the API. @@ -617,9 +615,7 @@ CredentialContext = function CredentialContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service.js b/lib/rest/ipMessaging/v2/service.js index 3d34101942..1830c65641 100644 --- a/lib/rest/ipMessaging/v2/service.js +++ b/lib/rest/ipMessaging/v2/service.js @@ -54,9 +54,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -750,9 +748,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._channels = undefined; diff --git a/lib/rest/ipMessaging/v2/service/binding.js b/lib/rest/ipMessaging/v2/service/binding.js index 58ae40cfc4..ee4ff321df 100644 --- a/lib/rest/ipMessaging/v2/service/binding.js +++ b/lib/rest/ipMessaging/v2/service/binding.js @@ -52,9 +52,7 @@ BindingList = function BindingList(version, serviceSid) { BindingListInstance._version = version; // Path Solution BindingListInstance._solution = {serviceSid: serviceSid}; - BindingListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Bindings' // jshint ignore:line - )(BindingListInstance._solution); + BindingListInstance._uri = `/Services/${serviceSid}/Bindings`; /* jshint ignore:start */ /** * Streams BindingInstance records from the API. @@ -553,9 +551,7 @@ BindingContext = function BindingContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Bindings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Bindings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/channel.js b/lib/rest/ipMessaging/v2/service/channel.js index 98385915e2..29e8e6b901 100644 --- a/lib/rest/ipMessaging/v2/service/channel.js +++ b/lib/rest/ipMessaging/v2/service/channel.js @@ -56,9 +56,7 @@ ChannelList = function ChannelList(version, serviceSid) { ChannelListInstance._version = version; // Path Solution ChannelListInstance._solution = {serviceSid: serviceSid}; - ChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels' // jshint ignore:line - )(ChannelListInstance._solution); + ChannelListInstance._uri = `/Services/${serviceSid}/Channels`; /* jshint ignore:start */ /** * create a ChannelInstance @@ -715,9 +713,7 @@ ChannelContext = function ChannelContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${sid}`; // Dependents this._members = undefined; diff --git a/lib/rest/ipMessaging/v2/service/channel/invite.js b/lib/rest/ipMessaging/v2/service/channel/invite.js index cfe5237186..0bf7e5f8eb 100644 --- a/lib/rest/ipMessaging/v2/service/channel/invite.js +++ b/lib/rest/ipMessaging/v2/service/channel/invite.js @@ -54,9 +54,7 @@ InviteList = function InviteList(version, serviceSid, channelSid) { InviteListInstance._version = version; // Path Solution InviteListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - InviteListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites' // jshint ignore:line - )(InviteListInstance._solution); + InviteListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites`; /* jshint ignore:start */ /** * create a InviteInstance @@ -607,9 +605,7 @@ InviteContext = function InviteContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/channel/member.js b/lib/rest/ipMessaging/v2/service/channel/member.js index 0a891cf4c6..30916d45f9 100644 --- a/lib/rest/ipMessaging/v2/service/channel/member.js +++ b/lib/rest/ipMessaging/v2/service/channel/member.js @@ -54,9 +54,7 @@ MemberList = function MemberList(version, serviceSid, channelSid) { MemberListInstance._version = version; // Path Solution MemberListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MemberListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members' // jshint ignore:line - )(MemberListInstance._solution); + MemberListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members`; /* jshint ignore:start */ /** * create a MemberInstance @@ -659,9 +657,7 @@ MemberContext = function MemberContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/channel/message.js b/lib/rest/ipMessaging/v2/service/channel/message.js index e8bc37c86a..317f2147c6 100644 --- a/lib/rest/ipMessaging/v2/service/channel/message.js +++ b/lib/rest/ipMessaging/v2/service/channel/message.js @@ -55,9 +55,7 @@ MessageList = function MessageList(version, serviceSid, channelSid) { MessageListInstance._version = version; // Path Solution MessageListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - MessageListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages' // jshint ignore:line - )(MessageListInstance._solution); + MessageListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages`; /* jshint ignore:start */ /** * create a MessageInstance @@ -668,9 +666,7 @@ MessageContext = function MessageContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/channel/webhook.js b/lib/rest/ipMessaging/v2/service/channel/webhook.js index 152c270f3b..9e994b7cb7 100644 --- a/lib/rest/ipMessaging/v2/service/channel/webhook.js +++ b/lib/rest/ipMessaging/v2/service/channel/webhook.js @@ -55,9 +55,7 @@ WebhookList = function WebhookList(version, serviceSid, channelSid) { WebhookListInstance._version = version; // Path Solution WebhookListInstance._solution = {serviceSid: serviceSid, channelSid: channelSid}; - WebhookListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks' // jshint ignore:line - )(WebhookListInstance._solution); + WebhookListInstance._uri = `/Services/${serviceSid}/Channels/${channelSid}/Webhooks`; /* jshint ignore:start */ /** * Streams WebhookInstance records from the API. @@ -646,9 +644,7 @@ WebhookContext = function WebhookContext(version, serviceSid, channelSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, channelSid: channelSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/role.js b/lib/rest/ipMessaging/v2/service/role.js index 587d6d57a6..338ce09d2c 100644 --- a/lib/rest/ipMessaging/v2/service/role.js +++ b/lib/rest/ipMessaging/v2/service/role.js @@ -52,9 +52,7 @@ RoleList = function RoleList(version, serviceSid) { RoleListInstance._version = version; // Path Solution RoleListInstance._solution = {serviceSid: serviceSid}; - RoleListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Roles' // jshint ignore:line - )(RoleListInstance._solution); + RoleListInstance._uri = `/Services/${serviceSid}/Roles`; /* jshint ignore:start */ /** * create a RoleInstance @@ -609,9 +607,7 @@ RoleContext = function RoleContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Roles/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Roles/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/user.js b/lib/rest/ipMessaging/v2/service/user.js index b2b43871d7..88d165d6a2 100644 --- a/lib/rest/ipMessaging/v2/service/user.js +++ b/lib/rest/ipMessaging/v2/service/user.js @@ -53,9 +53,7 @@ UserList = function UserList(version, serviceSid) { UserListInstance._version = version; // Path Solution UserListInstance._solution = {serviceSid: serviceSid}; - UserListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users' // jshint ignore:line - )(UserListInstance._solution); + UserListInstance._uri = `/Services/${serviceSid}/Users`; /* jshint ignore:start */ /** * create a UserInstance @@ -658,9 +656,7 @@ UserContext = function UserContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${sid}`; // Dependents this._userChannels = undefined; diff --git a/lib/rest/ipMessaging/v2/service/user/userBinding.js b/lib/rest/ipMessaging/v2/service/user/userBinding.js index b24ac5d77d..861052d6b8 100644 --- a/lib/rest/ipMessaging/v2/service/user/userBinding.js +++ b/lib/rest/ipMessaging/v2/service/user/userBinding.js @@ -54,9 +54,7 @@ UserBindingList = function UserBindingList(version, serviceSid, userSid) { UserBindingListInstance._version = version; // Path Solution UserBindingListInstance._solution = {serviceSid: serviceSid, userSid: userSid}; - UserBindingListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings' // jshint ignore:line - )(UserBindingListInstance._solution); + UserBindingListInstance._uri = `/Services/${serviceSid}/Users/${userSid}/Bindings`; /* jshint ignore:start */ /** * Streams UserBindingInstance records from the API. @@ -570,9 +568,7 @@ UserBindingContext = function UserBindingContext(version, serviceSid, userSid, // Path Solution this._solution = {serviceSid: serviceSid, userSid: userSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${userSid}/Bindings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/ipMessaging/v2/service/user/userChannel.js b/lib/rest/ipMessaging/v2/service/user/userChannel.js index 0be0bcc39b..01aba9e23e 100644 --- a/lib/rest/ipMessaging/v2/service/user/userChannel.js +++ b/lib/rest/ipMessaging/v2/service/user/userChannel.js @@ -52,9 +52,7 @@ UserChannelList = function UserChannelList(version, serviceSid, userSid) { UserChannelListInstance._version = version; // Path Solution UserChannelListInstance._solution = {serviceSid: serviceSid, userSid: userSid}; - UserChannelListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels' // jshint ignore:line - )(UserChannelListInstance._solution); + UserChannelListInstance._uri = `/Services/${serviceSid}/Users/${userSid}/Channels`; /* jshint ignore:start */ /** * Streams UserChannelInstance records from the API. @@ -571,9 +569,7 @@ UserChannelContext = function UserChannelContext(version, serviceSid, userSid, // Path Solution this._solution = {serviceSid: serviceSid, userSid: userSid, channelSid: channelSid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels/<%= channelSid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Users/${userSid}/Channels/${channelSid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/lookups/v1/phoneNumber.js b/lib/rest/lookups/v1/phoneNumber.js index 3168af6446..c6098cb97e 100644 --- a/lib/rest/lookups/v1/phoneNumber.js +++ b/lib/rest/lookups/v1/phoneNumber.js @@ -265,9 +265,7 @@ PhoneNumberContext = function PhoneNumberContext(version, phoneNumber) { // Path Solution this._solution = {phoneNumber: phoneNumber, }; - this._uri = _.template( - '/PhoneNumbers/<%= phoneNumber %>' // jshint ignore:line - )(this._solution); + this._uri = `/PhoneNumbers/${phoneNumber}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/service.js b/lib/rest/messaging/v1/service.js index e3e68a4d92..e6eee62097 100644 --- a/lib/rest/messaging/v1/service.js +++ b/lib/rest/messaging/v1/service.js @@ -56,9 +56,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -738,9 +736,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._phoneNumbers = undefined; diff --git a/lib/rest/messaging/v1/service/alphaSender.js b/lib/rest/messaging/v1/service/alphaSender.js index 950867363b..3bc2ff9c2b 100644 --- a/lib/rest/messaging/v1/service/alphaSender.js +++ b/lib/rest/messaging/v1/service/alphaSender.js @@ -54,9 +54,7 @@ AlphaSenderList = function AlphaSenderList(version, serviceSid) { AlphaSenderListInstance._version = version; // Path Solution AlphaSenderListInstance._solution = {serviceSid: serviceSid}; - AlphaSenderListInstance._uri = _.template( - '/Services/<%= serviceSid %>/AlphaSenders' // jshint ignore:line - )(AlphaSenderListInstance._solution); + AlphaSenderListInstance._uri = `/Services/${serviceSid}/AlphaSenders`; /* jshint ignore:start */ /** * create a AlphaSenderInstance @@ -594,9 +592,7 @@ AlphaSenderContext = function AlphaSenderContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/AlphaSenders/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/AlphaSenders/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/service/phoneNumber.js b/lib/rest/messaging/v1/service/phoneNumber.js index 8125819162..c82561f576 100644 --- a/lib/rest/messaging/v1/service/phoneNumber.js +++ b/lib/rest/messaging/v1/service/phoneNumber.js @@ -53,9 +53,7 @@ PhoneNumberList = function PhoneNumberList(version, serviceSid) { PhoneNumberListInstance._version = version; // Path Solution PhoneNumberListInstance._solution = {serviceSid: serviceSid}; - PhoneNumberListInstance._uri = _.template( - '/Services/<%= serviceSid %>/PhoneNumbers' // jshint ignore:line - )(PhoneNumberListInstance._solution); + PhoneNumberListInstance._uri = `/Services/${serviceSid}/PhoneNumbers`; /* jshint ignore:start */ /** * create a PhoneNumberInstance @@ -593,9 +591,7 @@ PhoneNumberContext = function PhoneNumberContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/PhoneNumbers/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/service/shortCode.js b/lib/rest/messaging/v1/service/shortCode.js index 2d930689e7..84838c335a 100644 --- a/lib/rest/messaging/v1/service/shortCode.js +++ b/lib/rest/messaging/v1/service/shortCode.js @@ -54,9 +54,7 @@ ShortCodeList = function ShortCodeList(version, serviceSid) { ShortCodeListInstance._version = version; // Path Solution ShortCodeListInstance._solution = {serviceSid: serviceSid}; - ShortCodeListInstance._uri = _.template( - '/Services/<%= serviceSid %>/ShortCodes' // jshint ignore:line - )(ShortCodeListInstance._solution); + ShortCodeListInstance._uri = `/Services/${serviceSid}/ShortCodes`; /* jshint ignore:start */ /** * create a ShortCodeInstance @@ -594,9 +592,7 @@ ShortCodeContext = function ShortCodeContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/ShortCodes/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/ShortCodes/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/session.js b/lib/rest/messaging/v1/session.js index 8918244d5f..df688c3de9 100644 --- a/lib/rest/messaging/v1/session.js +++ b/lib/rest/messaging/v1/session.js @@ -57,9 +57,7 @@ SessionList = function SessionList(version) { SessionListInstance._version = version; // Path Solution SessionListInstance._solution = {}; - SessionListInstance._uri = _.template( - '/Sessions' // jshint ignore:line - )(SessionListInstance._solution); + SessionListInstance._uri = `/Sessions`; /* jshint ignore:start */ /** * create a SessionInstance @@ -681,9 +679,7 @@ SessionContext = function SessionContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Sessions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Sessions/${sid}`; // Dependents this._participants = undefined; diff --git a/lib/rest/messaging/v1/session/message.js b/lib/rest/messaging/v1/session/message.js index cfa115d8b3..b38cae3c14 100644 --- a/lib/rest/messaging/v1/session/message.js +++ b/lib/rest/messaging/v1/session/message.js @@ -55,9 +55,7 @@ MessageList = function MessageList(version, sessionSid) { MessageListInstance._version = version; // Path Solution MessageListInstance._solution = {sessionSid: sessionSid}; - MessageListInstance._uri = _.template( - '/Sessions/<%= sessionSid %>/Messages' // jshint ignore:line - )(MessageListInstance._solution); + MessageListInstance._uri = `/Sessions/${sessionSid}/Messages`; /* jshint ignore:start */ /** * create a MessageInstance @@ -635,9 +633,7 @@ MessageContext = function MessageContext(version, sessionSid, sid) { // Path Solution this._solution = {sessionSid: sessionSid, sid: sid, }; - this._uri = _.template( - '/Sessions/<%= sessionSid %>/Messages/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Sessions/${sessionSid}/Messages/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/session/participant.js b/lib/rest/messaging/v1/session/participant.js index 733a55bcc2..37e71cf96c 100644 --- a/lib/rest/messaging/v1/session/participant.js +++ b/lib/rest/messaging/v1/session/participant.js @@ -55,9 +55,7 @@ ParticipantList = function ParticipantList(version, sessionSid) { ParticipantListInstance._version = version; // Path Solution ParticipantListInstance._solution = {sessionSid: sessionSid}; - ParticipantListInstance._uri = _.template( - '/Sessions/<%= sessionSid %>/Participants' // jshint ignore:line - )(ParticipantListInstance._solution); + ParticipantListInstance._uri = `/Sessions/${sessionSid}/Participants`; /* jshint ignore:start */ /** * create a ParticipantInstance @@ -651,9 +649,7 @@ ParticipantContext = function ParticipantContext(version, sessionSid, sid) { // Path Solution this._solution = {sessionSid: sessionSid, sid: sid, }; - this._uri = _.template( - '/Sessions/<%= sessionSid %>/Participants/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Sessions/${sessionSid}/Participants/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/session/webhook.js b/lib/rest/messaging/v1/session/webhook.js index 1ee35bbe5d..d86f8ec1f8 100644 --- a/lib/rest/messaging/v1/session/webhook.js +++ b/lib/rest/messaging/v1/session/webhook.js @@ -55,9 +55,7 @@ WebhookList = function WebhookList(version, sessionSid) { WebhookListInstance._version = version; // Path Solution WebhookListInstance._solution = {sessionSid: sessionSid}; - WebhookListInstance._uri = _.template( - '/Sessions/<%= sessionSid %>/Webhooks' // jshint ignore:line - )(WebhookListInstance._solution); + WebhookListInstance._uri = `/Sessions/${sessionSid}/Webhooks`; /* jshint ignore:start */ /** * Streams WebhookInstance records from the API. @@ -652,9 +650,7 @@ WebhookContext = function WebhookContext(version, sessionSid, sid) { // Path Solution this._solution = {sessionSid: sessionSid, sid: sid, }; - this._uri = _.template( - '/Sessions/<%= sessionSid %>/Webhooks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Sessions/${sessionSid}/Webhooks/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/messaging/v1/webhook.js b/lib/rest/messaging/v1/webhook.js index b24344fd1a..c442227049 100644 --- a/lib/rest/messaging/v1/webhook.js +++ b/lib/rest/messaging/v1/webhook.js @@ -312,9 +312,7 @@ WebhookContext = function WebhookContext(version) { // Path Solution this._solution = {}; - this._uri = _.template( - '/Sessions/Webhooks' // jshint ignore:line - )(this._solution); + this._uri = `/Sessions/Webhooks`; }; /* jshint ignore:start */ diff --git a/lib/rest/monitor/v1/alert.js b/lib/rest/monitor/v1/alert.js index fe6d2cbeb4..1404ac1e66 100644 --- a/lib/rest/monitor/v1/alert.js +++ b/lib/rest/monitor/v1/alert.js @@ -50,9 +50,7 @@ AlertList = function AlertList(version) { AlertListInstance._version = version; // Path Solution AlertListInstance._solution = {}; - AlertListInstance._uri = _.template( - '/Alerts' // jshint ignore:line - )(AlertListInstance._solution); + AlertListInstance._uri = `/Alerts`; /* jshint ignore:start */ /** * Streams AlertInstance records from the API. @@ -561,9 +559,7 @@ AlertContext = function AlertContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Alerts/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Alerts/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/monitor/v1/event.js b/lib/rest/monitor/v1/event.js index 640b183b16..87ca38aaeb 100644 --- a/lib/rest/monitor/v1/event.js +++ b/lib/rest/monitor/v1/event.js @@ -50,9 +50,7 @@ EventList = function EventList(version) { EventListInstance._version = version; // Path Solution EventListInstance._solution = {}; - EventListInstance._uri = _.template( - '/Events' // jshint ignore:line - )(EventListInstance._solution); + EventListInstance._uri = `/Events`; /* jshint ignore:start */ /** * Streams EventInstance records from the API. @@ -554,9 +552,7 @@ EventContext = function EventContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Events/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Events/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/notify/v1/credential.js b/lib/rest/notify/v1/credential.js index 58976471ab..10b2d28074 100644 --- a/lib/rest/notify/v1/credential.js +++ b/lib/rest/notify/v1/credential.js @@ -53,9 +53,7 @@ CredentialList = function CredentialList(version) { CredentialListInstance._version = version; // Path Solution CredentialListInstance._solution = {}; - CredentialListInstance._uri = _.template( - '/Credentials' // jshint ignore:line - )(CredentialListInstance._solution); + CredentialListInstance._uri = `/Credentials`; /* jshint ignore:start */ /** * Streams CredentialInstance records from the API. @@ -628,9 +626,7 @@ CredentialContext = function CredentialContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Credentials/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Credentials/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/notify/v1/service.js b/lib/rest/notify/v1/service.js index f33b475cbe..e8cffa5f1b 100644 --- a/lib/rest/notify/v1/service.js +++ b/lib/rest/notify/v1/service.js @@ -55,9 +55,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -713,9 +711,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._bindings = undefined; diff --git a/lib/rest/notify/v1/service/binding.js b/lib/rest/notify/v1/service/binding.js index 36139ab671..dce89b4035 100644 --- a/lib/rest/notify/v1/service/binding.js +++ b/lib/rest/notify/v1/service/binding.js @@ -55,9 +55,7 @@ BindingList = function BindingList(version, serviceSid) { BindingListInstance._version = version; // Path Solution BindingListInstance._solution = {serviceSid: serviceSid}; - BindingListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Bindings' // jshint ignore:line - )(BindingListInstance._solution); + BindingListInstance._uri = `/Services/${serviceSid}/Bindings`; /* jshint ignore:start */ /** * create a BindingInstance @@ -655,9 +653,7 @@ BindingContext = function BindingContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Bindings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Bindings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/notify/v1/service/notification.js b/lib/rest/notify/v1/service/notification.js index 3057d04423..b23db9ece2 100644 --- a/lib/rest/notify/v1/service/notification.js +++ b/lib/rest/notify/v1/service/notification.js @@ -54,9 +54,7 @@ NotificationList = function NotificationList(version, serviceSid) { NotificationListInstance._version = version; // Path Solution NotificationListInstance._solution = {serviceSid: serviceSid}; - NotificationListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Notifications' // jshint ignore:line - )(NotificationListInstance._solution); + NotificationListInstance._uri = `/Services/${serviceSid}/Notifications`; /* jshint ignore:start */ /** * create a NotificationInstance diff --git a/lib/rest/preview/acc_security/service.js b/lib/rest/preview/acc_security/service.js index 2f133b618f..023884db48 100644 --- a/lib/rest/preview/acc_security/service.js +++ b/lib/rest/preview/acc_security/service.js @@ -56,9 +56,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -621,9 +619,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._verifications = undefined; diff --git a/lib/rest/preview/acc_security/service/verification.js b/lib/rest/preview/acc_security/service/verification.js index 7fc1e8ae6b..c412dd5bbd 100644 --- a/lib/rest/preview/acc_security/service/verification.js +++ b/lib/rest/preview/acc_security/service/verification.js @@ -53,9 +53,7 @@ VerificationList = function VerificationList(version, serviceSid) { VerificationListInstance._version = version; // Path Solution VerificationListInstance._solution = {serviceSid: serviceSid}; - VerificationListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Verifications' // jshint ignore:line - )(VerificationListInstance._solution); + VerificationListInstance._uri = `/Services/${serviceSid}/Verifications`; /* jshint ignore:start */ /** * create a VerificationInstance diff --git a/lib/rest/preview/acc_security/service/verificationCheck.js b/lib/rest/preview/acc_security/service/verificationCheck.js index 3f4261e408..8b096c34ed 100644 --- a/lib/rest/preview/acc_security/service/verificationCheck.js +++ b/lib/rest/preview/acc_security/service/verificationCheck.js @@ -53,9 +53,7 @@ VerificationCheckList = function VerificationCheckList(version, serviceSid) { VerificationCheckListInstance._version = version; // Path Solution VerificationCheckListInstance._solution = {serviceSid: serviceSid}; - VerificationCheckListInstance._uri = _.template( - '/Services/<%= serviceSid %>/VerificationCheck' // jshint ignore:line - )(VerificationCheckListInstance._solution); + VerificationCheckListInstance._uri = `/Services/${serviceSid}/VerificationCheck`; /* jshint ignore:start */ /** * create a VerificationCheckInstance diff --git a/lib/rest/preview/bulk_exports/export.js b/lib/rest/preview/bulk_exports/export.js index 32fef24b8d..9356204b50 100644 --- a/lib/rest/preview/bulk_exports/export.js +++ b/lib/rest/preview/bulk_exports/export.js @@ -279,9 +279,7 @@ ExportContext = function ExportContext(version, resourceType) { // Path Solution this._solution = {resourceType: resourceType, }; - this._uri = _.template( - '/Exports/<%= resourceType %>' // jshint ignore:line - )(this._solution); + this._uri = `/Exports/${resourceType}`; // Dependents this._days = undefined; diff --git a/lib/rest/preview/bulk_exports/export/day.js b/lib/rest/preview/bulk_exports/export/day.js index e1331bda51..18871d89fc 100644 --- a/lib/rest/preview/bulk_exports/export/day.js +++ b/lib/rest/preview/bulk_exports/export/day.js @@ -53,9 +53,7 @@ DayList = function DayList(version, resourceType) { DayListInstance._version = version; // Path Solution DayListInstance._solution = {resourceType: resourceType}; - DayListInstance._uri = _.template( - '/Exports/<%= resourceType %>/Days' // jshint ignore:line - )(DayListInstance._solution); + DayListInstance._uri = `/Exports/${resourceType}/Days`; /* jshint ignore:start */ /** * Streams DayInstance records from the API. diff --git a/lib/rest/preview/bulk_exports/exportConfiguration.js b/lib/rest/preview/bulk_exports/exportConfiguration.js index 60d9010ade..2aba426c6b 100644 --- a/lib/rest/preview/bulk_exports/exportConfiguration.js +++ b/lib/rest/preview/bulk_exports/exportConfiguration.js @@ -291,9 +291,7 @@ ExportConfigurationContext = function ExportConfigurationContext(version, // Path Solution this._solution = {resourceType: resourceType, }; - this._uri = _.template( - '/Exports/<%= resourceType %>/Configuration' // jshint ignore:line - )(this._solution); + this._uri = `/Exports/${resourceType}/Configuration`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/deployed_devices/fleet.js b/lib/rest/preview/deployed_devices/fleet.js index e82f7a5aec..f3b67c861d 100644 --- a/lib/rest/preview/deployed_devices/fleet.js +++ b/lib/rest/preview/deployed_devices/fleet.js @@ -57,9 +57,7 @@ FleetList = function FleetList(version) { FleetListInstance._version = version; // Path Solution FleetListInstance._solution = {}; - FleetListInstance._uri = _.template( - '/Fleets' // jshint ignore:line - )(FleetListInstance._solution); + FleetListInstance._uri = `/Fleets`; /* jshint ignore:start */ /** * create a FleetInstance @@ -670,9 +668,7 @@ FleetContext = function FleetContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Fleets/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Fleets/${sid}`; // Dependents this._devices = undefined; diff --git a/lib/rest/preview/deployed_devices/fleet/certificate.js b/lib/rest/preview/deployed_devices/fleet/certificate.js index 345633d0f6..b423ffc965 100644 --- a/lib/rest/preview/deployed_devices/fleet/certificate.js +++ b/lib/rest/preview/deployed_devices/fleet/certificate.js @@ -54,9 +54,7 @@ CertificateList = function CertificateList(version, fleetSid) { CertificateListInstance._version = version; // Path Solution CertificateListInstance._solution = {fleetSid: fleetSid}; - CertificateListInstance._uri = _.template( - '/Fleets/<%= fleetSid %>/Certificates' // jshint ignore:line - )(CertificateListInstance._solution); + CertificateListInstance._uri = `/Fleets/${fleetSid}/Certificates`; /* jshint ignore:start */ /** * create a CertificateInstance @@ -628,9 +626,7 @@ CertificateContext = function CertificateContext(version, fleetSid, sid) { // Path Solution this._solution = {fleetSid: fleetSid, sid: sid, }; - this._uri = _.template( - '/Fleets/<%= fleetSid %>/Certificates/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Fleets/${fleetSid}/Certificates/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/deployed_devices/fleet/deployment.js b/lib/rest/preview/deployed_devices/fleet/deployment.js index 924b04fb1b..3d34503435 100644 --- a/lib/rest/preview/deployed_devices/fleet/deployment.js +++ b/lib/rest/preview/deployed_devices/fleet/deployment.js @@ -54,9 +54,7 @@ DeploymentList = function DeploymentList(version, fleetSid) { DeploymentListInstance._version = version; // Path Solution DeploymentListInstance._solution = {fleetSid: fleetSid}; - DeploymentListInstance._uri = _.template( - '/Fleets/<%= fleetSid %>/Deployments' // jshint ignore:line - )(DeploymentListInstance._solution); + DeploymentListInstance._uri = `/Fleets/${fleetSid}/Deployments`; /* jshint ignore:start */ /** * create a DeploymentInstance @@ -616,9 +614,7 @@ DeploymentContext = function DeploymentContext(version, fleetSid, sid) { // Path Solution this._solution = {fleetSid: fleetSid, sid: sid, }; - this._uri = _.template( - '/Fleets/<%= fleetSid %>/Deployments/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Fleets/${fleetSid}/Deployments/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/deployed_devices/fleet/device.js b/lib/rest/preview/deployed_devices/fleet/device.js index 4bee370b87..09bb3cfb6b 100644 --- a/lib/rest/preview/deployed_devices/fleet/device.js +++ b/lib/rest/preview/deployed_devices/fleet/device.js @@ -55,9 +55,7 @@ DeviceList = function DeviceList(version, fleetSid) { DeviceListInstance._version = version; // Path Solution DeviceListInstance._solution = {fleetSid: fleetSid}; - DeviceListInstance._uri = _.template( - '/Fleets/<%= fleetSid %>/Devices' // jshint ignore:line - )(DeviceListInstance._solution); + DeviceListInstance._uri = `/Fleets/${fleetSid}/Devices`; /* jshint ignore:start */ /** * create a DeviceInstance @@ -634,9 +632,7 @@ DeviceContext = function DeviceContext(version, fleetSid, sid) { // Path Solution this._solution = {fleetSid: fleetSid, sid: sid, }; - this._uri = _.template( - '/Fleets/<%= fleetSid %>/Devices/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Fleets/${fleetSid}/Devices/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/deployed_devices/fleet/key.js b/lib/rest/preview/deployed_devices/fleet/key.js index ee805bd0bc..62d3fcaa13 100644 --- a/lib/rest/preview/deployed_devices/fleet/key.js +++ b/lib/rest/preview/deployed_devices/fleet/key.js @@ -54,9 +54,7 @@ KeyList = function KeyList(version, fleetSid) { KeyListInstance._version = version; // Path Solution KeyListInstance._solution = {fleetSid: fleetSid}; - KeyListInstance._uri = _.template( - '/Fleets/<%= fleetSid %>/Keys' // jshint ignore:line - )(KeyListInstance._solution); + KeyListInstance._uri = `/Fleets/${fleetSid}/Keys`; /* jshint ignore:start */ /** * create a KeyInstance @@ -620,9 +618,7 @@ KeyContext = function KeyContext(version, fleetSid, sid) { // Path Solution this._solution = {fleetSid: fleetSid, sid: sid, }; - this._uri = _.template( - '/Fleets/<%= fleetSid %>/Keys/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Fleets/${fleetSid}/Keys/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/hosted_numbers/authorizationDocument.js b/lib/rest/preview/hosted_numbers/authorizationDocument.js index 4cf7be7c0d..c7f1c47be0 100644 --- a/lib/rest/preview/hosted_numbers/authorizationDocument.js +++ b/lib/rest/preview/hosted_numbers/authorizationDocument.js @@ -56,9 +56,7 @@ AuthorizationDocumentList = function AuthorizationDocumentList(version) { AuthorizationDocumentListInstance._version = version; // Path Solution AuthorizationDocumentListInstance._solution = {}; - AuthorizationDocumentListInstance._uri = _.template( - '/AuthorizationDocuments' // jshint ignore:line - )(AuthorizationDocumentListInstance._solution); + AuthorizationDocumentListInstance._uri = `/AuthorizationDocuments`; /* jshint ignore:start */ /** * Streams AuthorizationDocumentInstance records from the API. @@ -661,9 +659,7 @@ AuthorizationDocumentContext = function AuthorizationDocumentContext(version, // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/AuthorizationDocuments/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/AuthorizationDocuments/${sid}`; // Dependents this._dependentHostedNumberOrders = undefined; diff --git a/lib/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.js b/lib/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.js index d6e6fc9d05..ec3a49014c 100644 --- a/lib/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.js +++ b/lib/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.js @@ -54,9 +54,7 @@ DependentHostedNumberOrderList = function DependentHostedNumberOrderListInstance._version = version; // Path Solution DependentHostedNumberOrderListInstance._solution = {signingDocumentSid: signingDocumentSid}; - DependentHostedNumberOrderListInstance._uri = _.template( - '/AuthorizationDocuments/<%= signingDocumentSid %>/DependentHostedNumberOrders' // jshint ignore:line - )(DependentHostedNumberOrderListInstance._solution); + DependentHostedNumberOrderListInstance._uri = `/AuthorizationDocuments/${signingDocumentSid}/DependentHostedNumberOrders`; /* jshint ignore:start */ /** * Streams DependentHostedNumberOrderInstance records from the API. diff --git a/lib/rest/preview/hosted_numbers/hostedNumberOrder.js b/lib/rest/preview/hosted_numbers/hostedNumberOrder.js index 9d096c1e86..5df75527e9 100644 --- a/lib/rest/preview/hosted_numbers/hostedNumberOrder.js +++ b/lib/rest/preview/hosted_numbers/hostedNumberOrder.js @@ -54,9 +54,7 @@ HostedNumberOrderList = function HostedNumberOrderList(version) { HostedNumberOrderListInstance._version = version; // Path Solution HostedNumberOrderListInstance._solution = {}; - HostedNumberOrderListInstance._uri = _.template( - '/HostedNumberOrders' // jshint ignore:line - )(HostedNumberOrderListInstance._solution); + HostedNumberOrderListInstance._uri = `/HostedNumberOrders`; /* jshint ignore:start */ /** * Streams HostedNumberOrderInstance records from the API. @@ -724,9 +722,7 @@ HostedNumberOrderContext = function HostedNumberOrderContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/HostedNumberOrders/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/HostedNumberOrders/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/marketplace/availableAddOn.js b/lib/rest/preview/marketplace/availableAddOn.js index aa167abf18..c2e65e14af 100644 --- a/lib/rest/preview/marketplace/availableAddOn.js +++ b/lib/rest/preview/marketplace/availableAddOn.js @@ -53,9 +53,7 @@ AvailableAddOnList = function AvailableAddOnList(version) { AvailableAddOnListInstance._version = version; // Path Solution AvailableAddOnListInstance._solution = {}; - AvailableAddOnListInstance._uri = _.template( - '/AvailableAddOns' // jshint ignore:line - )(AvailableAddOnListInstance._solution); + AvailableAddOnListInstance._uri = `/AvailableAddOns`; /* jshint ignore:start */ /** * Streams AvailableAddOnInstance records from the API. @@ -540,9 +538,7 @@ AvailableAddOnContext = function AvailableAddOnContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/AvailableAddOns/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/AvailableAddOns/${sid}`; // Dependents this._extensions = undefined; diff --git a/lib/rest/preview/marketplace/availableAddOn/availableAddOnExtension.js b/lib/rest/preview/marketplace/availableAddOn/availableAddOnExtension.js index 70a2cb469e..12671aefac 100644 --- a/lib/rest/preview/marketplace/availableAddOn/availableAddOnExtension.js +++ b/lib/rest/preview/marketplace/availableAddOn/availableAddOnExtension.js @@ -53,9 +53,7 @@ AvailableAddOnExtensionList = function AvailableAddOnExtensionList(version, AvailableAddOnExtensionListInstance._version = version; // Path Solution AvailableAddOnExtensionListInstance._solution = {availableAddOnSid: availableAddOnSid}; - AvailableAddOnExtensionListInstance._uri = _.template( - '/AvailableAddOns/<%= availableAddOnSid %>/Extensions' // jshint ignore:line - )(AvailableAddOnExtensionListInstance._solution); + AvailableAddOnExtensionListInstance._uri = `/AvailableAddOns/${availableAddOnSid}/Extensions`; /* jshint ignore:start */ /** * Streams AvailableAddOnExtensionInstance records from the API. @@ -536,9 +534,7 @@ AvailableAddOnExtensionContext = function // Path Solution this._solution = {availableAddOnSid: availableAddOnSid, sid: sid, }; - this._uri = _.template( - '/AvailableAddOns/<%= availableAddOnSid %>/Extensions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/AvailableAddOns/${availableAddOnSid}/Extensions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/marketplace/installedAddOn.js b/lib/rest/preview/marketplace/installedAddOn.js index 8d1901eaf5..c4658d8f21 100644 --- a/lib/rest/preview/marketplace/installedAddOn.js +++ b/lib/rest/preview/marketplace/installedAddOn.js @@ -56,9 +56,7 @@ InstalledAddOnList = function InstalledAddOnList(version) { InstalledAddOnListInstance._version = version; // Path Solution InstalledAddOnListInstance._solution = {}; - InstalledAddOnListInstance._uri = _.template( - '/InstalledAddOns' // jshint ignore:line - )(InstalledAddOnListInstance._solution); + InstalledAddOnListInstance._uri = `/InstalledAddOns`; /* jshint ignore:start */ /** * create a InstalledAddOnInstance @@ -645,9 +643,7 @@ InstalledAddOnContext = function InstalledAddOnContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/InstalledAddOns/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/InstalledAddOns/${sid}`; // Dependents this._extensions = undefined; diff --git a/lib/rest/preview/marketplace/installedAddOn/installedAddOnExtension.js b/lib/rest/preview/marketplace/installedAddOn/installedAddOnExtension.js index 9ae57d4821..3a1ad3aafd 100644 --- a/lib/rest/preview/marketplace/installedAddOn/installedAddOnExtension.js +++ b/lib/rest/preview/marketplace/installedAddOn/installedAddOnExtension.js @@ -54,9 +54,7 @@ InstalledAddOnExtensionList = function InstalledAddOnExtensionList(version, InstalledAddOnExtensionListInstance._version = version; // Path Solution InstalledAddOnExtensionListInstance._solution = {installedAddOnSid: installedAddOnSid}; - InstalledAddOnExtensionListInstance._uri = _.template( - '/InstalledAddOns/<%= installedAddOnSid %>/Extensions' // jshint ignore:line - )(InstalledAddOnExtensionListInstance._solution); + InstalledAddOnExtensionListInstance._uri = `/InstalledAddOns/${installedAddOnSid}/Extensions`; /* jshint ignore:start */ /** * Streams InstalledAddOnExtensionInstance records from the API. @@ -560,9 +558,7 @@ InstalledAddOnExtensionContext = function // Path Solution this._solution = {installedAddOnSid: installedAddOnSid, sid: sid, }; - this._uri = _.template( - '/InstalledAddOns/<%= installedAddOnSid %>/Extensions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/InstalledAddOns/${installedAddOnSid}/Extensions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/sync/service.js b/lib/rest/preview/sync/service.js index 12b2784c6f..95b682f397 100644 --- a/lib/rest/preview/sync/service.js +++ b/lib/rest/preview/sync/service.js @@ -57,9 +57,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -666,9 +664,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._documents = undefined; diff --git a/lib/rest/preview/sync/service/document.js b/lib/rest/preview/sync/service/document.js index 9c9bc831c0..b1af0e1c76 100644 --- a/lib/rest/preview/sync/service/document.js +++ b/lib/rest/preview/sync/service/document.js @@ -57,9 +57,7 @@ DocumentList = function DocumentList(version, serviceSid) { DocumentListInstance._version = version; // Path Solution DocumentListInstance._solution = {serviceSid: serviceSid}; - DocumentListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Documents' // jshint ignore:line - )(DocumentListInstance._solution); + DocumentListInstance._uri = `/Services/${serviceSid}/Documents`; /* jshint ignore:start */ /** * create a DocumentInstance @@ -635,9 +633,7 @@ DocumentContext = function DocumentContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Documents/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Documents/${sid}`; // Dependents this._documentPermissions = undefined; diff --git a/lib/rest/preview/sync/service/document/documentPermission.js b/lib/rest/preview/sync/service/document/documentPermission.js index 50262b7770..a5c99de148 100644 --- a/lib/rest/preview/sync/service/document/documentPermission.js +++ b/lib/rest/preview/sync/service/document/documentPermission.js @@ -56,9 +56,7 @@ DocumentPermissionList = function DocumentPermissionList(version, serviceSid, DocumentPermissionListInstance._version = version; // Path Solution DocumentPermissionListInstance._solution = {serviceSid: serviceSid, documentSid: documentSid}; - DocumentPermissionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions' // jshint ignore:line - )(DocumentPermissionListInstance._solution); + DocumentPermissionListInstance._uri = `/Services/${serviceSid}/Documents/${documentSid}/Permissions`; /* jshint ignore:start */ /** * Streams DocumentPermissionInstance records from the API. @@ -592,9 +590,7 @@ DocumentPermissionContext = function DocumentPermissionContext(version, // Path Solution this._solution = {serviceSid: serviceSid, documentSid: documentSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/sync/service/syncList.js b/lib/rest/preview/sync/service/syncList.js index afdfee8e12..32fefa97e2 100644 --- a/lib/rest/preview/sync/service/syncList.js +++ b/lib/rest/preview/sync/service/syncList.js @@ -57,9 +57,7 @@ SyncListList = function SyncListList(version, serviceSid) { SyncListListInstance._version = version; // Path Solution SyncListListInstance._solution = {serviceSid: serviceSid}; - SyncListListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Lists' // jshint ignore:line - )(SyncListListInstance._solution); + SyncListListInstance._uri = `/Services/${serviceSid}/Lists`; /* jshint ignore:start */ /** * create a SyncListInstance @@ -627,9 +625,7 @@ SyncListContext = function SyncListContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Lists/${sid}`; // Dependents this._syncListItems = undefined; diff --git a/lib/rest/preview/sync/service/syncList/syncListItem.js b/lib/rest/preview/sync/service/syncList/syncListItem.js index 987a1be001..d6d11f2714 100644 --- a/lib/rest/preview/sync/service/syncList/syncListItem.js +++ b/lib/rest/preview/sync/service/syncList/syncListItem.js @@ -57,9 +57,7 @@ SyncListItemList = function SyncListItemList(version, serviceSid, listSid) { SyncListItemListInstance._version = version; // Path Solution SyncListItemListInstance._solution = {serviceSid: serviceSid, listSid: listSid}; - SyncListItemListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items' // jshint ignore:line - )(SyncListItemListInstance._solution); + SyncListItemListInstance._uri = `/Services/${serviceSid}/Lists/${listSid}/Items`; /* jshint ignore:start */ /** * create a SyncListItemInstance @@ -646,9 +644,7 @@ SyncListItemContext = function SyncListItemContext(version, serviceSid, listSid, // Path Solution this._solution = {serviceSid: serviceSid, listSid: listSid, index: index, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/sync/service/syncList/syncListPermission.js b/lib/rest/preview/sync/service/syncList/syncListPermission.js index 4a94ede364..58a2b5a4b2 100644 --- a/lib/rest/preview/sync/service/syncList/syncListPermission.js +++ b/lib/rest/preview/sync/service/syncList/syncListPermission.js @@ -56,9 +56,7 @@ SyncListPermissionList = function SyncListPermissionList(version, serviceSid, SyncListPermissionListInstance._version = version; // Path Solution SyncListPermissionListInstance._solution = {serviceSid: serviceSid, listSid: listSid}; - SyncListPermissionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions' // jshint ignore:line - )(SyncListPermissionListInstance._solution); + SyncListPermissionListInstance._uri = `/Services/${serviceSid}/Lists/${listSid}/Permissions`; /* jshint ignore:start */ /** * Streams SyncListPermissionInstance records from the API. @@ -588,9 +586,7 @@ SyncListPermissionContext = function SyncListPermissionContext(version, // Path Solution this._solution = {serviceSid: serviceSid, listSid: listSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/sync/service/syncMap.js b/lib/rest/preview/sync/service/syncMap.js index 6bae054ede..513ca2aedc 100644 --- a/lib/rest/preview/sync/service/syncMap.js +++ b/lib/rest/preview/sync/service/syncMap.js @@ -57,9 +57,7 @@ SyncMapList = function SyncMapList(version, serviceSid) { SyncMapListInstance._version = version; // Path Solution SyncMapListInstance._solution = {serviceSid: serviceSid}; - SyncMapListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Maps' // jshint ignore:line - )(SyncMapListInstance._solution); + SyncMapListInstance._uri = `/Services/${serviceSid}/Maps`; /* jshint ignore:start */ /** * create a SyncMapInstance @@ -625,9 +623,7 @@ SyncMapContext = function SyncMapContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Maps/${sid}`; // Dependents this._syncMapItems = undefined; diff --git a/lib/rest/preview/sync/service/syncMap/syncMapItem.js b/lib/rest/preview/sync/service/syncMap/syncMapItem.js index 8e142d1144..ca0e4c9fd8 100644 --- a/lib/rest/preview/sync/service/syncMap/syncMapItem.js +++ b/lib/rest/preview/sync/service/syncMap/syncMapItem.js @@ -57,9 +57,7 @@ SyncMapItemList = function SyncMapItemList(version, serviceSid, mapSid) { SyncMapItemListInstance._version = version; // Path Solution SyncMapItemListInstance._solution = {serviceSid: serviceSid, mapSid: mapSid}; - SyncMapItemListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items' // jshint ignore:line - )(SyncMapItemListInstance._solution); + SyncMapItemListInstance._uri = `/Services/${serviceSid}/Maps/${mapSid}/Items`; /* jshint ignore:start */ /** * create a SyncMapItemInstance @@ -644,9 +642,7 @@ SyncMapItemContext = function SyncMapItemContext(version, serviceSid, mapSid, // Path Solution this._solution = {serviceSid: serviceSid, mapSid: mapSid, key: key, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/sync/service/syncMap/syncMapPermission.js b/lib/rest/preview/sync/service/syncMap/syncMapPermission.js index cb4551ac24..55c64bac5e 100644 --- a/lib/rest/preview/sync/service/syncMap/syncMapPermission.js +++ b/lib/rest/preview/sync/service/syncMap/syncMapPermission.js @@ -56,9 +56,7 @@ SyncMapPermissionList = function SyncMapPermissionList(version, serviceSid, SyncMapPermissionListInstance._version = version; // Path Solution SyncMapPermissionListInstance._solution = {serviceSid: serviceSid, mapSid: mapSid}; - SyncMapPermissionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions' // jshint ignore:line - )(SyncMapPermissionListInstance._solution); + SyncMapPermissionListInstance._uri = `/Services/${serviceSid}/Maps/${mapSid}/Permissions`; /* jshint ignore:start */ /** * Streams SyncMapPermissionInstance records from the API. @@ -587,9 +585,7 @@ SyncMapPermissionContext = function SyncMapPermissionContext(version, // Path Solution this._solution = {serviceSid: serviceSid, mapSid: mapSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant.js b/lib/rest/preview/understand/assistant.js index 8575a79b53..3cbf550c56 100644 --- a/lib/rest/preview/understand/assistant.js +++ b/lib/rest/preview/understand/assistant.js @@ -64,9 +64,7 @@ AssistantList = function AssistantList(version) { AssistantListInstance._version = version; // Path Solution AssistantListInstance._solution = {}; - AssistantListInstance._uri = _.template( - '/Assistants' // jshint ignore:line - )(AssistantListInstance._solution); + AssistantListInstance._uri = `/Assistants`; /* jshint ignore:start */ /** * Streams AssistantInstance records from the API. @@ -795,9 +793,7 @@ AssistantContext = function AssistantContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Assistants/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${sid}`; // Dependents this._fieldTypes = undefined; diff --git a/lib/rest/preview/understand/assistant/assistantFallbackActions.js b/lib/rest/preview/understand/assistant/assistantFallbackActions.js index c2fcebaf1d..8ccf0ebc5a 100644 --- a/lib/rest/preview/understand/assistant/assistantFallbackActions.js +++ b/lib/rest/preview/understand/assistant/assistantFallbackActions.js @@ -289,9 +289,7 @@ AssistantFallbackActionsContext = function // Path Solution this._solution = {assistantSid: assistantSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/FallbackActions' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/FallbackActions`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/assistantInitiationActions.js b/lib/rest/preview/understand/assistant/assistantInitiationActions.js index 7359065e47..27f9f5a41f 100644 --- a/lib/rest/preview/understand/assistant/assistantInitiationActions.js +++ b/lib/rest/preview/understand/assistant/assistantInitiationActions.js @@ -290,9 +290,7 @@ AssistantInitiationActionsContext = function // Path Solution this._solution = {assistantSid: assistantSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/InitiationActions' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/InitiationActions`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/dialogue.js b/lib/rest/preview/understand/assistant/dialogue.js index aaf87bbd87..8525f8f63c 100644 --- a/lib/rest/preview/understand/assistant/dialogue.js +++ b/lib/rest/preview/understand/assistant/dialogue.js @@ -270,9 +270,7 @@ DialogueContext = function DialogueContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Dialogues/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Dialogues/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/fieldType.js b/lib/rest/preview/understand/assistant/fieldType.js index d8a3a96daf..2ad802f62c 100644 --- a/lib/rest/preview/understand/assistant/fieldType.js +++ b/lib/rest/preview/understand/assistant/fieldType.js @@ -55,9 +55,7 @@ FieldTypeList = function FieldTypeList(version, assistantSid) { FieldTypeListInstance._version = version; // Path Solution FieldTypeListInstance._solution = {assistantSid: assistantSid}; - FieldTypeListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes' // jshint ignore:line - )(FieldTypeListInstance._solution); + FieldTypeListInstance._uri = `/Assistants/${assistantSid}/FieldTypes`; /* jshint ignore:start */ /** * Streams FieldTypeInstance records from the API. @@ -643,9 +641,7 @@ FieldTypeContext = function FieldTypeContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/FieldTypes/${sid}`; // Dependents this._fieldValues = undefined; diff --git a/lib/rest/preview/understand/assistant/fieldType/fieldValue.js b/lib/rest/preview/understand/assistant/fieldType/fieldValue.js index 25a4d35ad7..ba0177ba73 100644 --- a/lib/rest/preview/understand/assistant/fieldType/fieldValue.js +++ b/lib/rest/preview/understand/assistant/fieldType/fieldValue.js @@ -56,9 +56,7 @@ FieldValueList = function FieldValueList(version, assistantSid, fieldTypeSid) { FieldValueListInstance._version = version; // Path Solution FieldValueListInstance._solution = {assistantSid: assistantSid, fieldTypeSid: fieldTypeSid}; - FieldValueListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues' // jshint ignore:line - )(FieldValueListInstance._solution); + FieldValueListInstance._uri = `/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues`; /* jshint ignore:start */ /** * Streams FieldValueInstance records from the API. @@ -636,9 +634,7 @@ FieldValueContext = function FieldValueContext(version, assistantSid, // Path Solution this._solution = {assistantSid: assistantSid, fieldTypeSid: fieldTypeSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/modelBuild.js b/lib/rest/preview/understand/assistant/modelBuild.js index 4017d00adb..c9aa37558d 100644 --- a/lib/rest/preview/understand/assistant/modelBuild.js +++ b/lib/rest/preview/understand/assistant/modelBuild.js @@ -54,9 +54,7 @@ ModelBuildList = function ModelBuildList(version, assistantSid) { ModelBuildListInstance._version = version; // Path Solution ModelBuildListInstance._solution = {assistantSid: assistantSid}; - ModelBuildListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/ModelBuilds' // jshint ignore:line - )(ModelBuildListInstance._solution); + ModelBuildListInstance._uri = `/Assistants/${assistantSid}/ModelBuilds`; /* jshint ignore:start */ /** * Streams ModelBuildInstance records from the API. @@ -624,9 +622,7 @@ ModelBuildContext = function ModelBuildContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/ModelBuilds/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/query.js b/lib/rest/preview/understand/assistant/query.js index c6d96dc1b9..fe2ed3e5a1 100644 --- a/lib/rest/preview/understand/assistant/query.js +++ b/lib/rest/preview/understand/assistant/query.js @@ -54,9 +54,7 @@ QueryList = function QueryList(version, assistantSid) { QueryListInstance._version = version; // Path Solution QueryListInstance._solution = {assistantSid: assistantSid}; - QueryListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Queries' // jshint ignore:line - )(QueryListInstance._solution); + QueryListInstance._uri = `/Assistants/${assistantSid}/Queries`; /* jshint ignore:start */ /** * Streams QueryInstance records from the API. @@ -661,9 +659,7 @@ QueryContext = function QueryContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Queries/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Queries/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/styleSheet.js b/lib/rest/preview/understand/assistant/styleSheet.js index b469b86d60..f4ca2f74e7 100644 --- a/lib/rest/preview/understand/assistant/styleSheet.js +++ b/lib/rest/preview/understand/assistant/styleSheet.js @@ -284,9 +284,7 @@ StyleSheetContext = function StyleSheetContext(version, assistantSid) { // Path Solution this._solution = {assistantSid: assistantSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/StyleSheet' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/StyleSheet`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/task.js b/lib/rest/preview/understand/assistant/task.js index cca1134a98..2d07fb749d 100644 --- a/lib/rest/preview/understand/assistant/task.js +++ b/lib/rest/preview/understand/assistant/task.js @@ -59,9 +59,7 @@ TaskList = function TaskList(version, assistantSid) { TaskListInstance._version = version; // Path Solution TaskListInstance._solution = {assistantSid: assistantSid}; - TaskListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks' // jshint ignore:line - )(TaskListInstance._solution); + TaskListInstance._uri = `/Assistants/${assistantSid}/Tasks`; /* jshint ignore:start */ /** * Streams TaskInstance records from the API. @@ -704,9 +702,7 @@ TaskContext = function TaskContext(version, assistantSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${sid}`; // Dependents this._fields = undefined; diff --git a/lib/rest/preview/understand/assistant/task/field.js b/lib/rest/preview/understand/assistant/task/field.js index 0ae5cdff97..9aa7ffc339 100644 --- a/lib/rest/preview/understand/assistant/task/field.js +++ b/lib/rest/preview/understand/assistant/task/field.js @@ -55,9 +55,7 @@ FieldList = function FieldList(version, assistantSid, taskSid) { FieldListInstance._version = version; // Path Solution FieldListInstance._solution = {assistantSid: assistantSid, taskSid: taskSid}; - FieldListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields' // jshint ignore:line - )(FieldListInstance._solution); + FieldListInstance._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Fields`; /* jshint ignore:start */ /** * Streams FieldInstance records from the API. @@ -621,9 +619,7 @@ FieldContext = function FieldContext(version, assistantSid, taskSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Fields/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/task/sample.js b/lib/rest/preview/understand/assistant/task/sample.js index f3274b01c7..cd5d873d6f 100644 --- a/lib/rest/preview/understand/assistant/task/sample.js +++ b/lib/rest/preview/understand/assistant/task/sample.js @@ -55,9 +55,7 @@ SampleList = function SampleList(version, assistantSid, taskSid) { SampleListInstance._version = version; // Path Solution SampleListInstance._solution = {assistantSid: assistantSid, taskSid: taskSid}; - SampleListInstance._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples' // jshint ignore:line - )(SampleListInstance._solution); + SampleListInstance._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Samples`; /* jshint ignore:start */ /** * Streams SampleInstance records from the API. @@ -649,9 +647,7 @@ SampleContext = function SampleContext(version, assistantSid, taskSid, sid) { // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, sid: sid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/task/taskActions.js b/lib/rest/preview/understand/assistant/task/taskActions.js index d9d86b4b0d..3ce05b251c 100644 --- a/lib/rest/preview/understand/assistant/task/taskActions.js +++ b/lib/rest/preview/understand/assistant/task/taskActions.js @@ -302,9 +302,7 @@ TaskActionsContext = function TaskActionsContext(version, assistantSid, taskSid) // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Actions' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Actions`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/understand/assistant/task/taskStatistics.js b/lib/rest/preview/understand/assistant/task/taskStatistics.js index 3c1f7e5439..c818ff7fd2 100644 --- a/lib/rest/preview/understand/assistant/task/taskStatistics.js +++ b/lib/rest/preview/understand/assistant/task/taskStatistics.js @@ -295,9 +295,7 @@ TaskStatisticsContext = function TaskStatisticsContext(version, assistantSid, // Path Solution this._solution = {assistantSid: assistantSid, taskSid: taskSid, }; - this._uri = _.template( - '/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Assistants/${assistantSid}/Tasks/${taskSid}/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/wireless/command.js b/lib/rest/preview/wireless/command.js index b9c017310b..3d085264a3 100644 --- a/lib/rest/preview/wireless/command.js +++ b/lib/rest/preview/wireless/command.js @@ -53,9 +53,7 @@ CommandList = function CommandList(version) { CommandListInstance._version = version; // Path Solution CommandListInstance._solution = {}; - CommandListInstance._uri = _.template( - '/Commands' // jshint ignore:line - )(CommandListInstance._solution); + CommandListInstance._uri = `/Commands`; /* jshint ignore:start */ /** * Streams CommandInstance records from the API. @@ -598,9 +596,7 @@ CommandContext = function CommandContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Commands/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Commands/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/wireless/ratePlan.js b/lib/rest/preview/wireless/ratePlan.js index af78d31a86..8d23717968 100644 --- a/lib/rest/preview/wireless/ratePlan.js +++ b/lib/rest/preview/wireless/ratePlan.js @@ -54,9 +54,7 @@ RatePlanList = function RatePlanList(version) { RatePlanListInstance._version = version; // Path Solution RatePlanListInstance._solution = {}; - RatePlanListInstance._uri = _.template( - '/RatePlans' // jshint ignore:line - )(RatePlanListInstance._solution); + RatePlanListInstance._uri = `/RatePlans`; /* jshint ignore:start */ /** * Streams RatePlanInstance records from the API. @@ -629,9 +627,7 @@ RatePlanContext = function RatePlanContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/RatePlans/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/RatePlans/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/wireless/sim.js b/lib/rest/preview/wireless/sim.js index efc3f584b1..46320e2cd5 100644 --- a/lib/rest/preview/wireless/sim.js +++ b/lib/rest/preview/wireless/sim.js @@ -54,9 +54,7 @@ SimList = function SimList(version) { SimListInstance._version = version; // Path Solution SimListInstance._solution = {}; - SimListInstance._uri = _.template( - '/Sims' // jshint ignore:line - )(SimListInstance._solution); + SimListInstance._uri = `/Sims`; /* jshint ignore:start */ /** * Streams SimInstance records from the API. @@ -617,9 +615,7 @@ SimContext = function SimContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Sims/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Sims/${sid}`; // Dependents this._usage = undefined; diff --git a/lib/rest/preview/wireless/sim/usage.js b/lib/rest/preview/wireless/sim/usage.js index 864de458f7..b1f7200c91 100644 --- a/lib/rest/preview/wireless/sim/usage.js +++ b/lib/rest/preview/wireless/sim/usage.js @@ -275,9 +275,7 @@ UsageContext = function UsageContext(version, simSid) { // Path Solution this._solution = {simSid: simSid, }; - this._uri = _.template( - '/Sims/<%= simSid %>/Usage' // jshint ignore:line - )(this._solution); + this._uri = `/Sims/${simSid}/Usage`; }; /* jshint ignore:start */ diff --git a/lib/rest/pricing/v1/messaging/country.js b/lib/rest/pricing/v1/messaging/country.js index 9796a89638..0ba74a234f 100644 --- a/lib/rest/pricing/v1/messaging/country.js +++ b/lib/rest/pricing/v1/messaging/country.js @@ -47,9 +47,7 @@ CountryList = function CountryList(version) { CountryListInstance._version = version; // Path Solution CountryListInstance._solution = {}; - CountryListInstance._uri = _.template( - '/Messaging/Countries' // jshint ignore:line - )(CountryListInstance._solution); + CountryListInstance._uri = `/Messaging/Countries`; /* jshint ignore:start */ /** * Streams CountryInstance records from the API. @@ -499,9 +497,7 @@ CountryContext = function CountryContext(version, isoCountry) { // Path Solution this._solution = {isoCountry: isoCountry, }; - this._uri = _.template( - '/Messaging/Countries/<%= isoCountry %>' // jshint ignore:line - )(this._solution); + this._uri = `/Messaging/Countries/${isoCountry}`; }; /* jshint ignore:start */ diff --git a/lib/rest/pricing/v1/phoneNumber/country.js b/lib/rest/pricing/v1/phoneNumber/country.js index ff2d633b41..0ff0ec89e9 100644 --- a/lib/rest/pricing/v1/phoneNumber/country.js +++ b/lib/rest/pricing/v1/phoneNumber/country.js @@ -47,9 +47,7 @@ CountryList = function CountryList(version) { CountryListInstance._version = version; // Path Solution CountryListInstance._solution = {}; - CountryListInstance._uri = _.template( - '/PhoneNumbers/Countries' // jshint ignore:line - )(CountryListInstance._solution); + CountryListInstance._uri = `/PhoneNumbers/Countries`; /* jshint ignore:start */ /** * Streams CountryInstance records from the API. @@ -497,9 +495,7 @@ CountryContext = function CountryContext(version, isoCountry) { // Path Solution this._solution = {isoCountry: isoCountry, }; - this._uri = _.template( - '/PhoneNumbers/Countries/<%= isoCountry %>' // jshint ignore:line - )(this._solution); + this._uri = `/PhoneNumbers/Countries/${isoCountry}`; }; /* jshint ignore:start */ diff --git a/lib/rest/pricing/v1/voice/country.js b/lib/rest/pricing/v1/voice/country.js index 319cf60988..b75b173617 100644 --- a/lib/rest/pricing/v1/voice/country.js +++ b/lib/rest/pricing/v1/voice/country.js @@ -47,9 +47,7 @@ CountryList = function CountryList(version) { CountryListInstance._version = version; // Path Solution CountryListInstance._solution = {}; - CountryListInstance._uri = _.template( - '/Voice/Countries' // jshint ignore:line - )(CountryListInstance._solution); + CountryListInstance._uri = `/Voice/Countries`; /* jshint ignore:start */ /** * Streams CountryInstance records from the API. @@ -500,9 +498,7 @@ CountryContext = function CountryContext(version, isoCountry) { // Path Solution this._solution = {isoCountry: isoCountry, }; - this._uri = _.template( - '/Voice/Countries/<%= isoCountry %>' // jshint ignore:line - )(this._solution); + this._uri = `/Voice/Countries/${isoCountry}`; }; /* jshint ignore:start */ diff --git a/lib/rest/pricing/v1/voice/number.js b/lib/rest/pricing/v1/voice/number.js index ef1adfd11d..c6cb47ea61 100644 --- a/lib/rest/pricing/v1/voice/number.js +++ b/lib/rest/pricing/v1/voice/number.js @@ -254,9 +254,7 @@ NumberContext = function NumberContext(version, number) { // Path Solution this._solution = {number: number, }; - this._uri = _.template( - '/Voice/Numbers/<%= number %>' // jshint ignore:line - )(this._solution); + this._uri = `/Voice/Numbers/${number}`; }; /* jshint ignore:start */ diff --git a/lib/rest/pricing/v2/voice/country.js b/lib/rest/pricing/v2/voice/country.js index 5d0d7beca7..ac813262a6 100644 --- a/lib/rest/pricing/v2/voice/country.js +++ b/lib/rest/pricing/v2/voice/country.js @@ -47,9 +47,7 @@ CountryList = function CountryList(version) { CountryListInstance._version = version; // Path Solution CountryListInstance._solution = {}; - CountryListInstance._uri = _.template( - '/Voice/Countries' // jshint ignore:line - )(CountryListInstance._solution); + CountryListInstance._uri = `/Voice/Countries`; /* jshint ignore:start */ /** * Streams CountryInstance records from the API. @@ -503,9 +501,7 @@ CountryContext = function CountryContext(version, isoCountry) { // Path Solution this._solution = {isoCountry: isoCountry, }; - this._uri = _.template( - '/Voice/Countries/<%= isoCountry %>' // jshint ignore:line - )(this._solution); + this._uri = `/Voice/Countries/${isoCountry}`; }; /* jshint ignore:start */ diff --git a/lib/rest/pricing/v2/voice/number.js b/lib/rest/pricing/v2/voice/number.js index 9ebec09e51..f1f247e3e8 100644 --- a/lib/rest/pricing/v2/voice/number.js +++ b/lib/rest/pricing/v2/voice/number.js @@ -265,9 +265,7 @@ NumberContext = function NumberContext(version, destinationNumber) { // Path Solution this._solution = {destinationNumber: destinationNumber, }; - this._uri = _.template( - '/Voice/Numbers/<%= destinationNumber %>' // jshint ignore:line - )(this._solution); + this._uri = `/Voice/Numbers/${destinationNumber}`; }; /* jshint ignore:start */ diff --git a/lib/rest/proxy/v1/service.js b/lib/rest/proxy/v1/service.js index 8caf850ba0..15ddf4e700 100644 --- a/lib/rest/proxy/v1/service.js +++ b/lib/rest/proxy/v1/service.js @@ -55,9 +55,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * Streams ServiceInstance records from the API. @@ -698,9 +696,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._sessions = undefined; diff --git a/lib/rest/proxy/v1/service/phoneNumber.js b/lib/rest/proxy/v1/service/phoneNumber.js index 97055af10e..fbe92e4c41 100644 --- a/lib/rest/proxy/v1/service/phoneNumber.js +++ b/lib/rest/proxy/v1/service/phoneNumber.js @@ -55,9 +55,7 @@ PhoneNumberList = function PhoneNumberList(version, serviceSid) { PhoneNumberListInstance._version = version; // Path Solution PhoneNumberListInstance._solution = {serviceSid: serviceSid}; - PhoneNumberListInstance._uri = _.template( - '/Services/<%= serviceSid %>/PhoneNumbers' // jshint ignore:line - )(PhoneNumberListInstance._solution); + PhoneNumberListInstance._uri = `/Services/${serviceSid}/PhoneNumbers`; /* jshint ignore:start */ /** * create a PhoneNumberInstance @@ -631,9 +629,7 @@ PhoneNumberContext = function PhoneNumberContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/PhoneNumbers/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/proxy/v1/service/session.js b/lib/rest/proxy/v1/service/session.js index 742c929069..dfa44509b3 100644 --- a/lib/rest/proxy/v1/service/session.js +++ b/lib/rest/proxy/v1/service/session.js @@ -56,9 +56,7 @@ SessionList = function SessionList(version, serviceSid) { SessionListInstance._version = version; // Path Solution SessionListInstance._solution = {serviceSid: serviceSid}; - SessionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Sessions' // jshint ignore:line - )(SessionListInstance._solution); + SessionListInstance._uri = `/Services/${serviceSid}/Sessions`; /* jshint ignore:start */ /** * Streams SessionInstance records from the API. @@ -676,9 +674,7 @@ SessionContext = function SessionContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Sessions/${sid}`; // Dependents this._interactions = undefined; diff --git a/lib/rest/proxy/v1/service/session/interaction.js b/lib/rest/proxy/v1/service/session/interaction.js index 74bdeaefb3..51ebd7df49 100644 --- a/lib/rest/proxy/v1/service/session/interaction.js +++ b/lib/rest/proxy/v1/service/session/interaction.js @@ -54,9 +54,7 @@ InteractionList = function InteractionList(version, serviceSid, sessionSid) { InteractionListInstance._version = version; // Path Solution InteractionListInstance._solution = {serviceSid: serviceSid, sessionSid: sessionSid}; - InteractionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Interactions' // jshint ignore:line - )(InteractionListInstance._solution); + InteractionListInstance._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Interactions`; /* jshint ignore:start */ /** * Streams InteractionInstance records from the API. @@ -585,9 +583,7 @@ InteractionContext = function InteractionContext(version, serviceSid, // Path Solution this._solution = {serviceSid: serviceSid, sessionSid: sessionSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Interactions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Interactions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/proxy/v1/service/session/participant.js b/lib/rest/proxy/v1/service/session/participant.js index 7593c06b6e..f771594103 100644 --- a/lib/rest/proxy/v1/service/session/participant.js +++ b/lib/rest/proxy/v1/service/session/participant.js @@ -56,9 +56,7 @@ ParticipantList = function ParticipantList(version, serviceSid, sessionSid) { ParticipantListInstance._version = version; // Path Solution ParticipantListInstance._solution = {serviceSid: serviceSid, sessionSid: sessionSid}; - ParticipantListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants' // jshint ignore:line - )(ParticipantListInstance._solution); + ParticipantListInstance._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Participants`; /* jshint ignore:start */ /** * Streams ParticipantInstance records from the API. @@ -650,9 +648,7 @@ ParticipantContext = function ParticipantContext(version, serviceSid, // Path Solution this._solution = {serviceSid: serviceSid, sessionSid: sessionSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${sid}`; // Dependents this._messageInteractions = undefined; diff --git a/lib/rest/proxy/v1/service/session/participant/messageInteraction.js b/lib/rest/proxy/v1/service/session/participant/messageInteraction.js index fec0e945a4..3fcc797e03 100644 --- a/lib/rest/proxy/v1/service/session/participant/messageInteraction.js +++ b/lib/rest/proxy/v1/service/session/participant/messageInteraction.js @@ -63,9 +63,7 @@ MessageInteractionList = function MessageInteractionList(version, serviceSid, sessionSid: sessionSid, participantSid: participantSid }; - MessageInteractionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= participantSid %>/MessageInteractions' // jshint ignore:line - )(MessageInteractionListInstance._solution); + MessageInteractionListInstance._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${participantSid}/MessageInteractions`; /* jshint ignore:start */ /** * create a MessageInteractionInstance @@ -650,9 +648,7 @@ MessageInteractionContext = function MessageInteractionContext(version, participantSid: participantSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= participantSid %>/MessageInteractions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${participantSid}/MessageInteractions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/proxy/v1/service/shortCode.js b/lib/rest/proxy/v1/service/shortCode.js index 4ce26c42b6..e62cd62605 100644 --- a/lib/rest/proxy/v1/service/shortCode.js +++ b/lib/rest/proxy/v1/service/shortCode.js @@ -54,9 +54,7 @@ ShortCodeList = function ShortCodeList(version, serviceSid) { ShortCodeListInstance._version = version; // Path Solution ShortCodeListInstance._solution = {serviceSid: serviceSid}; - ShortCodeListInstance._uri = _.template( - '/Services/<%= serviceSid %>/ShortCodes' // jshint ignore:line - )(ShortCodeListInstance._solution); + ShortCodeListInstance._uri = `/Services/${serviceSid}/ShortCodes`; /* jshint ignore:start */ /** * create a ShortCodeInstance @@ -612,9 +610,7 @@ ShortCodeContext = function ShortCodeContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/ShortCodes/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/ShortCodes/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/serverless/v1/service.js b/lib/rest/serverless/v1/service.js index 075747f13b..46d5514451 100644 --- a/lib/rest/serverless/v1/service.js +++ b/lib/rest/serverless/v1/service.js @@ -58,9 +58,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * Streams ServiceInstance records from the API. @@ -667,9 +665,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._environments = undefined; diff --git a/lib/rest/serverless/v1/service/asset.js b/lib/rest/serverless/v1/service/asset.js index a0d57503b2..bd1bd3e5a4 100644 --- a/lib/rest/serverless/v1/service/asset.js +++ b/lib/rest/serverless/v1/service/asset.js @@ -55,9 +55,7 @@ AssetList = function AssetList(version, serviceSid) { AssetListInstance._version = version; // Path Solution AssetListInstance._solution = {serviceSid: serviceSid}; - AssetListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Assets' // jshint ignore:line - )(AssetListInstance._solution); + AssetListInstance._uri = `/Services/${serviceSid}/Assets`; /* jshint ignore:start */ /** * Streams AssetInstance records from the API. @@ -606,9 +604,7 @@ AssetContext = function AssetContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Assets/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Assets/${sid}`; // Dependents this._assetVersions = undefined; diff --git a/lib/rest/serverless/v1/service/asset/assetVersion.js b/lib/rest/serverless/v1/service/asset/assetVersion.js index bd2f1e4467..4a5dfdea52 100644 --- a/lib/rest/serverless/v1/service/asset/assetVersion.js +++ b/lib/rest/serverless/v1/service/asset/assetVersion.js @@ -55,9 +55,7 @@ AssetVersionList = function AssetVersionList(version, serviceSid, assetSid) { AssetVersionListInstance._version = version; // Path Solution AssetVersionListInstance._solution = {serviceSid: serviceSid, assetSid: assetSid}; - AssetVersionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Assets/<%= assetSid %>/Versions' // jshint ignore:line - )(AssetVersionListInstance._solution); + AssetVersionListInstance._uri = `/Services/${serviceSid}/Assets/${assetSid}/Versions`; /* jshint ignore:start */ /** * Streams AssetVersionInstance records from the API. @@ -605,9 +603,7 @@ AssetVersionContext = function AssetVersionContext(version, serviceSid, // Path Solution this._solution = {serviceSid: serviceSid, assetSid: assetSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Assets/<%= assetSid %>/Versions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Assets/${assetSid}/Versions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/serverless/v1/service/build.js b/lib/rest/serverless/v1/service/build.js index a1302a1183..09d04a42bf 100644 --- a/lib/rest/serverless/v1/service/build.js +++ b/lib/rest/serverless/v1/service/build.js @@ -55,9 +55,7 @@ BuildList = function BuildList(version, serviceSid) { BuildListInstance._version = version; // Path Solution BuildListInstance._solution = {serviceSid: serviceSid}; - BuildListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Builds' // jshint ignore:line - )(BuildListInstance._solution); + BuildListInstance._uri = `/Services/${serviceSid}/Builds`; /* jshint ignore:start */ /** * Streams BuildInstance records from the API. @@ -580,9 +578,7 @@ BuildContext = function BuildContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Builds/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Builds/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/serverless/v1/service/environment.js b/lib/rest/serverless/v1/service/environment.js index 6357292c15..173b0bbefd 100644 --- a/lib/rest/serverless/v1/service/environment.js +++ b/lib/rest/serverless/v1/service/environment.js @@ -56,9 +56,7 @@ EnvironmentList = function EnvironmentList(version, serviceSid) { EnvironmentListInstance._version = version; // Path Solution EnvironmentListInstance._solution = {serviceSid: serviceSid}; - EnvironmentListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Environments' // jshint ignore:line - )(EnvironmentListInstance._solution); + EnvironmentListInstance._uri = `/Services/${serviceSid}/Environments`; /* jshint ignore:start */ /** * Streams EnvironmentInstance records from the API. @@ -626,9 +624,7 @@ EnvironmentContext = function EnvironmentContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Environments/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Environments/${sid}`; // Dependents this._variables = undefined; diff --git a/lib/rest/serverless/v1/service/environment/deployment.js b/lib/rest/serverless/v1/service/environment/deployment.js index f6aa1edc91..f0994468c6 100644 --- a/lib/rest/serverless/v1/service/environment/deployment.js +++ b/lib/rest/serverless/v1/service/environment/deployment.js @@ -55,9 +55,7 @@ DeploymentList = function DeploymentList(version, serviceSid, environmentSid) { DeploymentListInstance._version = version; // Path Solution DeploymentListInstance._solution = {serviceSid: serviceSid, environmentSid: environmentSid}; - DeploymentListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Deployments' // jshint ignore:line - )(DeploymentListInstance._solution); + DeploymentListInstance._uri = `/Services/${serviceSid}/Environments/${environmentSid}/Deployments`; /* jshint ignore:start */ /** * Streams DeploymentInstance records from the API. @@ -592,9 +590,7 @@ DeploymentContext = function DeploymentContext(version, serviceSid, // Path Solution this._solution = {serviceSid: serviceSid, environmentSid: environmentSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Deployments/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Environments/${environmentSid}/Deployments/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/serverless/v1/service/environment/variable.js b/lib/rest/serverless/v1/service/environment/variable.js index 9055edf0cc..9c104c92d1 100644 --- a/lib/rest/serverless/v1/service/environment/variable.js +++ b/lib/rest/serverless/v1/service/environment/variable.js @@ -55,9 +55,7 @@ VariableList = function VariableList(version, serviceSid, environmentSid) { VariableListInstance._version = version; // Path Solution VariableListInstance._solution = {serviceSid: serviceSid, environmentSid: environmentSid}; - VariableListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Variables' // jshint ignore:line - )(VariableListInstance._solution); + VariableListInstance._uri = `/Services/${serviceSid}/Environments/${environmentSid}/Variables`; /* jshint ignore:start */ /** * Streams VariableInstance records from the API. @@ -619,9 +617,7 @@ VariableContext = function VariableContext(version, serviceSid, environmentSid, // Path Solution this._solution = {serviceSid: serviceSid, environmentSid: environmentSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Variables/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Environments/${environmentSid}/Variables/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/serverless/v1/service/function.js b/lib/rest/serverless/v1/service/function.js index 35876ff16b..4c7f9cb82a 100644 --- a/lib/rest/serverless/v1/service/function.js +++ b/lib/rest/serverless/v1/service/function.js @@ -56,9 +56,7 @@ FunctionList = function FunctionList(version, serviceSid) { FunctionListInstance._version = version; // Path Solution FunctionListInstance._solution = {serviceSid: serviceSid}; - FunctionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Functions' // jshint ignore:line - )(FunctionListInstance._solution); + FunctionListInstance._uri = `/Services/${serviceSid}/Functions`; /* jshint ignore:start */ /** * Streams FunctionInstance records from the API. @@ -610,9 +608,7 @@ FunctionContext = function FunctionContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Functions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Functions/${sid}`; // Dependents this._functionVersions = undefined; diff --git a/lib/rest/serverless/v1/service/function/functionVersion.js b/lib/rest/serverless/v1/service/function/functionVersion.js index d714ea88f6..f4508eaf17 100644 --- a/lib/rest/serverless/v1/service/function/functionVersion.js +++ b/lib/rest/serverless/v1/service/function/functionVersion.js @@ -56,9 +56,7 @@ FunctionVersionList = function FunctionVersionList(version, serviceSid, FunctionVersionListInstance._version = version; // Path Solution FunctionVersionListInstance._solution = {serviceSid: serviceSid, functionSid: functionSid}; - FunctionVersionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Functions/<%= functionSid %>/Versions' // jshint ignore:line - )(FunctionVersionListInstance._solution); + FunctionVersionListInstance._uri = `/Services/${serviceSid}/Functions/${functionSid}/Versions`; /* jshint ignore:start */ /** * Streams FunctionVersionInstance records from the API. @@ -607,9 +605,7 @@ FunctionVersionContext = function FunctionVersionContext(version, serviceSid, // Path Solution this._solution = {serviceSid: serviceSid, functionSid: functionSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Functions/<%= functionSid %>/Versions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Functions/${functionSid}/Versions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/studio/v1/flow.js b/lib/rest/studio/v1/flow.js index f75c22588c..1e144dc8a6 100644 --- a/lib/rest/studio/v1/flow.js +++ b/lib/rest/studio/v1/flow.js @@ -51,9 +51,7 @@ FlowList = function FlowList(version) { FlowListInstance._version = version; // Path Solution FlowListInstance._solution = {}; - FlowListInstance._uri = _.template( - '/Flows' // jshint ignore:line - )(FlowListInstance._solution); + FlowListInstance._uri = `/Flows`; /* jshint ignore:start */ /** * Streams FlowInstance records from the API. @@ -557,9 +555,7 @@ FlowContext = function FlowContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Flows/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${sid}`; // Dependents this._engagements = undefined; diff --git a/lib/rest/studio/v1/flow/engagement.js b/lib/rest/studio/v1/flow/engagement.js index e8fe341a73..447782592f 100644 --- a/lib/rest/studio/v1/flow/engagement.js +++ b/lib/rest/studio/v1/flow/engagement.js @@ -54,9 +54,7 @@ EngagementList = function EngagementList(version, flowSid) { EngagementListInstance._version = version; // Path Solution EngagementListInstance._solution = {flowSid: flowSid}; - EngagementListInstance._uri = _.template( - '/Flows/<%= flowSid %>/Engagements' // jshint ignore:line - )(EngagementListInstance._solution); + EngagementListInstance._uri = `/Flows/${flowSid}/Engagements`; /* jshint ignore:start */ /** * Streams EngagementInstance records from the API. @@ -628,9 +626,7 @@ EngagementContext = function EngagementContext(version, flowSid, sid) { // Path Solution this._solution = {flowSid: flowSid, sid: sid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Engagements/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Engagements/${sid}`; // Dependents this._steps = undefined; diff --git a/lib/rest/studio/v1/flow/engagement/engagementContext.js b/lib/rest/studio/v1/flow/engagement/engagementContext.js index 3039c4292c..87aa453f9e 100644 --- a/lib/rest/studio/v1/flow/engagement/engagementContext.js +++ b/lib/rest/studio/v1/flow/engagement/engagementContext.js @@ -270,9 +270,7 @@ EngagementContextContext = function EngagementContextContext(version, flowSid, // Path Solution this._solution = {flowSid: flowSid, engagementSid: engagementSid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Context' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Engagements/${engagementSid}/Context`; }; /* jshint ignore:start */ diff --git a/lib/rest/studio/v1/flow/engagement/step.js b/lib/rest/studio/v1/flow/engagement/step.js index c8ca777a38..1bf8c72823 100644 --- a/lib/rest/studio/v1/flow/engagement/step.js +++ b/lib/rest/studio/v1/flow/engagement/step.js @@ -52,9 +52,7 @@ StepList = function StepList(version, flowSid, engagementSid) { StepListInstance._version = version; // Path Solution StepListInstance._solution = {flowSid: flowSid, engagementSid: engagementSid}; - StepListInstance._uri = _.template( - '/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Steps' // jshint ignore:line - )(StepListInstance._solution); + StepListInstance._uri = `/Flows/${flowSid}/Engagements/${engagementSid}/Steps`; /* jshint ignore:start */ /** * Streams StepInstance records from the API. @@ -549,9 +547,7 @@ StepContext = function StepContext(version, flowSid, engagementSid, sid) { // Path Solution this._solution = {flowSid: flowSid, engagementSid: engagementSid, sid: sid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Steps/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Engagements/${engagementSid}/Steps/${sid}`; // Dependents this._stepContext = undefined; diff --git a/lib/rest/studio/v1/flow/engagement/step/stepContext.js b/lib/rest/studio/v1/flow/engagement/step/stepContext.js index 9bf5e13fd4..23a2b9f6df 100644 --- a/lib/rest/studio/v1/flow/engagement/step/stepContext.js +++ b/lib/rest/studio/v1/flow/engagement/step/stepContext.js @@ -281,9 +281,7 @@ StepContextContext = function StepContextContext(version, flowSid, // Path Solution this._solution = {flowSid: flowSid, engagementSid: engagementSid, stepSid: stepSid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Steps/<%= stepSid %>/Context' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Engagements/${engagementSid}/Steps/${stepSid}/Context`; }; /* jshint ignore:start */ diff --git a/lib/rest/studio/v1/flow/execution.js b/lib/rest/studio/v1/flow/execution.js index a2d387fdc0..4738a40586 100644 --- a/lib/rest/studio/v1/flow/execution.js +++ b/lib/rest/studio/v1/flow/execution.js @@ -54,9 +54,7 @@ ExecutionList = function ExecutionList(version, flowSid) { ExecutionListInstance._version = version; // Path Solution ExecutionListInstance._solution = {flowSid: flowSid}; - ExecutionListInstance._uri = _.template( - '/Flows/<%= flowSid %>/Executions' // jshint ignore:line - )(ExecutionListInstance._solution); + ExecutionListInstance._uri = `/Flows/${flowSid}/Executions`; /* jshint ignore:start */ /** * Streams ExecutionInstance records from the API. @@ -641,9 +639,7 @@ ExecutionContext = function ExecutionContext(version, flowSid, sid) { // Path Solution this._solution = {flowSid: flowSid, sid: sid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Executions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Executions/${sid}`; // Dependents this._steps = undefined; diff --git a/lib/rest/studio/v1/flow/execution/executionContext.js b/lib/rest/studio/v1/flow/execution/executionContext.js index 9fc5164530..f9401c3aaf 100644 --- a/lib/rest/studio/v1/flow/execution/executionContext.js +++ b/lib/rest/studio/v1/flow/execution/executionContext.js @@ -270,9 +270,7 @@ ExecutionContextContext = function ExecutionContextContext(version, flowSid, // Path Solution this._solution = {flowSid: flowSid, executionSid: executionSid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Context' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Context`; }; /* jshint ignore:start */ diff --git a/lib/rest/studio/v1/flow/execution/executionStep.js b/lib/rest/studio/v1/flow/execution/executionStep.js index cead6d7dae..499bca319e 100644 --- a/lib/rest/studio/v1/flow/execution/executionStep.js +++ b/lib/rest/studio/v1/flow/execution/executionStep.js @@ -53,9 +53,7 @@ ExecutionStepList = function ExecutionStepList(version, flowSid, executionSid) { ExecutionStepListInstance._version = version; // Path Solution ExecutionStepListInstance._solution = {flowSid: flowSid, executionSid: executionSid}; - ExecutionStepListInstance._uri = _.template( - '/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Steps' // jshint ignore:line - )(ExecutionStepListInstance._solution); + ExecutionStepListInstance._uri = `/Flows/${flowSid}/Executions/${executionSid}/Steps`; /* jshint ignore:start */ /** * Streams ExecutionStepInstance records from the API. @@ -560,9 +558,7 @@ ExecutionStepContext = function ExecutionStepContext(version, flowSid, // Path Solution this._solution = {flowSid: flowSid, executionSid: executionSid, sid: sid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Steps/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Steps/${sid}`; // Dependents this._stepContext = undefined; diff --git a/lib/rest/studio/v1/flow/execution/executionStep/executionStepContext.js b/lib/rest/studio/v1/flow/execution/executionStep/executionStepContext.js index e23cfb83d6..a7d30d0ea0 100644 --- a/lib/rest/studio/v1/flow/execution/executionStep/executionStepContext.js +++ b/lib/rest/studio/v1/flow/execution/executionStep/executionStepContext.js @@ -282,9 +282,7 @@ ExecutionStepContextContext = function ExecutionStepContextContext(version, // Path Solution this._solution = {flowSid: flowSid, executionSid: executionSid, stepSid: stepSid, }; - this._uri = _.template( - '/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Steps/<%= stepSid %>/Context' // jshint ignore:line - )(this._solution); + this._uri = `/Flows/${flowSid}/Executions/${executionSid}/Steps/${stepSid}/Context`; }; /* jshint ignore:start */ diff --git a/lib/rest/sync/v1/service.js b/lib/rest/sync/v1/service.js index 9bfe6cc1ef..06d98a05dc 100644 --- a/lib/rest/sync/v1/service.js +++ b/lib/rest/sync/v1/service.js @@ -57,9 +57,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -689,9 +687,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._documents = undefined; diff --git a/lib/rest/sync/v1/service/document.js b/lib/rest/sync/v1/service/document.js index ce6313e68c..ab867f5684 100644 --- a/lib/rest/sync/v1/service/document.js +++ b/lib/rest/sync/v1/service/document.js @@ -57,9 +57,7 @@ DocumentList = function DocumentList(version, serviceSid) { DocumentListInstance._version = version; // Path Solution DocumentListInstance._solution = {serviceSid: serviceSid}; - DocumentListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Documents' // jshint ignore:line - )(DocumentListInstance._solution); + DocumentListInstance._uri = `/Services/${serviceSid}/Documents`; /* jshint ignore:start */ /** * create a DocumentInstance @@ -648,9 +646,7 @@ DocumentContext = function DocumentContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Documents/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Documents/${sid}`; // Dependents this._documentPermissions = undefined; diff --git a/lib/rest/sync/v1/service/document/documentPermission.js b/lib/rest/sync/v1/service/document/documentPermission.js index 5a9c7a6629..0dde5af094 100644 --- a/lib/rest/sync/v1/service/document/documentPermission.js +++ b/lib/rest/sync/v1/service/document/documentPermission.js @@ -55,9 +55,7 @@ DocumentPermissionList = function DocumentPermissionList(version, serviceSid, DocumentPermissionListInstance._version = version; // Path Solution DocumentPermissionListInstance._solution = {serviceSid: serviceSid, documentSid: documentSid}; - DocumentPermissionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions' // jshint ignore:line - )(DocumentPermissionListInstance._solution); + DocumentPermissionListInstance._uri = `/Services/${serviceSid}/Documents/${documentSid}/Permissions`; /* jshint ignore:start */ /** * Streams DocumentPermissionInstance records from the API. @@ -588,9 +586,7 @@ DocumentPermissionContext = function DocumentPermissionContext(version, // Path Solution this._solution = {serviceSid: serviceSid, documentSid: documentSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; }; /* jshint ignore:start */ diff --git a/lib/rest/sync/v1/service/syncList.js b/lib/rest/sync/v1/service/syncList.js index b7d54f9f66..3b850e09b1 100644 --- a/lib/rest/sync/v1/service/syncList.js +++ b/lib/rest/sync/v1/service/syncList.js @@ -57,9 +57,7 @@ SyncListList = function SyncListList(version, serviceSid) { SyncListListInstance._version = version; // Path Solution SyncListListInstance._solution = {serviceSid: serviceSid}; - SyncListListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Lists' // jshint ignore:line - )(SyncListListInstance._solution); + SyncListListInstance._uri = `/Services/${serviceSid}/Lists`; /* jshint ignore:start */ /** * create a SyncListInstance @@ -660,9 +658,7 @@ SyncListContext = function SyncListContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Lists/${sid}`; // Dependents this._syncListItems = undefined; diff --git a/lib/rest/sync/v1/service/syncList/syncListItem.js b/lib/rest/sync/v1/service/syncList/syncListItem.js index 113195557e..927b6a05e5 100644 --- a/lib/rest/sync/v1/service/syncList/syncListItem.js +++ b/lib/rest/sync/v1/service/syncList/syncListItem.js @@ -58,9 +58,7 @@ SyncListItemList = function SyncListItemList(version, serviceSid, listSid) { SyncListItemListInstance._version = version; // Path Solution SyncListItemListInstance._solution = {serviceSid: serviceSid, listSid: listSid}; - SyncListItemListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items' // jshint ignore:line - )(SyncListItemListInstance._solution); + SyncListItemListInstance._uri = `/Services/${serviceSid}/Lists/${listSid}/Items`; /* jshint ignore:start */ /** * create a SyncListItemInstance @@ -672,9 +670,7 @@ SyncListItemContext = function SyncListItemContext(version, serviceSid, listSid, // Path Solution this._solution = {serviceSid: serviceSid, listSid: listSid, index: index, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; }; /* jshint ignore:start */ diff --git a/lib/rest/sync/v1/service/syncList/syncListPermission.js b/lib/rest/sync/v1/service/syncList/syncListPermission.js index f83ba7c66c..1e0afef6a7 100644 --- a/lib/rest/sync/v1/service/syncList/syncListPermission.js +++ b/lib/rest/sync/v1/service/syncList/syncListPermission.js @@ -55,9 +55,7 @@ SyncListPermissionList = function SyncListPermissionList(version, serviceSid, SyncListPermissionListInstance._version = version; // Path Solution SyncListPermissionListInstance._solution = {serviceSid: serviceSid, listSid: listSid}; - SyncListPermissionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions' // jshint ignore:line - )(SyncListPermissionListInstance._solution); + SyncListPermissionListInstance._uri = `/Services/${serviceSid}/Lists/${listSid}/Permissions`; /* jshint ignore:start */ /** * Streams SyncListPermissionInstance records from the API. @@ -584,9 +582,7 @@ SyncListPermissionContext = function SyncListPermissionContext(version, // Path Solution this._solution = {serviceSid: serviceSid, listSid: listSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; }; /* jshint ignore:start */ diff --git a/lib/rest/sync/v1/service/syncMap.js b/lib/rest/sync/v1/service/syncMap.js index 5dea663bdc..e35cad65aa 100644 --- a/lib/rest/sync/v1/service/syncMap.js +++ b/lib/rest/sync/v1/service/syncMap.js @@ -57,9 +57,7 @@ SyncMapList = function SyncMapList(version, serviceSid) { SyncMapListInstance._version = version; // Path Solution SyncMapListInstance._solution = {serviceSid: serviceSid}; - SyncMapListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Maps' // jshint ignore:line - )(SyncMapListInstance._solution); + SyncMapListInstance._uri = `/Services/${serviceSid}/Maps`; /* jshint ignore:start */ /** * create a SyncMapInstance @@ -657,9 +655,7 @@ SyncMapContext = function SyncMapContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Maps/${sid}`; // Dependents this._syncMapItems = undefined; diff --git a/lib/rest/sync/v1/service/syncMap/syncMapItem.js b/lib/rest/sync/v1/service/syncMap/syncMapItem.js index 638a0f9e78..aa19a869c9 100644 --- a/lib/rest/sync/v1/service/syncMap/syncMapItem.js +++ b/lib/rest/sync/v1/service/syncMap/syncMapItem.js @@ -58,9 +58,7 @@ SyncMapItemList = function SyncMapItemList(version, serviceSid, mapSid) { SyncMapItemListInstance._version = version; // Path Solution SyncMapItemListInstance._solution = {serviceSid: serviceSid, mapSid: mapSid}; - SyncMapItemListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items' // jshint ignore:line - )(SyncMapItemListInstance._solution); + SyncMapItemListInstance._uri = `/Services/${serviceSid}/Maps/${mapSid}/Items`; /* jshint ignore:start */ /** * create a SyncMapItemInstance @@ -674,9 +672,7 @@ SyncMapItemContext = function SyncMapItemContext(version, serviceSid, mapSid, // Path Solution this._solution = {serviceSid: serviceSid, mapSid: mapSid, key: key, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; }; /* jshint ignore:start */ diff --git a/lib/rest/sync/v1/service/syncMap/syncMapPermission.js b/lib/rest/sync/v1/service/syncMap/syncMapPermission.js index b351e4a917..ae1854a9eb 100644 --- a/lib/rest/sync/v1/service/syncMap/syncMapPermission.js +++ b/lib/rest/sync/v1/service/syncMap/syncMapPermission.js @@ -55,9 +55,7 @@ SyncMapPermissionList = function SyncMapPermissionList(version, serviceSid, SyncMapPermissionListInstance._version = version; // Path Solution SyncMapPermissionListInstance._solution = {serviceSid: serviceSid, mapSid: mapSid}; - SyncMapPermissionListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions' // jshint ignore:line - )(SyncMapPermissionListInstance._solution); + SyncMapPermissionListInstance._uri = `/Services/${serviceSid}/Maps/${mapSid}/Permissions`; /* jshint ignore:start */ /** * Streams SyncMapPermissionInstance records from the API. @@ -583,9 +581,7 @@ SyncMapPermissionContext = function SyncMapPermissionContext(version, // Path Solution this._solution = {serviceSid: serviceSid, mapSid: mapSid, identity: identity, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; }; /* jshint ignore:start */ diff --git a/lib/rest/sync/v1/service/syncStream.js b/lib/rest/sync/v1/service/syncStream.js index 52558c3471..ad48265d87 100644 --- a/lib/rest/sync/v1/service/syncStream.js +++ b/lib/rest/sync/v1/service/syncStream.js @@ -54,9 +54,7 @@ SyncStreamList = function SyncStreamList(version, serviceSid) { SyncStreamListInstance._version = version; // Path Solution SyncStreamListInstance._solution = {serviceSid: serviceSid}; - SyncStreamListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Streams' // jshint ignore:line - )(SyncStreamListInstance._solution); + SyncStreamListInstance._uri = `/Services/${serviceSid}/Streams`; /* jshint ignore:start */ /** * create a SyncStreamInstance @@ -624,9 +622,7 @@ SyncStreamContext = function SyncStreamContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Streams/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Streams/${sid}`; // Dependents this._streamMessages = undefined; diff --git a/lib/rest/sync/v1/service/syncStream/streamMessage.js b/lib/rest/sync/v1/service/syncStream/streamMessage.js index 391489e72c..538f189942 100644 --- a/lib/rest/sync/v1/service/syncStream/streamMessage.js +++ b/lib/rest/sync/v1/service/syncStream/streamMessage.js @@ -53,9 +53,7 @@ StreamMessageList = function StreamMessageList(version, serviceSid, streamSid) { StreamMessageListInstance._version = version; // Path Solution StreamMessageListInstance._solution = {serviceSid: serviceSid, streamSid: streamSid}; - StreamMessageListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Streams/<%= streamSid %>/Messages' // jshint ignore:line - )(StreamMessageListInstance._solution); + StreamMessageListInstance._uri = `/Services/${serviceSid}/Streams/${streamSid}/Messages`; /* jshint ignore:start */ /** * create a StreamMessageInstance diff --git a/lib/rest/taskrouter/v1/workspace.js b/lib/rest/taskrouter/v1/workspace.js index 8eee9ec4c4..18e4d5bf29 100644 --- a/lib/rest/taskrouter/v1/workspace.js +++ b/lib/rest/taskrouter/v1/workspace.js @@ -63,9 +63,7 @@ WorkspaceList = function WorkspaceList(version) { WorkspaceListInstance._version = version; // Path Solution WorkspaceListInstance._solution = {}; - WorkspaceListInstance._uri = _.template( - '/Workspaces' // jshint ignore:line - )(WorkspaceListInstance._solution); + WorkspaceListInstance._uri = `/Workspaces`; /* jshint ignore:start */ /** * Streams WorkspaceInstance records from the API. @@ -814,9 +812,7 @@ WorkspaceContext = function WorkspaceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${sid}`; // Dependents this._activities = undefined; diff --git a/lib/rest/taskrouter/v1/workspace/activity.js b/lib/rest/taskrouter/v1/workspace/activity.js index 4e520a6aca..91f2debff3 100644 --- a/lib/rest/taskrouter/v1/workspace/activity.js +++ b/lib/rest/taskrouter/v1/workspace/activity.js @@ -52,9 +52,7 @@ ActivityList = function ActivityList(version, workspaceSid) { ActivityListInstance._version = version; // Path Solution ActivityListInstance._solution = {workspaceSid: workspaceSid}; - ActivityListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Activities' // jshint ignore:line - )(ActivityListInstance._solution); + ActivityListInstance._uri = `/Workspaces/${workspaceSid}/Activities`; /* jshint ignore:start */ /** * Streams ActivityInstance records from the API. @@ -613,9 +611,7 @@ ActivityContext = function ActivityContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Activities/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Activities/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/event.js b/lib/rest/taskrouter/v1/workspace/event.js index d2933add98..b8eca11e4a 100644 --- a/lib/rest/taskrouter/v1/workspace/event.js +++ b/lib/rest/taskrouter/v1/workspace/event.js @@ -51,9 +51,7 @@ EventList = function EventList(version, workspaceSid) { EventListInstance._version = version; // Path Solution EventListInstance._solution = {workspaceSid: workspaceSid}; - EventListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Events' // jshint ignore:line - )(EventListInstance._solution); + EventListInstance._uri = `/Workspaces/${workspaceSid}/Events`; /* jshint ignore:start */ /** * Streams EventInstance records from the API. @@ -596,9 +594,7 @@ EventContext = function EventContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Events/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Events/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/task.js b/lib/rest/taskrouter/v1/workspace/task.js index 8ed1b3fe61..c2f5768446 100644 --- a/lib/rest/taskrouter/v1/workspace/task.js +++ b/lib/rest/taskrouter/v1/workspace/task.js @@ -52,9 +52,7 @@ TaskList = function TaskList(version, workspaceSid) { TaskListInstance._version = version; // Path Solution TaskListInstance._solution = {workspaceSid: workspaceSid}; - TaskListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Tasks' // jshint ignore:line - )(TaskListInstance._solution); + TaskListInstance._uri = `/Workspaces/${workspaceSid}/Tasks`; /* jshint ignore:start */ /** * Streams TaskInstance records from the API. @@ -719,9 +717,7 @@ TaskContext = function TaskContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Tasks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Tasks/${sid}`; // Dependents this._reservations = undefined; diff --git a/lib/rest/taskrouter/v1/workspace/task/reservation.js b/lib/rest/taskrouter/v1/workspace/task/reservation.js index 8b2bae40a6..ba543eea42 100644 --- a/lib/rest/taskrouter/v1/workspace/task/reservation.js +++ b/lib/rest/taskrouter/v1/workspace/task/reservation.js @@ -54,9 +54,7 @@ ReservationList = function ReservationList(version, workspaceSid, taskSid) { ReservationListInstance._version = version; // Path Solution ReservationListInstance._solution = {workspaceSid: workspaceSid, taskSid: taskSid}; - ReservationListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Tasks/<%= taskSid %>/Reservations' // jshint ignore:line - )(ReservationListInstance._solution); + ReservationListInstance._uri = `/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations`; /* jshint ignore:start */ /** * Streams ReservationInstance records from the API. @@ -651,9 +649,7 @@ ReservationContext = function ReservationContext(version, workspaceSid, taskSid, // Path Solution this._solution = {workspaceSid: workspaceSid, taskSid: taskSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Tasks/<%= taskSid %>/Reservations/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/taskChannel.js b/lib/rest/taskrouter/v1/workspace/taskChannel.js index 07a7246d0b..3c0df9a1e6 100644 --- a/lib/rest/taskrouter/v1/workspace/taskChannel.js +++ b/lib/rest/taskrouter/v1/workspace/taskChannel.js @@ -51,9 +51,7 @@ TaskChannelList = function TaskChannelList(version, workspaceSid) { TaskChannelListInstance._version = version; // Path Solution TaskChannelListInstance._solution = {workspaceSid: workspaceSid}; - TaskChannelListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskChannels' // jshint ignore:line - )(TaskChannelListInstance._solution); + TaskChannelListInstance._uri = `/Workspaces/${workspaceSid}/TaskChannels`; /* jshint ignore:start */ /** * Streams TaskChannelInstance records from the API. @@ -612,9 +610,7 @@ TaskChannelContext = function TaskChannelContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskChannels/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/TaskChannels/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/taskQueue.js b/lib/rest/taskrouter/v1/workspace/taskQueue.js index e4d679a2aa..fe2eb54e6c 100644 --- a/lib/rest/taskrouter/v1/workspace/taskQueue.js +++ b/lib/rest/taskrouter/v1/workspace/taskQueue.js @@ -58,9 +58,7 @@ TaskQueueList = function TaskQueueList(version, workspaceSid) { TaskQueueListInstance._version = version; // Path Solution TaskQueueListInstance._solution = {workspaceSid: workspaceSid}; - TaskQueueListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskQueues' // jshint ignore:line - )(TaskQueueListInstance._solution); + TaskQueueListInstance._uri = `/Workspaces/${workspaceSid}/TaskQueues`; // Components TaskQueueListInstance._statistics = undefined; @@ -734,9 +732,7 @@ TaskQueueContext = function TaskQueueContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskQueues/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${sid}`; // Dependents this._statistics = undefined; diff --git a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.js b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.js index 0367989579..110a7852db 100644 --- a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.js @@ -337,9 +337,7 @@ TaskQueueCumulativeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, taskQueueSid: taskQueueSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskQueues/<%= taskQueueSid %>/CumulativeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/CumulativeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.js b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.js index 053a871c08..c834a4f132 100644 --- a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.js @@ -299,9 +299,7 @@ TaskQueueRealTimeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, taskQueueSid: taskQueueSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskQueues/<%= taskQueueSid %>/RealTimeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/RealTimeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.js b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.js index 7dac22620c..1270eacba0 100644 --- a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.js @@ -287,9 +287,7 @@ TaskQueueStatisticsContext = function TaskQueueStatisticsContext(version, // Path Solution this._solution = {workspaceSid: workspaceSid, taskQueueSid: taskQueueSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskQueues/<%= taskQueueSid %>/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.js b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.js index 6e75792a1b..be73d3dbf0 100644 --- a/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.js @@ -50,9 +50,7 @@ TaskQueuesStatisticsList = function TaskQueuesStatisticsList(version, TaskQueuesStatisticsListInstance._version = version; // Path Solution TaskQueuesStatisticsListInstance._solution = {workspaceSid: workspaceSid}; - TaskQueuesStatisticsListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/TaskQueues/Statistics' // jshint ignore:line - )(TaskQueuesStatisticsListInstance._solution); + TaskQueuesStatisticsListInstance._uri = `/Workspaces/${workspaceSid}/TaskQueues/Statistics`; /* jshint ignore:start */ /** * Streams TaskQueuesStatisticsInstance records from the API. diff --git a/lib/rest/taskrouter/v1/workspace/worker.js b/lib/rest/taskrouter/v1/workspace/worker.js index 75f372df36..200c5834fa 100644 --- a/lib/rest/taskrouter/v1/workspace/worker.js +++ b/lib/rest/taskrouter/v1/workspace/worker.js @@ -62,9 +62,7 @@ WorkerList = function WorkerList(version, workspaceSid) { WorkerListInstance._version = version; // Path Solution WorkerListInstance._solution = {workspaceSid: workspaceSid}; - WorkerListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers' // jshint ignore:line - )(WorkerListInstance._solution); + WorkerListInstance._uri = `/Workspaces/${workspaceSid}/Workers`; // Components WorkerListInstance._statistics = undefined; @@ -771,9 +769,7 @@ WorkerContext = function WorkerContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/${sid}`; // Dependents this._realTimeStatistics = undefined; diff --git a/lib/rest/taskrouter/v1/workspace/worker/reservation.js b/lib/rest/taskrouter/v1/workspace/worker/reservation.js index b66d6c5de9..9ce5bd3235 100644 --- a/lib/rest/taskrouter/v1/workspace/worker/reservation.js +++ b/lib/rest/taskrouter/v1/workspace/worker/reservation.js @@ -53,9 +53,7 @@ ReservationList = function ReservationList(version, workspaceSid, workerSid) { ReservationListInstance._version = version; // Path Solution ReservationListInstance._solution = {workspaceSid: workspaceSid, workerSid: workerSid}; - ReservationListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Reservations' // jshint ignore:line - )(ReservationListInstance._solution); + ReservationListInstance._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations`; /* jshint ignore:start */ /** * Streams ReservationInstance records from the API. @@ -623,9 +621,7 @@ ReservationContext = function ReservationContext(version, workspaceSid, // Path Solution this._solution = {workspaceSid: workspaceSid, workerSid: workerSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Reservations/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/worker/workerChannel.js b/lib/rest/taskrouter/v1/workspace/worker/workerChannel.js index 54d4fc6afe..b08d31f86c 100644 --- a/lib/rest/taskrouter/v1/workspace/worker/workerChannel.js +++ b/lib/rest/taskrouter/v1/workspace/worker/workerChannel.js @@ -56,9 +56,7 @@ WorkerChannelList = function WorkerChannelList(version, workspaceSid, workerSid) WorkerChannelListInstance._version = version; // Path Solution WorkerChannelListInstance._solution = {workspaceSid: workspaceSid, workerSid: workerSid}; - WorkerChannelListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Channels' // jshint ignore:line - )(WorkerChannelListInstance._solution); + WorkerChannelListInstance._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels`; /* jshint ignore:start */ /** * Streams WorkerChannelInstance records from the API. @@ -576,9 +574,7 @@ WorkerChannelContext = function WorkerChannelContext(version, workspaceSid, // Path Solution this._solution = {workspaceSid: workspaceSid, workerSid: workerSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Channels/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/worker/workerStatistics.js b/lib/rest/taskrouter/v1/workspace/worker/workerStatistics.js index fe3ee79b2d..061cb644dd 100644 --- a/lib/rest/taskrouter/v1/workspace/worker/workerStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/worker/workerStatistics.js @@ -280,9 +280,7 @@ WorkerStatisticsContext = function WorkerStatisticsContext(version, // Path Solution this._solution = {workspaceSid: workspaceSid, workerSid: workerSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/${workerSid}/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.js b/lib/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.js index 1272144798..8ab86632c5 100644 --- a/lib/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.js @@ -289,9 +289,7 @@ WorkersCumulativeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/CumulativeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/CumulativeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.js b/lib/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.js index 6439810c77..517ee0468c 100644 --- a/lib/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.js @@ -263,9 +263,7 @@ WorkersRealTimeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/RealTimeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/RealTimeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/worker/workersStatistics.js b/lib/rest/taskrouter/v1/workspace/worker/workersStatistics.js index b6e2da917a..f0eb5ffd24 100644 --- a/lib/rest/taskrouter/v1/workspace/worker/workersStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/worker/workersStatistics.js @@ -269,9 +269,7 @@ WorkersStatisticsContext = function WorkersStatisticsContext(version, // Path Solution this._solution = {workspaceSid: workspaceSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workers/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workers/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/workflow.js b/lib/rest/taskrouter/v1/workspace/workflow.js index 63d2b14f70..46c0efb22f 100644 --- a/lib/rest/taskrouter/v1/workspace/workflow.js +++ b/lib/rest/taskrouter/v1/workspace/workflow.js @@ -57,9 +57,7 @@ WorkflowList = function WorkflowList(version, workspaceSid) { WorkflowListInstance._version = version; // Path Solution WorkflowListInstance._solution = {workspaceSid: workspaceSid}; - WorkflowListInstance._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workflows' // jshint ignore:line - )(WorkflowListInstance._solution); + WorkflowListInstance._uri = `/Workspaces/${workspaceSid}/Workflows`; /* jshint ignore:start */ /** * Streams WorkflowInstance records from the API. @@ -695,9 +693,7 @@ WorkflowContext = function WorkflowContext(version, workspaceSid, sid) { // Path Solution this._solution = {workspaceSid: workspaceSid, sid: sid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workflows/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workflows/${sid}`; // Dependents this._statistics = undefined; diff --git a/lib/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.js b/lib/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.js index 1993964f89..1f011cbf72 100644 --- a/lib/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.js @@ -338,9 +338,7 @@ WorkflowCumulativeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, workflowSid: workflowSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workflows/<%= workflowSid %>/CumulativeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workflows/${workflowSid}/CumulativeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.js b/lib/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.js index 5da3f0b529..f15acfa2ed 100644 --- a/lib/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.js @@ -290,9 +290,7 @@ WorkflowRealTimeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, workflowSid: workflowSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workflows/<%= workflowSid %>/RealTimeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workflows/${workflowSid}/RealTimeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/workflow/workflowStatistics.js b/lib/rest/taskrouter/v1/workspace/workflow/workflowStatistics.js index 160cc6fc0b..64adef9706 100644 --- a/lib/rest/taskrouter/v1/workspace/workflow/workflowStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/workflow/workflowStatistics.js @@ -283,9 +283,7 @@ WorkflowStatisticsContext = function WorkflowStatisticsContext(version, // Path Solution this._solution = {workspaceSid: workspaceSid, workflowSid: workflowSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Workflows/<%= workflowSid %>/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Workflows/${workflowSid}/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.js b/lib/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.js index 433b718dbf..6a31321e8b 100644 --- a/lib/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.js @@ -321,9 +321,7 @@ WorkspaceCumulativeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/CumulativeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/CumulativeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.js b/lib/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.js index 75ff85fe8f..f8ad78a796 100644 --- a/lib/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.js @@ -272,9 +272,7 @@ WorkspaceRealTimeStatisticsContext = function // Path Solution this._solution = {workspaceSid: workspaceSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/RealTimeStatistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/RealTimeStatistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/taskrouter/v1/workspace/workspaceStatistics.js b/lib/rest/taskrouter/v1/workspace/workspaceStatistics.js index 6a604dd07b..fb39344c75 100644 --- a/lib/rest/taskrouter/v1/workspace/workspaceStatistics.js +++ b/lib/rest/taskrouter/v1/workspace/workspaceStatistics.js @@ -264,9 +264,7 @@ WorkspaceStatisticsContext = function WorkspaceStatisticsContext(version, // Path Solution this._solution = {workspaceSid: workspaceSid, }; - this._uri = _.template( - '/Workspaces/<%= workspaceSid %>/Statistics' // jshint ignore:line - )(this._solution); + this._uri = `/Workspaces/${workspaceSid}/Statistics`; }; /* jshint ignore:start */ diff --git a/lib/rest/trunking/v1/trunk.js b/lib/rest/trunking/v1/trunk.js index b78841bb5a..864d476e9a 100644 --- a/lib/rest/trunking/v1/trunk.js +++ b/lib/rest/trunking/v1/trunk.js @@ -57,9 +57,7 @@ TrunkList = function TrunkList(version) { TrunkListInstance._version = version; // Path Solution TrunkListInstance._solution = {}; - TrunkListInstance._uri = _.template( - '/Trunks' // jshint ignore:line - )(TrunkListInstance._solution); + TrunkListInstance._uri = `/Trunks`; /* jshint ignore:start */ /** * create a TrunkInstance @@ -722,9 +720,7 @@ TrunkContext = function TrunkContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Trunks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Trunks/${sid}`; // Dependents this._originationUrls = undefined; diff --git a/lib/rest/trunking/v1/trunk/credentialList.js b/lib/rest/trunking/v1/trunk/credentialList.js index b032368c09..471ac7323e 100644 --- a/lib/rest/trunking/v1/trunk/credentialList.js +++ b/lib/rest/trunking/v1/trunk/credentialList.js @@ -51,9 +51,7 @@ CredentialListList = function CredentialListList(version, trunkSid) { CredentialListListInstance._version = version; // Path Solution CredentialListListInstance._solution = {trunkSid: trunkSid}; - CredentialListListInstance._uri = _.template( - '/Trunks/<%= trunkSid %>/CredentialLists' // jshint ignore:line - )(CredentialListListInstance._solution); + CredentialListListInstance._uri = `/Trunks/${trunkSid}/CredentialLists`; /* jshint ignore:start */ /** * create a CredentialListInstance @@ -583,9 +581,7 @@ CredentialListContext = function CredentialListContext(version, trunkSid, sid) { // Path Solution this._solution = {trunkSid: trunkSid, sid: sid, }; - this._uri = _.template( - '/Trunks/<%= trunkSid %>/CredentialLists/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Trunks/${trunkSid}/CredentialLists/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/trunking/v1/trunk/ipAccessControlList.js b/lib/rest/trunking/v1/trunk/ipAccessControlList.js index 6ff9196043..85e3330d29 100644 --- a/lib/rest/trunking/v1/trunk/ipAccessControlList.js +++ b/lib/rest/trunking/v1/trunk/ipAccessControlList.js @@ -50,9 +50,7 @@ IpAccessControlListList = function IpAccessControlListList(version, trunkSid) { IpAccessControlListListInstance._version = version; // Path Solution IpAccessControlListListInstance._solution = {trunkSid: trunkSid}; - IpAccessControlListListInstance._uri = _.template( - '/Trunks/<%= trunkSid %>/IpAccessControlLists' // jshint ignore:line - )(IpAccessControlListListInstance._solution); + IpAccessControlListListInstance._uri = `/Trunks/${trunkSid}/IpAccessControlLists`; /* jshint ignore:start */ /** * create a IpAccessControlListInstance @@ -585,9 +583,7 @@ IpAccessControlListContext = function IpAccessControlListContext(version, // Path Solution this._solution = {trunkSid: trunkSid, sid: sid, }; - this._uri = _.template( - '/Trunks/<%= trunkSid %>/IpAccessControlLists/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Trunks/${trunkSid}/IpAccessControlLists/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/trunking/v1/trunk/originationUrl.js b/lib/rest/trunking/v1/trunk/originationUrl.js index 58854b2320..4723bc4891 100644 --- a/lib/rest/trunking/v1/trunk/originationUrl.js +++ b/lib/rest/trunking/v1/trunk/originationUrl.js @@ -51,9 +51,7 @@ OriginationUrlList = function OriginationUrlList(version, trunkSid) { OriginationUrlListInstance._version = version; // Path Solution OriginationUrlListInstance._solution = {trunkSid: trunkSid}; - OriginationUrlListInstance._uri = _.template( - '/Trunks/<%= trunkSid %>/OriginationUrls' // jshint ignore:line - )(OriginationUrlListInstance._solution); + OriginationUrlListInstance._uri = `/Trunks/${trunkSid}/OriginationUrls`; /* jshint ignore:start */ /** * create a OriginationUrlInstance @@ -638,9 +636,7 @@ OriginationUrlContext = function OriginationUrlContext(version, trunkSid, sid) { // Path Solution this._solution = {trunkSid: trunkSid, sid: sid, }; - this._uri = _.template( - '/Trunks/<%= trunkSid %>/OriginationUrls/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Trunks/${trunkSid}/OriginationUrls/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/trunking/v1/trunk/phoneNumber.js b/lib/rest/trunking/v1/trunk/phoneNumber.js index 9d17626ec6..0b7bb22d78 100644 --- a/lib/rest/trunking/v1/trunk/phoneNumber.js +++ b/lib/rest/trunking/v1/trunk/phoneNumber.js @@ -51,9 +51,7 @@ PhoneNumberList = function PhoneNumberList(version, trunkSid) { PhoneNumberListInstance._version = version; // Path Solution PhoneNumberListInstance._solution = {trunkSid: trunkSid}; - PhoneNumberListInstance._uri = _.template( - '/Trunks/<%= trunkSid %>/PhoneNumbers' // jshint ignore:line - )(PhoneNumberListInstance._solution); + PhoneNumberListInstance._uri = `/Trunks/${trunkSid}/PhoneNumbers`; /* jshint ignore:start */ /** * create a PhoneNumberInstance @@ -631,9 +629,7 @@ PhoneNumberContext = function PhoneNumberContext(version, trunkSid, sid) { // Path Solution this._solution = {trunkSid: trunkSid, sid: sid, }; - this._uri = _.template( - '/Trunks/<%= trunkSid %>/PhoneNumbers/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Trunks/${trunkSid}/PhoneNumbers/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/trunking/v1/trunk/terminatingSipDomain.js b/lib/rest/trunking/v1/trunk/terminatingSipDomain.js index 17f0b7ba19..960d04a6a3 100644 --- a/lib/rest/trunking/v1/trunk/terminatingSipDomain.js +++ b/lib/rest/trunking/v1/trunk/terminatingSipDomain.js @@ -51,9 +51,7 @@ TerminatingSipDomainList = function TerminatingSipDomainList(version, trunkSid) TerminatingSipDomainListInstance._version = version; // Path Solution TerminatingSipDomainListInstance._solution = {trunkSid: trunkSid}; - TerminatingSipDomainListInstance._uri = _.template( - '/Trunks/<%= trunkSid %>/TerminatingSipDomains' // jshint ignore:line - )(TerminatingSipDomainListInstance._solution); + TerminatingSipDomainListInstance._uri = `/Trunks/${trunkSid}/TerminatingSipDomains`; /* jshint ignore:start */ /** * create a TerminatingSipDomainInstance @@ -613,9 +611,7 @@ TerminatingSipDomainContext = function TerminatingSipDomainContext(version, // Path Solution this._solution = {trunkSid: trunkSid, sid: sid, }; - this._uri = _.template( - '/Trunks/<%= trunkSid %>/TerminatingSipDomains/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Trunks/${trunkSid}/TerminatingSipDomains/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/verify/v2/service.js b/lib/rest/verify/v2/service.js index 864de29c3b..cbc05b8406 100644 --- a/lib/rest/verify/v2/service.js +++ b/lib/rest/verify/v2/service.js @@ -56,9 +56,7 @@ ServiceList = function ServiceList(version) { ServiceListInstance._version = version; // Path Solution ServiceListInstance._solution = {}; - ServiceListInstance._uri = _.template( - '/Services' // jshint ignore:line - )(ServiceListInstance._solution); + ServiceListInstance._uri = `/Services`; /* jshint ignore:start */ /** * create a ServiceInstance @@ -681,9 +679,7 @@ ServiceContext = function ServiceContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Services/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${sid}`; // Dependents this._verifications = undefined; diff --git a/lib/rest/verify/v2/service/verification.js b/lib/rest/verify/v2/service/verification.js index 0f25d8fe42..db1dc8c7a0 100644 --- a/lib/rest/verify/v2/service/verification.js +++ b/lib/rest/verify/v2/service/verification.js @@ -54,9 +54,7 @@ VerificationList = function VerificationList(version, serviceSid) { VerificationListInstance._version = version; // Path Solution VerificationListInstance._solution = {serviceSid: serviceSid}; - VerificationListInstance._uri = _.template( - '/Services/<%= serviceSid %>/Verifications' // jshint ignore:line - )(VerificationListInstance._solution); + VerificationListInstance._uri = `/Services/${serviceSid}/Verifications`; /* jshint ignore:start */ /** * create a VerificationInstance @@ -389,9 +387,7 @@ VerificationContext = function VerificationContext(version, serviceSid, sid) { // Path Solution this._solution = {serviceSid: serviceSid, sid: sid, }; - this._uri = _.template( - '/Services/<%= serviceSid %>/Verifications/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Services/${serviceSid}/Verifications/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/verify/v2/service/verificationCheck.js b/lib/rest/verify/v2/service/verificationCheck.js index 1c8a5426cf..6479ebd9ab 100644 --- a/lib/rest/verify/v2/service/verificationCheck.js +++ b/lib/rest/verify/v2/service/verificationCheck.js @@ -53,9 +53,7 @@ VerificationCheckList = function VerificationCheckList(version, serviceSid) { VerificationCheckListInstance._version = version; // Path Solution VerificationCheckListInstance._solution = {serviceSid: serviceSid}; - VerificationCheckListInstance._uri = _.template( - '/Services/<%= serviceSid %>/VerificationCheck' // jshint ignore:line - )(VerificationCheckListInstance._solution); + VerificationCheckListInstance._uri = `/Services/${serviceSid}/VerificationCheck`; /* jshint ignore:start */ /** * create a VerificationCheckInstance diff --git a/lib/rest/video/v1/composition.js b/lib/rest/video/v1/composition.js index 2db14472af..c3e21d0550 100644 --- a/lib/rest/video/v1/composition.js +++ b/lib/rest/video/v1/composition.js @@ -54,9 +54,7 @@ CompositionList = function CompositionList(version) { CompositionListInstance._version = version; // Path Solution CompositionListInstance._solution = {}; - CompositionListInstance._uri = _.template( - '/Compositions' // jshint ignore:line - )(CompositionListInstance._solution); + CompositionListInstance._uri = `/Compositions`; /* jshint ignore:start */ /** * Streams CompositionInstance records from the API. @@ -660,9 +658,7 @@ CompositionContext = function CompositionContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Compositions/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Compositions/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/compositionHook.js b/lib/rest/video/v1/compositionHook.js index fd45b5c739..d35ec795ba 100644 --- a/lib/rest/video/v1/compositionHook.js +++ b/lib/rest/video/v1/compositionHook.js @@ -54,9 +54,7 @@ CompositionHookList = function CompositionHookList(version) { CompositionHookListInstance._version = version; // Path Solution CompositionHookListInstance._solution = {}; - CompositionHookListInstance._uri = _.template( - '/CompositionHooks' // jshint ignore:line - )(CompositionHookListInstance._solution); + CompositionHookListInstance._uri = `/CompositionHooks`; /* jshint ignore:start */ /** * Streams CompositionHookInstance records from the API. @@ -702,9 +700,7 @@ CompositionHookContext = function CompositionHookContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/CompositionHooks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/CompositionHooks/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/compositionSettings.js b/lib/rest/video/v1/compositionSettings.js index 568b97c5bc..ec15af9f4a 100644 --- a/lib/rest/video/v1/compositionSettings.js +++ b/lib/rest/video/v1/compositionSettings.js @@ -305,9 +305,7 @@ CompositionSettingsContext = function CompositionSettingsContext(version) { // Path Solution this._solution = {}; - this._uri = _.template( - '/CompositionSettings/Default' // jshint ignore:line - )(this._solution); + this._uri = `/CompositionSettings/Default`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/recording.js b/lib/rest/video/v1/recording.js index baaed38b5c..58e3c01d13 100644 --- a/lib/rest/video/v1/recording.js +++ b/lib/rest/video/v1/recording.js @@ -50,9 +50,7 @@ RecordingList = function RecordingList(version) { RecordingListInstance._version = version; // Path Solution RecordingListInstance._solution = {}; - RecordingListInstance._uri = _.template( - '/Recordings' // jshint ignore:line - )(RecordingListInstance._solution); + RecordingListInstance._uri = `/Recordings`; /* jshint ignore:start */ /** * Streams RecordingInstance records from the API. @@ -585,9 +583,7 @@ RecordingContext = function RecordingContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Recordings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Recordings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/recordingSettings.js b/lib/rest/video/v1/recordingSettings.js index 110a0cc390..ded1aa8e02 100644 --- a/lib/rest/video/v1/recordingSettings.js +++ b/lib/rest/video/v1/recordingSettings.js @@ -305,9 +305,7 @@ RecordingSettingsContext = function RecordingSettingsContext(version) { // Path Solution this._solution = {}; - this._uri = _.template( - '/RecordingSettings/Default' // jshint ignore:line - )(this._solution); + this._uri = `/RecordingSettings/Default`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/room.js b/lib/rest/video/v1/room.js index 53357dc11a..4b38278742 100644 --- a/lib/rest/video/v1/room.js +++ b/lib/rest/video/v1/room.js @@ -52,9 +52,7 @@ RoomList = function RoomList(version) { RoomListInstance._version = version; // Path Solution RoomListInstance._solution = {}; - RoomListInstance._uri = _.template( - '/Rooms' // jshint ignore:line - )(RoomListInstance._solution); + RoomListInstance._uri = `/Rooms`; /* jshint ignore:start */ /** * create a RoomInstance @@ -679,9 +677,7 @@ RoomContext = function RoomContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Rooms/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Rooms/${sid}`; // Dependents this._recordings = undefined; diff --git a/lib/rest/video/v1/room/recording.js b/lib/rest/video/v1/room/recording.js index 3ff1fc024b..dad9c5e06c 100644 --- a/lib/rest/video/v1/room/recording.js +++ b/lib/rest/video/v1/room/recording.js @@ -51,9 +51,7 @@ RoomRecordingList = function RoomRecordingList(version, roomSid) { RoomRecordingListInstance._version = version; // Path Solution RoomRecordingListInstance._solution = {roomSid: roomSid}; - RoomRecordingListInstance._uri = _.template( - '/Rooms/<%= roomSid %>/Recordings' // jshint ignore:line - )(RoomRecordingListInstance._solution); + RoomRecordingListInstance._uri = `/Rooms/${roomSid}/Recordings`; /* jshint ignore:start */ /** * Streams RoomRecordingInstance records from the API. @@ -559,9 +557,7 @@ RoomRecordingContext = function RoomRecordingContext(version, roomSid, sid) { // Path Solution this._solution = {roomSid: roomSid, sid: sid, }; - this._uri = _.template( - '/Rooms/<%= roomSid %>/Recordings/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Rooms/${roomSid}/Recordings/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/room/roomParticipant.js b/lib/rest/video/v1/room/roomParticipant.js index b18b711513..de3bc1df94 100644 --- a/lib/rest/video/v1/room/roomParticipant.js +++ b/lib/rest/video/v1/room/roomParticipant.js @@ -56,9 +56,7 @@ ParticipantList = function ParticipantList(version, roomSid) { ParticipantListInstance._version = version; // Path Solution ParticipantListInstance._solution = {roomSid: roomSid}; - ParticipantListInstance._uri = _.template( - '/Rooms/<%= roomSid %>/Participants' // jshint ignore:line - )(ParticipantListInstance._solution); + ParticipantListInstance._uri = `/Rooms/${roomSid}/Participants`; /* jshint ignore:start */ /** * Streams ParticipantInstance records from the API. @@ -615,9 +613,7 @@ ParticipantContext = function ParticipantContext(version, roomSid, sid) { // Path Solution this._solution = {roomSid: roomSid, sid: sid, }; - this._uri = _.template( - '/Rooms/<%= roomSid %>/Participants/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Rooms/${roomSid}/Participants/${sid}`; // Dependents this._publishedTracks = undefined; diff --git a/lib/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.js b/lib/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.js index 38e0523a56..dfda63242a 100644 --- a/lib/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.js +++ b/lib/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.js @@ -53,9 +53,7 @@ PublishedTrackList = function PublishedTrackList(version, roomSid, PublishedTrackListInstance._version = version; // Path Solution PublishedTrackListInstance._solution = {roomSid: roomSid, participantSid: participantSid}; - PublishedTrackListInstance._uri = _.template( - '/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/PublishedTracks' // jshint ignore:line - )(PublishedTrackListInstance._solution); + PublishedTrackListInstance._uri = `/Rooms/${roomSid}/Participants/${participantSid}/PublishedTracks`; /* jshint ignore:start */ /** * Streams PublishedTrackInstance records from the API. @@ -544,9 +542,7 @@ PublishedTrackContext = function PublishedTrackContext(version, roomSid, // Path Solution this._solution = {roomSid: roomSid, participantSid: participantSid, sid: sid, }; - this._uri = _.template( - '/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/PublishedTracks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Rooms/${roomSid}/Participants/${participantSid}/PublishedTracks/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js b/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js index 2f6376376a..dba0b83210 100644 --- a/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js +++ b/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js @@ -53,9 +53,7 @@ SubscribedTrackList = function SubscribedTrackList(version, roomSid, SubscribedTrackListInstance._version = version; // Path Solution SubscribedTrackListInstance._solution = {roomSid: roomSid, subscriberSid: subscriberSid}; - SubscribedTrackListInstance._uri = _.template( - '/Rooms/<%= roomSid %>/Participants/<%= subscriberSid %>/SubscribedTracks' // jshint ignore:line - )(SubscribedTrackListInstance._solution); + SubscribedTrackListInstance._uri = `/Rooms/${roomSid}/Participants/${subscriberSid}/SubscribedTracks`; /* jshint ignore:start */ /** * Streams SubscribedTrackInstance records from the API. diff --git a/lib/rest/voice/v1/dialingPermissions/bulkCountryUpdate.js b/lib/rest/voice/v1/dialingPermissions/bulkCountryUpdate.js index cd56a19b33..63fb65386a 100644 --- a/lib/rest/voice/v1/dialingPermissions/bulkCountryUpdate.js +++ b/lib/rest/voice/v1/dialingPermissions/bulkCountryUpdate.js @@ -52,9 +52,7 @@ BulkCountryUpdateList = function BulkCountryUpdateList(version) { BulkCountryUpdateListInstance._version = version; // Path Solution BulkCountryUpdateListInstance._solution = {}; - BulkCountryUpdateListInstance._uri = _.template( - '/DialingPermissions/BulkCountryUpdates' // jshint ignore:line - )(BulkCountryUpdateListInstance._solution); + BulkCountryUpdateListInstance._uri = `/DialingPermissions/BulkCountryUpdates`; /* jshint ignore:start */ /** * create a BulkCountryUpdateInstance diff --git a/lib/rest/voice/v1/dialingPermissions/country.js b/lib/rest/voice/v1/dialingPermissions/country.js index 48383051b3..fdd4a9a2ca 100644 --- a/lib/rest/voice/v1/dialingPermissions/country.js +++ b/lib/rest/voice/v1/dialingPermissions/country.js @@ -54,9 +54,7 @@ CountryList = function CountryList(version) { CountryListInstance._version = version; // Path Solution CountryListInstance._solution = {}; - CountryListInstance._uri = _.template( - '/DialingPermissions/Countries' // jshint ignore:line - )(CountryListInstance._solution); + CountryListInstance._uri = `/DialingPermissions/Countries`; /* jshint ignore:start */ /** * Streams CountryInstance records from the API. @@ -583,9 +581,7 @@ CountryContext = function CountryContext(version, isoCode) { // Path Solution this._solution = {isoCode: isoCode, }; - this._uri = _.template( - '/DialingPermissions/Countries/<%= isoCode %>' // jshint ignore:line - )(this._solution); + this._uri = `/DialingPermissions/Countries/${isoCode}`; // Dependents this._highriskSpecialPrefixes = undefined; diff --git a/lib/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.js b/lib/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.js index caca405e91..666c203200 100644 --- a/lib/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.js +++ b/lib/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.js @@ -52,9 +52,7 @@ HighriskSpecialPrefixList = function HighriskSpecialPrefixList(version, isoCode) HighriskSpecialPrefixListInstance._version = version; // Path Solution HighriskSpecialPrefixListInstance._solution = {isoCode: isoCode}; - HighriskSpecialPrefixListInstance._uri = _.template( - '/DialingPermissions/Countries/<%= isoCode %>/HighRiskSpecialPrefixes' // jshint ignore:line - )(HighriskSpecialPrefixListInstance._solution); + HighriskSpecialPrefixListInstance._uri = `/DialingPermissions/Countries/${isoCode}/HighRiskSpecialPrefixes`; /* jshint ignore:start */ /** * Streams HighriskSpecialPrefixInstance records from the API. diff --git a/lib/rest/voice/v1/dialingPermissions/settings.js b/lib/rest/voice/v1/dialingPermissions/settings.js index 690eb87334..24c0a116d5 100644 --- a/lib/rest/voice/v1/dialingPermissions/settings.js +++ b/lib/rest/voice/v1/dialingPermissions/settings.js @@ -276,9 +276,7 @@ SettingsContext = function SettingsContext(version) { // Path Solution this._solution = {}; - this._uri = _.template( - '/Settings' // jshint ignore:line - )(this._solution); + this._uri = `/Settings`; }; /* jshint ignore:start */ diff --git a/lib/rest/wireless/v1/command.js b/lib/rest/wireless/v1/command.js index 849acba9d9..b227b2e58d 100644 --- a/lib/rest/wireless/v1/command.js +++ b/lib/rest/wireless/v1/command.js @@ -50,9 +50,7 @@ CommandList = function CommandList(version) { CommandListInstance._version = version; // Path Solution CommandListInstance._solution = {}; - CommandListInstance._uri = _.template( - '/Commands' // jshint ignore:line - )(CommandListInstance._solution); + CommandListInstance._uri = `/Commands`; /* jshint ignore:start */ /** * Streams CommandInstance records from the API. @@ -625,9 +623,7 @@ CommandContext = function CommandContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Commands/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Commands/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/wireless/v1/ratePlan.js b/lib/rest/wireless/v1/ratePlan.js index b7d23e73cf..a87161910f 100644 --- a/lib/rest/wireless/v1/ratePlan.js +++ b/lib/rest/wireless/v1/ratePlan.js @@ -50,9 +50,7 @@ RatePlanList = function RatePlanList(version) { RatePlanListInstance._version = version; // Path Solution RatePlanListInstance._solution = {}; - RatePlanListInstance._uri = _.template( - '/RatePlans' // jshint ignore:line - )(RatePlanListInstance._solution); + RatePlanListInstance._uri = `/RatePlans`; /* jshint ignore:start */ /** * Streams RatePlanInstance records from the API. @@ -645,9 +643,7 @@ RatePlanContext = function RatePlanContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/RatePlans/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/RatePlans/${sid}`; }; /* jshint ignore:start */ diff --git a/lib/rest/wireless/v1/sim.js b/lib/rest/wireless/v1/sim.js index 2313cf7451..e4da901eea 100644 --- a/lib/rest/wireless/v1/sim.js +++ b/lib/rest/wireless/v1/sim.js @@ -51,9 +51,7 @@ SimList = function SimList(version) { SimListInstance._version = version; // Path Solution SimListInstance._solution = {}; - SimListInstance._uri = _.template( - '/Sims' // jshint ignore:line - )(SimListInstance._solution); + SimListInstance._uri = `/Sims`; /* jshint ignore:start */ /** * Streams SimInstance records from the API. @@ -681,9 +679,7 @@ SimContext = function SimContext(version, sid) { // Path Solution this._solution = {sid: sid, }; - this._uri = _.template( - '/Sims/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Sims/${sid}`; // Dependents this._usageRecords = undefined; diff --git a/lib/rest/wireless/v1/sim/dataSession.js b/lib/rest/wireless/v1/sim/dataSession.js index fb887c60be..43032a2569 100644 --- a/lib/rest/wireless/v1/sim/dataSession.js +++ b/lib/rest/wireless/v1/sim/dataSession.js @@ -51,9 +51,7 @@ DataSessionList = function DataSessionList(version, simSid) { DataSessionListInstance._version = version; // Path Solution DataSessionListInstance._solution = {simSid: simSid}; - DataSessionListInstance._uri = _.template( - '/Sims/<%= simSid %>/DataSessions' // jshint ignore:line - )(DataSessionListInstance._solution); + DataSessionListInstance._uri = `/Sims/${simSid}/DataSessions`; /* jshint ignore:start */ /** * Streams DataSessionInstance records from the API. diff --git a/lib/rest/wireless/v1/sim/usageRecord.js b/lib/rest/wireless/v1/sim/usageRecord.js index 4f402f75ea..3a075edac5 100644 --- a/lib/rest/wireless/v1/sim/usageRecord.js +++ b/lib/rest/wireless/v1/sim/usageRecord.js @@ -49,9 +49,7 @@ UsageRecordList = function UsageRecordList(version, simSid) { UsageRecordListInstance._version = version; // Path Solution UsageRecordListInstance._solution = {simSid: simSid}; - UsageRecordListInstance._uri = _.template( - '/Sims/<%= simSid %>/UsageRecords' // jshint ignore:line - )(UsageRecordListInstance._solution); + UsageRecordListInstance._uri = `/Sims/${simSid}/UsageRecords`; /* jshint ignore:start */ /** * Streams UsageRecordInstance records from the API. diff --git a/spec/integration/rest/accounts/v1/credential.spec.js b/spec/integration/rest/accounts/v1/credential.spec.js index 771cf98d10..df00094ce6 100644 --- a/spec/integration/rest/accounts/v1/credential.spec.js +++ b/spec/integration/rest/accounts/v1/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/accounts/v1/credential/aws.spec.js b/spec/integration/rest/accounts/v1/credential/aws.spec.js index 50ce6553ca..d5c8bac81c 100644 --- a/spec/integration/rest/accounts/v1/credential/aws.spec.js +++ b/spec/integration/rest/accounts/v1/credential/aws.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -267,8 +266,8 @@ describe('Aws', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://accounts.twilio.com/v1/Credentials/AWS/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://accounts.twilio.com/v1/Credentials/AWS/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -313,8 +312,8 @@ describe('Aws', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://accounts.twilio.com/v1/Credentials/AWS/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://accounts.twilio.com/v1/Credentials/AWS/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -359,8 +358,8 @@ describe('Aws', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://accounts.twilio.com/v1/Credentials/AWS/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://accounts.twilio.com/v1/Credentials/AWS/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/accounts/v1/credential/publicKey.spec.js b/spec/integration/rest/accounts/v1/credential/publicKey.spec.js index 3423ab6c53..d311ecba77 100644 --- a/spec/integration/rest/accounts/v1/credential/publicKey.spec.js +++ b/spec/integration/rest/accounts/v1/credential/publicKey.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -267,8 +266,8 @@ describe('PublicKey', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://accounts.twilio.com/v1/Credentials/PublicKeys/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://accounts.twilio.com/v1/Credentials/PublicKeys/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -313,8 +312,8 @@ describe('PublicKey', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://accounts.twilio.com/v1/Credentials/PublicKeys/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://accounts.twilio.com/v1/Credentials/PublicKeys/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -359,8 +358,8 @@ describe('PublicKey', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://accounts.twilio.com/v1/Credentials/PublicKeys/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://accounts.twilio.com/v1/Credentials/PublicKeys/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account.spec.js b/spec/integration/rest/api/v2010/account.spec.js index 7c3032cfa9..76998cd26e 100644 --- a/spec/integration/rest/api/v2010/account.spec.js +++ b/spec/integration/rest/api/v2010/account.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -110,8 +109,8 @@ describe('Account', function() { }); promise.done(); - var solution = {sid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= sid %>.json')(solution); + var sid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -443,8 +442,8 @@ describe('Account', function() { }); promise.done(); - var solution = {sid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= sid %>.json')(solution); + var sid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/address.spec.js b/spec/integration/rest/api/v2010/account/address.spec.js index a8cb2219c0..151d9571b0 100644 --- a/spec/integration/rest/api/v2010/account/address.spec.js +++ b/spec/integration/rest/api/v2010/account/address.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -51,8 +50,8 @@ describe('Address', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses.json`; var values = { CustomerName: 'customer_name', @@ -123,11 +122,9 @@ describe('Address', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -165,11 +162,9 @@ describe('Address', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -223,11 +218,9 @@ describe('Address', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -346,7 +339,7 @@ describe('Address', function() { .addresses.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses.json', params: {PageSize: 20}, })); } @@ -403,8 +396,8 @@ describe('Address', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/address/dependentPhoneNumber.spec.js b/spec/integration/rest/api/v2010/account/address/dependentPhoneNumber.spec.js index f65f3cc67f..099da2128b 100644 --- a/spec/integration/rest/api/v2010/account/address/dependentPhoneNumber.spec.js +++ b/spec/integration/rest/api/v2010/account/address/dependentPhoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -130,7 +129,7 @@ describe('DependentPhoneNumber', function() { .dependentPhoneNumbers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses/<%= addressSid %>/DependentPhoneNumbers.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses/${addressSid}/DependentPhoneNumbers.json', params: {PageSize: 20}, })); } @@ -199,11 +198,9 @@ describe('DependentPhoneNumber', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - addressSid: 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Addresses/<%= addressSid %>/DependentPhoneNumbers.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var addressSid = 'ADXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Addresses/${addressSid}/DependentPhoneNumbers.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/application.spec.js b/spec/integration/rest/api/v2010/account/application.spec.js index 8d327d0f53..e7a62aa471 100644 --- a/spec/integration/rest/api/v2010/account/application.spec.js +++ b/spec/integration/rest/api/v2010/account/application.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('Application', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Applications.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Applications.json`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -107,11 +106,9 @@ describe('Application', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Applications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Applications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -149,11 +146,9 @@ describe('Application', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Applications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Applications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -281,7 +276,7 @@ describe('Application', function() { .applications.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Applications.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Applications.json', params: {PageSize: 20}, })); } @@ -340,8 +335,8 @@ describe('Application', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Applications.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Applications.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -439,11 +434,9 @@ describe('Application', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Applications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Applications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/authorizedConnectApp.spec.js b/spec/integration/rest/api/v2010/account/authorizedConnectApp.spec.js index dd1f5c219a..55edcaf9e2 100644 --- a/spec/integration/rest/api/v2010/account/authorizedConnectApp.spec.js +++ b/spec/integration/rest/api/v2010/account/authorizedConnectApp.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('AuthorizedConnectApp', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - connectAppSid: 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AuthorizedConnectApps/<%= connectAppSid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var connectAppSid = 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AuthorizedConnectApps/${connectAppSid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -157,7 +154,7 @@ describe('AuthorizedConnectApp', function() { .authorizedConnectApps.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AuthorizedConnectApps.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AuthorizedConnectApps.json', params: {PageSize: 20}, })); } @@ -211,8 +208,8 @@ describe('AuthorizedConnectApp', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AuthorizedConnectApps.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AuthorizedConnectApps.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber.spec.js index c603377e23..ac7d9ae9c7 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -92,7 +91,7 @@ describe('AvailablePhoneNumberCountry', function() { .availablePhoneNumbers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers.json', params: {PageSize: 20}, })); } @@ -141,8 +140,8 @@ describe('AvailablePhoneNumberCountry', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -233,8 +232,9 @@ describe('AvailablePhoneNumberCountry', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/local.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/local.spec.js index 0516722d2d..deca1114b7 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/local.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/local.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -114,7 +113,7 @@ describe('Local', function() { .local.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Local.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Local.json', params: {PageSize: 20}, })); } @@ -175,8 +174,9 @@ describe('Local', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Local.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Local.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/machineToMachine.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/machineToMachine.spec.js index 008fa84ce5..af926a1397 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/machineToMachine.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/machineToMachine.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -114,7 +113,7 @@ describe('MachineToMachine', function() { .machineToMachine.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/MachineToMachine.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/MachineToMachine.json', params: {PageSize: 20}, })); } @@ -175,8 +174,9 @@ describe('MachineToMachine', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/MachineToMachine.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/MachineToMachine.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/mobile.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/mobile.spec.js index e6f55ca383..db56cf0986 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/mobile.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/mobile.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -112,7 +111,7 @@ describe('Mobile', function() { .mobile.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Mobile.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Mobile.json', params: {PageSize: 20}, })); } @@ -172,8 +171,9 @@ describe('Mobile', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Mobile.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Mobile.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/national.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/national.spec.js index 93d73a89a8..0df626fd5b 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/national.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/national.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -114,7 +113,7 @@ describe('National', function() { .national.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/National.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/National.json', params: {PageSize: 20}, })); } @@ -175,8 +174,9 @@ describe('National', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/National.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/National.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/sharedCost.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/sharedCost.spec.js index 2387b92257..4b80e4991a 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/sharedCost.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/sharedCost.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -114,7 +113,7 @@ describe('SharedCost', function() { .sharedCost.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/SharedCost.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/SharedCost.json', params: {PageSize: 20}, })); } @@ -175,8 +174,9 @@ describe('SharedCost', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/SharedCost.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/SharedCost.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/tollFree.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/tollFree.spec.js index a3a41b49ae..bd602d2a1f 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/tollFree.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/tollFree.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -112,7 +111,7 @@ describe('TollFree', function() { .tollFree.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/TollFree.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/TollFree.json', params: {PageSize: 20}, })); } @@ -172,8 +171,9 @@ describe('TollFree', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/TollFree.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/TollFree.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/availablePhoneNumber/voip.spec.js b/spec/integration/rest/api/v2010/account/availablePhoneNumber/voip.spec.js index e430cb6279..adfe9b3df5 100644 --- a/spec/integration/rest/api/v2010/account/availablePhoneNumber/voip.spec.js +++ b/spec/integration/rest/api/v2010/account/availablePhoneNumber/voip.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -114,7 +113,7 @@ describe('Voip', function() { .voip.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Voip.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Voip.json', params: {PageSize: 20}, })); } @@ -175,8 +174,9 @@ describe('Voip', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', countryCode: 'US'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/AvailablePhoneNumbers/<%= countryCode %>/Voip.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var countryCode = 'US'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/AvailablePhoneNumbers/${countryCode}/Voip.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/balance.spec.js b/spec/integration/rest/api/v2010/account/balance.spec.js index bf86929550..5296785b88 100644 --- a/spec/integration/rest/api/v2010/account/balance.spec.js +++ b/spec/integration/rest/api/v2010/account/balance.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Balance', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Balance.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Balance.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/call.spec.js b/spec/integration/rest/api/v2010/account/call.spec.js index 5f9bb1075f..7256c94d64 100644 --- a/spec/integration/rest/api/v2010/account/call.spec.js +++ b/spec/integration/rest/api/v2010/account/call.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('Call', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls.json`; var values = {To: '+15558675310', From: '+15017122661', }; holodeck.assertHasRequest(new Request({ @@ -117,11 +116,9 @@ describe('Call', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -159,11 +156,9 @@ describe('Call', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -315,7 +310,7 @@ describe('Call', function() { .calls.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls.json', params: {PageSize: 20}, })); } @@ -382,8 +377,8 @@ describe('Call', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -489,11 +484,9 @@ describe('Call', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/call/feedback.spec.js b/spec/integration/rest/api/v2010/account/call/feedback.spec.js index 357e4b2bec..6676453e49 100644 --- a/spec/integration/rest/api/v2010/account/call/feedback.spec.js +++ b/spec/integration/rest/api/v2010/account/call/feedback.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('Feedback', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Feedback.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Feedback.json`; var values = {QualityScore: 1, }; holodeck.assertHasRequest(new Request({ @@ -102,11 +99,9 @@ describe('Feedback', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Feedback.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Feedback.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -157,11 +152,9 @@ describe('Feedback', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Feedback.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Feedback.json`; var values = {QualityScore: 1, }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/api/v2010/account/call/feedbackSummary.spec.js b/spec/integration/rest/api/v2010/account/call/feedbackSummary.spec.js index cd0772595c..4edd1a6239 100644 --- a/spec/integration/rest/api/v2010/account/call/feedbackSummary.spec.js +++ b/spec/integration/rest/api/v2010/account/call/feedbackSummary.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -47,8 +46,8 @@ describe('FeedbackSummary', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/FeedbackSummary.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/FeedbackSummary.json`; var values = { StartDate: serialize.iso8601Date(new Date(Date.UTC(2008, 0, 2))), @@ -115,11 +114,9 @@ describe('FeedbackSummary', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/FeedbackSummary/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/FeedbackSummary/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -180,11 +177,9 @@ describe('FeedbackSummary', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/FeedbackSummary/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/FeedbackSummary/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/call/notification.spec.js b/spec/integration/rest/api/v2010/account/call/notification.spec.js index 3814745444..a74a45af48 100644 --- a/spec/integration/rest/api/v2010/account/call/notification.spec.js +++ b/spec/integration/rest/api/v2010/account/call/notification.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Notification', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Notifications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Notifications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -107,12 +104,10 @@ describe('Notification', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Notifications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Notifications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -216,7 +211,7 @@ describe('Notification', function() { .notifications.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Notifications.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Notifications.json', params: {PageSize: 20}, })); } @@ -274,11 +269,9 @@ describe('Notification', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Notifications.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Notifications.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/call/recording.spec.js b/spec/integration/rest/api/v2010/account/call/recording.spec.js index 20b796994d..e3128107b4 100644 --- a/spec/integration/rest/api/v2010/account/call/recording.spec.js +++ b/spec/integration/rest/api/v2010/account/call/recording.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Recordings.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -107,12 +104,10 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Recordings/${sid}.json`; var values = {Status: 'in-progress', }; holodeck.assertHasRequest(new Request({ @@ -173,12 +168,10 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Recordings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -240,12 +233,10 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Recordings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -357,7 +348,7 @@ describe('Recording', function() { .recordings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Recordings.json', params: {PageSize: 20}, })); } @@ -419,11 +410,9 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Calls/<%= callSid %>/Recordings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Calls/${callSid}/Recordings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/conference.spec.js b/spec/integration/rest/api/v2010/account/conference.spec.js index 07c958658a..bf5ff41def 100644 --- a/spec/integration/rest/api/v2010/account/conference.spec.js +++ b/spec/integration/rest/api/v2010/account/conference.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Conference', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -154,7 +151,7 @@ describe('Conference', function() { .conferences.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences.json', params: {PageSize: 20}, })); } @@ -206,8 +203,8 @@ describe('Conference', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -298,11 +295,9 @@ describe('Conference', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/conference/participant.spec.js b/spec/integration/rest/api/v2010/account/conference/participant.spec.js index 83157a03a1..771a0359a8 100644 --- a/spec/integration/rest/api/v2010/account/conference/participant.spec.js +++ b/spec/integration/rest/api/v2010/account/conference/participant.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Participant', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants/<%= callSid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants/${callSid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,12 +100,10 @@ describe('Participant', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants/<%= callSid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants/${callSid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -195,11 +190,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants.json`; var values = {From: '+15017122661', To: '+15558675310', }; holodeck.assertHasRequest(new Request({ @@ -322,12 +315,10 @@ describe('Participant', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants/<%= callSid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants/${callSid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -423,7 +414,7 @@ describe('Participant', function() { .participants.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants.json', params: {PageSize: 20}, })); } @@ -477,11 +468,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Participants.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Participants.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/conference/recording.spec.js b/spec/integration/rest/api/v2010/account/conference/recording.spec.js index a655a92fc4..bdca1ab7f4 100644 --- a/spec/integration/rest/api/v2010/account/conference/recording.spec.js +++ b/spec/integration/rest/api/v2010/account/conference/recording.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,12 +44,10 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings/${sid}.json`; var values = {Status: 'in-progress', }; holodeck.assertHasRequest(new Request({ @@ -111,12 +108,10 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -178,12 +173,10 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -295,7 +288,7 @@ describe('Recording', function() { .recordings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings.json', params: {PageSize: 20}, })); } @@ -357,11 +350,9 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - conferenceSid: 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Conferences/<%= conferenceSid %>/Recordings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var conferenceSid = 'CFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Conferences/${conferenceSid}/Recordings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/connectApp.spec.js b/spec/integration/rest/api/v2010/account/connectApp.spec.js index 22ffa6413a..43b1533ebd 100644 --- a/spec/integration/rest/api/v2010/account/connectApp.spec.js +++ b/spec/integration/rest/api/v2010/account/connectApp.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('ConnectApp', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/ConnectApps/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/ConnectApps/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -97,11 +94,9 @@ describe('ConnectApp', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/ConnectApps/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/ConnectApps/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -208,7 +203,7 @@ describe('ConnectApp', function() { .connectApps.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/ConnectApps.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/ConnectApps.json', params: {PageSize: 20}, })); } @@ -261,8 +256,8 @@ describe('ConnectApp', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/ConnectApps.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/ConnectApps.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/incomingPhoneNumber.spec.js b/spec/integration/rest/api/v2010/account/incomingPhoneNumber.spec.js index dbd32ceb6a..ce71ee0362 100644 --- a/spec/integration/rest/api/v2010/account/incomingPhoneNumber.spec.js +++ b/spec/integration/rest/api/v2010/account/incomingPhoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('IncomingPhoneNumber', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -120,11 +117,9 @@ describe('IncomingPhoneNumber', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -197,11 +192,9 @@ describe('IncomingPhoneNumber', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -342,7 +335,7 @@ describe('IncomingPhoneNumber', function() { .incomingPhoneNumbers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers.json', params: {PageSize: 20}, })); } @@ -418,8 +411,8 @@ describe('IncomingPhoneNumber', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -537,8 +530,8 @@ describe('IncomingPhoneNumber', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.spec.js b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.spec.js index 6d2de41f5c..0aef881d14 100644 --- a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.spec.js +++ b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('AssignedAddOn', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - resourceSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var resourceSid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -165,7 +162,7 @@ describe('AssignedAddOn', function() { .assignedAddOns.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns.json', params: {PageSize: 20}, })); } @@ -221,11 +218,9 @@ describe('AssignedAddOn', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - resourceSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var resourceSid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -322,11 +317,9 @@ describe('AssignedAddOn', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - resourceSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var resourceSid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns.json`; var values = {InstalledAddOnSid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -385,12 +378,10 @@ describe('AssignedAddOn', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - resourceSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var resourceSid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.spec.js b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.spec.js index ad0808b8c4..d0297217ea 100644 --- a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.spec.js +++ b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,13 +44,11 @@ describe('AssignedAddOnExtension', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - resourceSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - assignedAddOnSid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= assignedAddOnSid %>/Extensions/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var resourceSid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var assignedAddOnSid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${assignedAddOnSid}/Extensions/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -152,7 +149,7 @@ describe('AssignedAddOnExtension', function() { .extensions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= assignedAddOnSid %>/Extensions.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${assignedAddOnSid}/Extensions.json', params: {PageSize: 20}, })); } @@ -204,12 +201,10 @@ describe('AssignedAddOnExtension', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - resourceSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - assignedAddOnSid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/<%= resourceSid %>/AssignedAddOns/<%= assignedAddOnSid %>/Extensions.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var resourceSid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var assignedAddOnSid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/${resourceSid}/AssignedAddOns/${assignedAddOnSid}/Extensions.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/local.spec.js b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/local.spec.js index f5d0bef4c3..9c9580dadb 100644 --- a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/local.spec.js +++ b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/local.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -144,7 +143,7 @@ describe('Local', function() { .local.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Local.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/Local.json', params: {PageSize: 20}, })); } @@ -220,8 +219,8 @@ describe('Local', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Local.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/Local.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -341,8 +340,8 @@ describe('Local', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Local.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/Local.json`; var values = {PhoneNumber: '+15017122661', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/mobile.spec.js b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/mobile.spec.js index 5f83219fee..cc65e9408f 100644 --- a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/mobile.spec.js +++ b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/mobile.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -144,7 +143,7 @@ describe('Mobile', function() { .mobile.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Mobile.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/Mobile.json', params: {PageSize: 20}, })); } @@ -220,8 +219,8 @@ describe('Mobile', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Mobile.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/Mobile.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -341,8 +340,8 @@ describe('Mobile', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/Mobile.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/Mobile.json`; var values = {PhoneNumber: '+15017122661', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/tollFree.spec.js b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/tollFree.spec.js index b28696212b..8958c49e74 100644 --- a/spec/integration/rest/api/v2010/account/incomingPhoneNumber/tollFree.spec.js +++ b/spec/integration/rest/api/v2010/account/incomingPhoneNumber/tollFree.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -144,7 +143,7 @@ describe('TollFree', function() { .tollFree.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/TollFree.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/TollFree.json', params: {PageSize: 20}, })); } @@ -220,8 +219,8 @@ describe('TollFree', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/TollFree.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/TollFree.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -341,8 +340,8 @@ describe('TollFree', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/IncomingPhoneNumbers/TollFree.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/IncomingPhoneNumbers/TollFree.json`; var values = {PhoneNumber: '+15017122661', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/api/v2010/account/key.spec.js b/spec/integration/rest/api/v2010/account/key.spec.js index 8fc5fb3bb8..bb52233066 100644 --- a/spec/integration/rest/api/v2010/account/key.spec.js +++ b/spec/integration/rest/api/v2010/account/key.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Key', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Keys/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Keys/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -90,11 +87,9 @@ describe('Key', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Keys/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Keys/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -137,11 +132,9 @@ describe('Key', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Keys/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Keys/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -216,7 +209,7 @@ describe('Key', function() { .keys.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Keys.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Keys.json', params: {PageSize: 20}, })); } @@ -259,8 +252,8 @@ describe('Key', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Keys.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Keys.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/message.spec.js b/spec/integration/rest/api/v2010/account/message.spec.js index 3fd1d442f4..72c47abd0e 100644 --- a/spec/integration/rest/api/v2010/account/message.spec.js +++ b/spec/integration/rest/api/v2010/account/message.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('Message', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages.json`; var values = {To: '+15558675310', }; holodeck.assertHasRequest(new Request({ @@ -109,11 +108,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -151,11 +148,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -285,7 +280,7 @@ describe('Message', function() { .messages.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages.json', params: {PageSize: 20}, })); } @@ -344,8 +339,8 @@ describe('Message', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -447,11 +442,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${sid}.json`; var values = {Body: 'body', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/api/v2010/account/message/feedback.spec.js b/spec/integration/rest/api/v2010/account/message/feedback.spec.js index 1aaec1157f..4a9f579b0a 100644 --- a/spec/integration/rest/api/v2010/account/message/feedback.spec.js +++ b/spec/integration/rest/api/v2010/account/message/feedback.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('Feedback', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - messageSid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Feedback.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var messageSid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${messageSid}/Feedback.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/message/media.spec.js b/spec/integration/rest/api/v2010/account/message/media.spec.js index 76f35c1238..78241d3ddb 100644 --- a/spec/integration/rest/api/v2010/account/message/media.spec.js +++ b/spec/integration/rest/api/v2010/account/message/media.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Media', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - messageSid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Media/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var messageSid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${messageSid}/Media/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -89,12 +86,10 @@ describe('Media', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - messageSid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Media/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var messageSid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${messageSid}/Media/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -192,7 +187,7 @@ describe('Media', function() { .media.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Media.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${messageSid}/Media.json', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('Media', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - messageSid: 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Messages/<%= messageSid %>/Media.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var messageSid = 'MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Messages/${messageSid}/Media.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/newKey.spec.js b/spec/integration/rest/api/v2010/account/newKey.spec.js index e0ca0506c6..ee3e440a89 100644 --- a/spec/integration/rest/api/v2010/account/newKey.spec.js +++ b/spec/integration/rest/api/v2010/account/newKey.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('NewKey', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Keys.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Keys.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/newSigningKey.spec.js b/spec/integration/rest/api/v2010/account/newSigningKey.spec.js index 3280efc27b..3dc0f523b3 100644 --- a/spec/integration/rest/api/v2010/account/newSigningKey.spec.js +++ b/spec/integration/rest/api/v2010/account/newSigningKey.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('NewSigningKey', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SigningKeys.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SigningKeys.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/notification.spec.js b/spec/integration/rest/api/v2010/account/notification.spec.js index e8c268d0ac..4b283a676e 100644 --- a/spec/integration/rest/api/v2010/account/notification.spec.js +++ b/spec/integration/rest/api/v2010/account/notification.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Notification', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Notifications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Notifications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('Notification', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Notifications/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Notifications/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -208,7 +203,7 @@ describe('Notification', function() { .notifications.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Notifications.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Notifications.json', params: {PageSize: 20}, })); } @@ -264,8 +259,8 @@ describe('Notification', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Notifications.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Notifications.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/outgoingCallerId.spec.js b/spec/integration/rest/api/v2010/account/outgoingCallerId.spec.js index fb6689926b..45ddfe2b5c 100644 --- a/spec/integration/rest/api/v2010/account/outgoingCallerId.spec.js +++ b/spec/integration/rest/api/v2010/account/outgoingCallerId.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('OutgoingCallerId', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/OutgoingCallerIds/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/OutgoingCallerIds/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +90,9 @@ describe('OutgoingCallerId', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/OutgoingCallerIds/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/OutgoingCallerIds/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -143,11 +138,9 @@ describe('OutgoingCallerId', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/OutgoingCallerIds/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/OutgoingCallerIds/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -234,7 +227,7 @@ describe('OutgoingCallerId', function() { .outgoingCallerIds.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/OutgoingCallerIds.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/OutgoingCallerIds.json', params: {PageSize: 20}, })); } @@ -283,8 +276,8 @@ describe('OutgoingCallerId', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/OutgoingCallerIds.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/OutgoingCallerIds.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/queue.spec.js b/spec/integration/rest/api/v2010/account/queue.spec.js index d9fd74e4df..b8afad50ff 100644 --- a/spec/integration/rest/api/v2010/account/queue.spec.js +++ b/spec/integration/rest/api/v2010/account/queue.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Queue', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -98,11 +95,9 @@ describe('Queue', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -153,11 +148,9 @@ describe('Queue', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -248,7 +241,7 @@ describe('Queue', function() { .queues.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues.json', params: {PageSize: 20}, })); } @@ -299,8 +292,8 @@ describe('Queue', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -391,8 +384,8 @@ describe('Queue', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues.json`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/api/v2010/account/queue/member.spec.js b/spec/integration/rest/api/v2010/account/queue/member.spec.js index 49aafa828f..5e29459d1b 100644 --- a/spec/integration/rest/api/v2010/account/queue/member.spec.js +++ b/spec/integration/rest/api/v2010/account/queue/member.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - queueSid: 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= queueSid %>/Members/<%= callSid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var queueSid = 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${queueSid}/Members/${callSid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -122,12 +119,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - queueSid: 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= queueSid %>/Members/<%= callSid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var queueSid = 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${queueSid}/Members/${callSid}.json`; var values = {Url: 'https://example.com', Method: 'GET', }; holodeck.assertHasRequest(new Request({ @@ -245,7 +240,7 @@ describe('Member', function() { .members.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= queueSid %>/Members.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${queueSid}/Members.json', params: {PageSize: 20}, })); } @@ -292,11 +287,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - queueSid: 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Queues/<%= queueSid %>/Members.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var queueSid = 'QUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Queues/${queueSid}/Members.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/recording.spec.js b/spec/integration/rest/api/v2010/account/recording.spec.js index c20031e97c..28eb815cf1 100644 --- a/spec/integration/rest/api/v2010/account/recording.spec.js +++ b/spec/integration/rest/api/v2010/account/recording.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -111,11 +108,9 @@ describe('Recording', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -232,7 +227,7 @@ describe('Recording', function() { .recordings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings.json', params: {PageSize: 20}, })); } @@ -296,8 +291,8 @@ describe('Recording', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/recording/addOnResult.spec.js b/spec/integration/rest/api/v2010/account/recording/addOnResult.spec.js index 2e63f41603..0710e9aad2 100644 --- a/spec/integration/rest/api/v2010/account/recording/addOnResult.spec.js +++ b/spec/integration/rest/api/v2010/account/recording/addOnResult.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('AddOnResult', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - referenceSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var referenceSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -156,7 +153,7 @@ describe('AddOnResult', function() { .addOnResults.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults.json', params: {PageSize: 20}, })); } @@ -209,11 +206,9 @@ describe('AddOnResult', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - referenceSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var referenceSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -306,12 +301,10 @@ describe('AddOnResult', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - referenceSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var referenceSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/recording/addOnResult/payload.spec.js b/spec/integration/rest/api/v2010/account/recording/addOnResult/payload.spec.js index 361aa3fac4..ebdf1316c1 100644 --- a/spec/integration/rest/api/v2010/account/recording/addOnResult/payload.spec.js +++ b/spec/integration/rest/api/v2010/account/recording/addOnResult/payload.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,13 +44,11 @@ describe('Payload', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - referenceSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - addOnResultSid: 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= addOnResultSid %>/Payloads/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var referenceSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var addOnResultSid = 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -164,7 +161,7 @@ describe('Payload', function() { .payloads.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= addOnResultSid %>/Payloads.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads.json', params: {PageSize: 20}, })); } @@ -220,12 +217,10 @@ describe('Payload', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - referenceSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - addOnResultSid: 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= addOnResultSid %>/Payloads.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var referenceSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var addOnResultSid = 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -322,13 +317,11 @@ describe('Payload', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - referenceSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - addOnResultSid: 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= referenceSid %>/AddOnResults/<%= addOnResultSid %>/Payloads/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var referenceSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var addOnResultSid = 'XRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${referenceSid}/AddOnResults/${addOnResultSid}/Payloads/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/recording/transcription.spec.js b/spec/integration/rest/api/v2010/account/recording/transcription.spec.js index 155ee2b9cc..5514b51ac3 100644 --- a/spec/integration/rest/api/v2010/account/recording/transcription.spec.js +++ b/spec/integration/rest/api/v2010/account/recording/transcription.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Transcription', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - recordingSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= recordingSid %>/Transcriptions/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var recordingSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${recordingSid}/Transcriptions/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,12 +100,10 @@ describe('Transcription', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - recordingSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= recordingSid %>/Transcriptions/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var recordingSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${recordingSid}/Transcriptions/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -210,7 +205,7 @@ describe('Transcription', function() { .transcriptions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= recordingSid %>/Transcriptions.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${recordingSid}/Transcriptions.json', params: {PageSize: 20}, })); } @@ -267,11 +262,9 @@ describe('Transcription', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - recordingSid: 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Recordings/<%= recordingSid %>/Transcriptions.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var recordingSid = 'REXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Recordings/${recordingSid}/Transcriptions.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/shortCode.spec.js b/spec/integration/rest/api/v2010/account/shortCode.spec.js index ce3307b105..cc6bacc44d 100644 --- a/spec/integration/rest/api/v2010/account/shortCode.spec.js +++ b/spec/integration/rest/api/v2010/account/shortCode.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SMS/ShortCodes/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SMS/ShortCodes/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -98,11 +95,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SMS/ShortCodes/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SMS/ShortCodes/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -212,7 +207,7 @@ describe('ShortCode', function() { .shortCodes.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SMS/ShortCodes.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SMS/ShortCodes.json', params: {PageSize: 20}, })); } @@ -266,8 +261,8 @@ describe('ShortCode', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SMS/ShortCodes.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SMS/ShortCodes.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/signingKey.spec.js b/spec/integration/rest/api/v2010/account/signingKey.spec.js index 7e4e8a0d07..8c53e12cd6 100644 --- a/spec/integration/rest/api/v2010/account/signingKey.spec.js +++ b/spec/integration/rest/api/v2010/account/signingKey.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('SigningKey', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SigningKeys/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SigningKeys/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -90,11 +87,9 @@ describe('SigningKey', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SigningKeys/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SigningKeys/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -137,11 +132,9 @@ describe('SigningKey', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SigningKeys/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SigningKeys/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -216,7 +209,7 @@ describe('SigningKey', function() { .signingKeys.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SigningKeys.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SigningKeys.json', params: {PageSize: 20}, })); } @@ -259,8 +252,8 @@ describe('SigningKey', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SigningKeys.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SigningKeys.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/sip.spec.js b/spec/integration/rest/api/v2010/account/sip.spec.js index d946190bbc..de79893fbd 100644 --- a/spec/integration/rest/api/v2010/account/sip.spec.js +++ b/spec/integration/rest/api/v2010/account/sip.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/api/v2010/account/sip/credentialList.spec.js b/spec/integration/rest/api/v2010/account/sip/credentialList.spec.js index 8ee551bb30..7e60495bfb 100644 --- a/spec/integration/rest/api/v2010/account/sip/credentialList.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/credentialList.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -88,7 +87,7 @@ describe('CredentialList', function() { .credentialLists.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists.json', params: {PageSize: 20}, })); } @@ -136,8 +135,8 @@ describe('CredentialList', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -224,8 +223,8 @@ describe('CredentialList', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists.json`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -278,11 +277,9 @@ describe('CredentialList', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -333,11 +330,9 @@ describe('CredentialList', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${sid}.json`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -390,11 +385,9 @@ describe('CredentialList', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/credentialList/credential.spec.js b/spec/integration/rest/api/v2010/account/sip/credentialList/credential.spec.js index eb9677e269..6b22478d58 100644 --- a/spec/integration/rest/api/v2010/account/sip/credentialList/credential.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/credentialList/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -96,7 +95,7 @@ describe('Credential', function() { .credentials.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials.json', params: {PageSize: 20}, })); } @@ -149,11 +148,9 @@ describe('Credential', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - credentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var credentialListSid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -251,11 +248,9 @@ describe('Credential', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - credentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var credentialListSid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials.json`; var values = {Username: 'username', Password: 'password', }; holodeck.assertHasRequest(new Request({ @@ -308,12 +303,10 @@ describe('Credential', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - credentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var credentialListSid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -363,12 +356,10 @@ describe('Credential', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - credentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var credentialListSid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -418,12 +409,10 @@ describe('Credential', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - credentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/CredentialLists/<%= credentialListSid %>/Credentials/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var credentialListSid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/CredentialLists/${credentialListSid}/Credentials/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/domain.spec.js b/spec/integration/rest/api/v2010/account/sip/domain.spec.js index fb68722019..a1fe1e88e4 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -116,7 +115,7 @@ describe('Domain', function() { .domains.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains.json', params: {PageSize: 20}, })); } @@ -178,8 +177,8 @@ describe('Domain', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -282,8 +281,8 @@ describe('Domain', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains.json`; var values = {DomainName: 'domain_name', }; holodeck.assertHasRequest(new Request({ @@ -348,11 +347,9 @@ describe('Domain', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -414,11 +411,9 @@ describe('Domain', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -480,11 +475,9 @@ describe('Domain', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/domain/authTypes.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/authTypes.spec.js index b254cbb222..54a37a084f 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/authTypes.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/authTypes.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping.spec.js index 249f8959c9..b4e1dd245d 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require( '../../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( diff --git a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.spec.js index f6134d60f5..66ad6dd914 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsCredentialListMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require( '../../../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( @@ -50,11 +49,9 @@ describe('AuthCallsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings.json`; var values = {CredentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -152,7 +149,7 @@ describe('AuthCallsCredentialListMapping', function() { .credentialListMappings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings.json', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('AuthCallsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -303,12 +298,10 @@ describe('AuthCallsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('AuthCallsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/CredentialListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/CredentialListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.spec.js index 9a56c63c01..c7dea92b55 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authCallsMapping/authCallsIpAccessControlListMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require( '../../../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( @@ -50,11 +49,9 @@ describe('AuthCallsIpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings.json`; var values = {IpAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -152,7 +149,7 @@ describe('AuthCallsIpAccessControlListMapping', function() { .ipAccessControlListMappings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings.json', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('AuthCallsIpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -303,12 +298,10 @@ describe('AuthCallsIpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('AuthCallsIpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Calls/IpAccessControlListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Calls/IpAccessControlListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping.spec.js index ec5cd28234..cb4f42c532 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require( '../../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( diff --git a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.spec.js index 869e42f0dc..8a89a42a59 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/authTypes/authRegistrationsMapping/authRegistrationsCredentialListMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require( '../../../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( @@ -50,11 +49,9 @@ describe('AuthRegistrationsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings.json`; var values = {CredentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -152,7 +149,7 @@ describe('AuthRegistrationsCredentialListMapping', function() { .credentialListMappings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings.json', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('AuthRegistrationsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -303,12 +298,10 @@ describe('AuthRegistrationsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('AuthRegistrationsCredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/Auth/Registrations/CredentialListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/Auth/Registrations/CredentialListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/domain/credentialListMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/credentialListMapping.spec.js index d536244430..a34fd201a8 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/credentialListMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/credentialListMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,11 +45,9 @@ describe('CredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings.json`; var values = {CredentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -150,7 +147,7 @@ describe('CredentialListMapping', function() { .credentialListMappings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings.json', params: {PageSize: 20}, })); } @@ -200,11 +197,9 @@ describe('CredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -293,12 +288,10 @@ describe('CredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -350,12 +343,10 @@ describe('CredentialListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/CredentialListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/CredentialListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.spec.js b/spec/integration/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.spec.js index b6597284f9..4aa8e336a8 100644 --- a/spec/integration/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/domain/ipAccessControlListMapping.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,12 +44,10 @@ describe('IpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('IpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings.json`; var values = {IpAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -217,7 +212,7 @@ describe('IpAccessControlListMapping', function() { .ipAccessControlListMappings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings.json', params: {PageSize: 20}, })); } @@ -272,11 +267,9 @@ describe('IpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -375,12 +368,10 @@ describe('IpAccessControlListMapping', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - domainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/Domains/<%= domainSid %>/IpAccessControlListMappings/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var domainSid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/Domains/${domainSid}/IpAccessControlListMappings/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/ipAccessControlList.spec.js b/spec/integration/rest/api/v2010/account/sip/ipAccessControlList.spec.js index 58926d0e70..1766bc81c4 100644 --- a/spec/integration/rest/api/v2010/account/sip/ipAccessControlList.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/ipAccessControlList.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -98,7 +97,7 @@ describe('IpAccessControlList', function() { .ipAccessControlLists.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists.json', params: {PageSize: 20}, })); } @@ -151,8 +150,8 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -249,8 +248,8 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists.json`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -303,11 +302,9 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -358,11 +355,9 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${sid}.json`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -415,11 +410,9 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.spec.js b/spec/integration/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.spec.js index 1de9c518f3..1e9096f156 100644 --- a/spec/integration/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.spec.js +++ b/spec/integration/rest/api/v2010/account/sip/ipAccessControlList/ipAddress.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -94,7 +93,7 @@ describe('IpAddress', function() { .ipAddresses.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses.json', params: {PageSize: 20}, })); } @@ -146,11 +145,9 @@ describe('IpAddress', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - ipAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var ipAccessControlListSid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -244,11 +241,9 @@ describe('IpAddress', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - ipAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var ipAccessControlListSid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses.json`; var values = {FriendlyName: 'friendly_name', IpAddress: 'ip_address', }; holodeck.assertHasRequest(new Request({ @@ -303,12 +298,10 @@ describe('IpAddress', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - ipAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var ipAccessControlListSid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('IpAddress', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - ipAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var ipAccessControlListSid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -417,12 +408,10 @@ describe('IpAddress', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - ipAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/SIP/IpAccessControlLists/<%= ipAccessControlListSid %>/IpAddresses/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var ipAccessControlListSid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/SIP/IpAccessControlLists/${ipAccessControlListSid}/IpAddresses/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/api/v2010/account/token.spec.js b/spec/integration/rest/api/v2010/account/token.spec.js index a13022f85c..4ec54105ee 100644 --- a/spec/integration/rest/api/v2010/account/token.spec.js +++ b/spec/integration/rest/api/v2010/account/token.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Token', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Tokens.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Tokens.json`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/api/v2010/account/transcription.spec.js b/spec/integration/rest/api/v2010/account/transcription.spec.js index b19bdf2a60..4a2995d70f 100644 --- a/spec/integration/rest/api/v2010/account/transcription.spec.js +++ b/spec/integration/rest/api/v2010/account/transcription.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Transcription', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Transcriptions/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Transcriptions/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,11 +96,9 @@ describe('Transcription', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Transcriptions/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Transcriptions/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -202,7 +197,7 @@ describe('Transcription', function() { .transcriptions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Transcriptions.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Transcriptions.json', params: {PageSize: 20}, })); } @@ -257,8 +252,8 @@ describe('Transcription', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Transcriptions.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Transcriptions.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage.spec.js b/spec/integration/rest/api/v2010/account/usage.spec.js index f60344c850..24cd79e56e 100644 --- a/spec/integration/rest/api/v2010/account/usage.spec.js +++ b/spec/integration/rest/api/v2010/account/usage.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/api/v2010/account/usage/record.spec.js b/spec/integration/rest/api/v2010/account/usage/record.spec.js index 7c28e9a098..6365113e8d 100644 --- a/spec/integration/rest/api/v2010/account/usage/record.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -126,7 +125,7 @@ describe('Record', function() { .records.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records.json', params: {PageSize: 20}, })); } @@ -193,8 +192,8 @@ describe('Record', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/allTime.spec.js b/spec/integration/rest/api/v2010/account/usage/record/allTime.spec.js index d27565e782..9fcbcfd8f0 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/allTime.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/allTime.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('AllTime', function() { .allTime.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/AllTime.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/AllTime.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('AllTime', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/AllTime.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/AllTime.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/daily.spec.js b/spec/integration/rest/api/v2010/account/usage/record/daily.spec.js index 9ec55e2c85..77f20dcb16 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/daily.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/daily.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('Daily', function() { .daily.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Daily.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Daily.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('Daily', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Daily.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Daily.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/lastMonth.spec.js b/spec/integration/rest/api/v2010/account/usage/record/lastMonth.spec.js index 459705fb5c..dac8329be9 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/lastMonth.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/lastMonth.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('LastMonth', function() { .lastMonth.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/LastMonth.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/LastMonth.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('LastMonth', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/LastMonth.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/LastMonth.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/monthly.spec.js b/spec/integration/rest/api/v2010/account/usage/record/monthly.spec.js index aa947ac444..de7c650487 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/monthly.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/monthly.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('Monthly', function() { .monthly.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Monthly.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Monthly.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('Monthly', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Monthly.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Monthly.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/thisMonth.spec.js b/spec/integration/rest/api/v2010/account/usage/record/thisMonth.spec.js index 7832bcc045..edce031bac 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/thisMonth.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/thisMonth.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('ThisMonth', function() { .thisMonth.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/ThisMonth.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/ThisMonth.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('ThisMonth', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/ThisMonth.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/ThisMonth.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/today.spec.js b/spec/integration/rest/api/v2010/account/usage/record/today.spec.js index f8646ede5e..dd2ea15164 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/today.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/today.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('Today', function() { .today.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Today.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Today.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('Today', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Today.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Today.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/yearly.spec.js b/spec/integration/rest/api/v2010/account/usage/record/yearly.spec.js index 141cdcf956..107dfde8f5 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/yearly.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/yearly.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('Yearly', function() { .yearly.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Yearly.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Yearly.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('Yearly', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Yearly.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Yearly.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/record/yesterday.spec.js b/spec/integration/rest/api/v2010/account/usage/record/yesterday.spec.js index 179a8b670f..bd306de0bd 100644 --- a/spec/integration/rest/api/v2010/account/usage/record/yesterday.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/record/yesterday.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -128,7 +127,7 @@ describe('Yesterday', function() { .yesterday.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Yesterday.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Yesterday.json', params: {PageSize: 20}, })); } @@ -197,8 +196,8 @@ describe('Yesterday', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Records/Yesterday.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Records/Yesterday.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/usage/trigger.spec.js b/spec/integration/rest/api/v2010/account/usage/trigger.spec.js index 00a13faca7..6d23dc3d7a 100644 --- a/spec/integration/rest/api/v2010/account/usage/trigger.spec.js +++ b/spec/integration/rest/api/v2010/account/usage/trigger.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('Trigger', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Triggers/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Triggers/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -105,11 +102,9 @@ describe('Trigger', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Triggers/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Triggers/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -166,11 +161,9 @@ describe('Trigger', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Triggers/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Triggers/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -215,8 +208,8 @@ describe('Trigger', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Triggers.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Triggers.json`; var values = { CallbackUrl: 'https://example.com', @@ -352,7 +345,7 @@ describe('Trigger', function() { .triggers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Triggers.json', + url: 'https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Triggers.json', params: {PageSize: 20}, })); } @@ -412,8 +405,8 @@ describe('Trigger', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/Usage/Triggers.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/Usage/Triggers.json`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/api/v2010/account/validationRequest.spec.js b/spec/integration/rest/api/v2010/account/validationRequest.spec.js index b5afde4508..89e2f70488 100644 --- a/spec/integration/rest/api/v2010/account/validationRequest.spec.js +++ b/spec/integration/rest/api/v2010/account/validationRequest.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('ValidationRequest', function() { }); promise.done(); - var solution = {accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/OutgoingCallerIds.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/OutgoingCallerIds.json`; var values = {PhoneNumber: '+15017122661', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/authy/v1/form.spec.js b/spec/integration/rest/authy/v1/form.spec.js index d40f3bbbf2..17cd71caac 100644 --- a/spec/integration/rest/authy/v1/form.spec.js +++ b/spec/integration/rest/authy/v1/form.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Form', function() { }); promise.done(); - var solution = {formType: 'form-app-push'}; - var url = _.template('https://authy.twilio.com/v1/Forms/<%= formType %>')(solution); + var formType = 'form-app-push'; + var url = `https://authy.twilio.com/v1/Forms/${formType}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/authy/v1/service.spec.js b/spec/integration/rest/authy/v1/service.spec.js index 30a2ea1fdf..d0647bb03b 100644 --- a/spec/integration/rest/authy/v1/service.spec.js +++ b/spec/integration/rest/authy/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -92,8 +91,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -129,8 +128,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -357,8 +356,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/authy/v1/service/entity.spec.js b/spec/integration/rest/authy/v1/service/entity.spec.js index 8acf9fa250..d8474260fb 100644 --- a/spec/integration/rest/authy/v1/service/entity.spec.js +++ b/spec/integration/rest/authy/v1/service/entity.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('Entity', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -97,8 +96,9 @@ describe('Entity', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', identity: 'identity'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -136,8 +136,9 @@ describe('Entity', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', identity: 'identity'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -237,7 +238,7 @@ describe('Entity', function() { .entities.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities', + url: 'https://authy.twilio.com/v1/Services/${serviceSid}/Entities', params: {PageSize: 20}, })); } @@ -287,8 +288,8 @@ describe('Entity', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/authy/v1/service/entity/factor.spec.js b/spec/integration/rest/authy/v1/service/entity/factor.spec.js index b971279b80..87ac40bf91 100644 --- a/spec/integration/rest/authy/v1/service/entity/factor.spec.js +++ b/spec/integration/rest/authy/v1/service/entity/factor.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,8 +44,9 @@ describe('Factor', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', identity: 'identity'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors`; var values = {Binding: 'binding', FriendlyName: 'friendly_name', FactorType: 'app-push', }; holodeck.assertHasRequest(new Request({ @@ -105,12 +105,10 @@ describe('Factor', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - sid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var sid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -150,12 +148,10 @@ describe('Factor', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - sid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var sid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -273,7 +269,7 @@ describe('Factor', function() { .factors.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors', + url: 'https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors', params: {PageSize: 20}, })); } @@ -330,8 +326,9 @@ describe('Factor', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', identity: 'identity'}; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -429,12 +426,10 @@ describe('Factor', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - sid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var sid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/authy/v1/service/entity/factor/challenge.spec.js b/spec/integration/rest/authy/v1/service/entity/factor/challenge.spec.js index ea2a2484d6..91f9ad6220 100644 --- a/spec/integration/rest/authy/v1/service/entity/factor/challenge.spec.js +++ b/spec/integration/rest/authy/v1/service/entity/factor/challenge.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,12 +44,10 @@ describe('Challenge', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - factorSid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= factorSid %>/Challenges')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var factorSid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${factorSid}/Challenges`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -110,13 +107,11 @@ describe('Challenge', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - factorSid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'sid' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= factorSid %>/Challenges/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var factorSid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'sid'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${factorSid}/Challenges/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -158,13 +153,11 @@ describe('Challenge', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - factorSid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'sid' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= factorSid %>/Challenges/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var factorSid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'sid'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${factorSid}/Challenges/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -261,13 +254,11 @@ describe('Challenge', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity', - factorSid: 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'sid' - }; - var url = _.template('https://authy.twilio.com/v1/Services/<%= serviceSid %>/Entities/<%= identity %>/Factors/<%= factorSid %>/Challenges/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var factorSid = 'YFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'sid'; + var url = `https://authy.twilio.com/v1/Services/${serviceSid}/Entities/${identity}/Factors/${factorSid}/Challenges/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/autopilot/v1/assistant.spec.js b/spec/integration/rest/autopilot/v1/assistant.spec.js index 431eda6e5d..f25e74d9c1 100644 --- a/spec/integration/rest/autopilot/v1/assistant.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Assistant', function() { }); promise.done(); - var solution = {sid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= sid %>')(solution); + var sid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -382,8 +381,8 @@ describe('Assistant', function() { }); promise.done(); - var solution = {sid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= sid %>')(solution); + var sid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -440,8 +439,8 @@ describe('Assistant', function() { }); promise.done(); - var solution = {sid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= sid %>')(solution); + var sid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/defaults.spec.js b/spec/integration/rest/autopilot/v1/assistant/defaults.spec.js index 7c6eb0c112..9c1a47f30c 100644 --- a/spec/integration/rest/autopilot/v1/assistant/defaults.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/defaults.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Defaults', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Defaults')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Defaults`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -87,8 +86,8 @@ describe('Defaults', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Defaults')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Defaults`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/autopilot/v1/assistant/dialogue.spec.js b/spec/integration/rest/autopilot/v1/assistant/dialogue.spec.js index e3b58aaccc..91336a211a 100644 --- a/spec/integration/rest/autopilot/v1/assistant/dialogue.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/dialogue.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Dialogue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Dialogues/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Dialogues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/autopilot/v1/assistant/fieldType.spec.js b/spec/integration/rest/autopilot/v1/assistant/fieldType.spec.js index 0d03e0a9e4..c77a2e6ac5 100644 --- a/spec/integration/rest/autopilot/v1/assistant/fieldType.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/fieldType.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('FieldType', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -150,7 +147,7 @@ describe('FieldType', function() { .fieldTypes.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes', params: {PageSize: 20}, })); } @@ -201,8 +198,8 @@ describe('FieldType', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -294,8 +291,8 @@ describe('FieldType', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes`; var values = {UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ @@ -348,11 +345,9 @@ describe('FieldType', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -402,11 +397,9 @@ describe('FieldType', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/fieldType/fieldValue.spec.js b/spec/integration/rest/autopilot/v1/assistant/fieldType/fieldValue.spec.js index e9989c8325..17de7692de 100644 --- a/spec/integration/rest/autopilot/v1/assistant/fieldType/fieldValue.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/fieldType/fieldValue.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -152,7 +149,7 @@ describe('FieldValue', function() { .fieldValues.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -302,11 +297,9 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues`; var values = {Language: 'language', Value: 'value', }; holodeck.assertHasRequest(new Request({ @@ -360,12 +353,10 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/modelBuild.spec.js b/spec/integration/rest/autopilot/v1/assistant/modelBuild.spec.js index 44cdc25afe..447cfb0d28 100644 --- a/spec/integration/rest/autopilot/v1/assistant/modelBuild.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/modelBuild.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/ModelBuilds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -147,7 +144,7 @@ describe('ModelBuild', function() { .modelBuilds.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/ModelBuilds', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/ModelBuilds', params: {PageSize: 20}, })); } @@ -197,8 +194,8 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/ModelBuilds')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/ModelBuilds`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -288,8 +285,8 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/ModelBuilds')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/ModelBuilds`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -338,11 +335,9 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/ModelBuilds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -391,11 +386,9 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/ModelBuilds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/query.spec.js b/spec/integration/rest/autopilot/v1/assistant/query.spec.js index 504b16af20..c85dffd5fa 100644 --- a/spec/integration/rest/autopilot/v1/assistant/query.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/query.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Query', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Queries/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Queries/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -195,7 +192,7 @@ describe('Query', function() { .queries.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Queries', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Queries', params: {PageSize: 20}, })); } @@ -261,8 +258,8 @@ describe('Query', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Queries')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Queries`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -369,8 +366,8 @@ describe('Query', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Queries')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Queries`; var values = {Language: 'language', Query: 'query', }; holodeck.assertHasRequest(new Request({ @@ -438,11 +435,9 @@ describe('Query', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Queries/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Queries/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -507,11 +502,9 @@ describe('Query', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Queries/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Queries/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/styleSheet.spec.js b/spec/integration/rest/autopilot/v1/assistant/styleSheet.spec.js index 7ee6a7edb3..8cc1e63e17 100644 --- a/spec/integration/rest/autopilot/v1/assistant/styleSheet.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/styleSheet.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('StyleSheet', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/StyleSheet')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/StyleSheet`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -87,8 +86,8 @@ describe('StyleSheet', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/StyleSheet')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/StyleSheet`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/autopilot/v1/assistant/task.spec.js b/spec/integration/rest/autopilot/v1/assistant/task.spec.js index 32388ba318..a318503376 100644 --- a/spec/integration/rest/autopilot/v1/assistant/task.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/task.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -162,7 +159,7 @@ describe('Task', function() { .tasks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks', params: {PageSize: 20}, })); } @@ -217,8 +214,8 @@ describe('Task', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +311,8 @@ describe('Task', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks`; var values = {UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ @@ -372,11 +369,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -430,11 +425,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/task/field.spec.js b/spec/integration/rest/autopilot/v1/assistant/task/field.spec.js index 8513a99697..15e809348d 100644 --- a/spec/integration/rest/autopilot/v1/assistant/task/field.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/task/field.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Fields/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -149,7 +146,7 @@ describe('Field', function() { .fields.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Fields', params: {PageSize: 20}, })); } @@ -200,11 +197,9 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Fields`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -297,11 +292,9 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Fields`; var values = {FieldType: 'field_type', UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ @@ -354,12 +347,10 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Fields/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/task/sample.spec.js b/spec/integration/rest/autopilot/v1/assistant/task/sample.spec.js index f8a1c96057..8432a6e74e 100644 --- a/spec/integration/rest/autopilot/v1/assistant/task/sample.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/task/sample.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -152,7 +149,7 @@ describe('Sample', function() { .samples.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples', + url: 'https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Samples', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Samples`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -302,11 +297,9 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Samples`; var values = {Language: 'language', TaggedText: 'tagged_text', }; holodeck.assertHasRequest(new Request({ @@ -360,12 +353,10 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -416,12 +407,10 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/autopilot/v1/assistant/task/taskActions.spec.js b/spec/integration/rest/autopilot/v1/assistant/task/taskActions.spec.js index fe4f50eda5..f8299b8c55 100644 --- a/spec/integration/rest/autopilot/v1/assistant/task/taskActions.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/task/taskActions.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskActions', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Actions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Actions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,11 +91,9 @@ describe('TaskActions', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Actions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Actions`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/autopilot/v1/assistant/task/taskStatistics.spec.js b/spec/integration/rest/autopilot/v1/assistant/task/taskStatistics.spec.js index c4a10101de..4adefb095d 100644 --- a/spec/integration/rest/autopilot/v1/assistant/task/taskStatistics.spec.js +++ b/spec/integration/rest/autopilot/v1/assistant/task/taskStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskStatistics', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://autopilot.twilio.com/v1/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Statistics')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://autopilot.twilio.com/v1/Assistants/${assistantSid}/Tasks/${taskSid}/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/chat/v1/credential.spec.js b/spec/integration/rest/chat/v1/credential.spec.js index ca2b3f53d9..1f28af0c7a 100644 --- a/spec/integration/rest/chat/v1/credential.spec.js +++ b/spec/integration/rest/chat/v1/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -268,8 +267,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +313,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -360,8 +359,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v1/service.spec.js b/spec/integration/rest/chat/v1/service.spec.js index d0d27b6f27..e98b3eb663 100644 --- a/spec/integration/rest/chat/v1/service.spec.js +++ b/spec/integration/rest/chat/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -107,8 +106,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -465,8 +464,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v1/service/channel.spec.js b/spec/integration/rest/chat/v1/service/channel.spec.js index bf0874ad4c..49c5c1e693 100644 --- a/spec/integration/rest/chat/v1/service/channel.spec.js +++ b/spec/integration/rest/chat/v1/service/channel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -105,11 +102,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -147,8 +142,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -275,7 +270,7 @@ describe('Channel', function() { .channels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels', params: {PageSize: 20}, })); } @@ -334,8 +329,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -434,11 +429,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v1/service/channel/invite.spec.js b/spec/integration/rest/chat/v1/service/channel/invite.spec.js index dc2dcb2e2c..08f76a17ba 100644 --- a/spec/integration/rest/chat/v1/service/channel/invite.spec.js +++ b/spec/integration/rest/chat/v1/service/channel/invite.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -101,11 +98,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -211,7 +206,7 @@ describe('Invite', function() { .invites.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites', params: {PageSize: 20}, })); } @@ -263,11 +258,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v1/service/channel/member.spec.js b/spec/integration/rest/chat/v1/service/channel/member.spec.js index 48c9de8458..6ca6082fed 100644 --- a/spec/integration/rest/chat/v1/service/channel/member.spec.js +++ b/spec/integration/rest/chat/v1/service/channel/member.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -215,7 +210,7 @@ describe('Member', function() { .members.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members', params: {PageSize: 20}, })); } @@ -268,11 +263,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -366,12 +359,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -411,12 +402,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v1/service/channel/message.spec.js b/spec/integration/rest/chat/v1/service/channel/message.spec.js index 6e4db45634..bfdb7aa07d 100644 --- a/spec/integration/rest/chat/v1/service/channel/message.spec.js +++ b/spec/integration/rest/chat/v1/service/channel/message.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -104,11 +101,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages`; var values = {Body: 'body', }; holodeck.assertHasRequest(new Request({ @@ -256,7 +251,7 @@ describe('Message', function() { .messages.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages', params: {PageSize: 20}, })); } @@ -311,11 +306,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -411,12 +404,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -456,12 +447,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v1/service/role.spec.js b/spec/integration/rest/chat/v1/service/role.spec.js index 4c277ea73b..7c445c290e 100644 --- a/spec/integration/rest/chat/v1/service/role.spec.js +++ b/spec/integration/rest/chat/v1/service/role.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -145,8 +140,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles`; var values = { FriendlyName: 'friendly_name', @@ -265,7 +260,7 @@ describe('Role', function() { .roles.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Roles', params: {PageSize: 20}, })); } @@ -319,8 +314,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -415,11 +410,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles/${sid}`; var values = {Permission: serialize.map(['permission'], function(e) { return e; }), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/chat/v1/service/user.spec.js b/spec/integration/rest/chat/v1/service/user.spec.js index 584fde86e7..7ea4679a43 100644 --- a/spec/integration/rest/chat/v1/service/user.spec.js +++ b/spec/integration/rest/chat/v1/service/user.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -145,8 +140,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -267,7 +262,7 @@ describe('User', function() { .users.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Users', params: {PageSize: 20}, })); } @@ -323,8 +318,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -420,11 +415,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v1/service/user/userChannel.spec.js b/spec/integration/rest/chat/v1/service/user/userChannel.spec.js index 2676b732cf..93d8d162b4 100644 --- a/spec/integration/rest/chat/v1/service/user/userChannel.spec.js +++ b/spec/integration/rest/chat/v1/service/user/userChannel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -98,7 +97,7 @@ describe('UserChannel', function() { .userChannels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Users/${userSid}/Channels', params: {PageSize: 20}, })); } @@ -151,11 +150,9 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${userSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/chat/v2/credential.spec.js b/spec/integration/rest/chat/v2/credential.spec.js index 93466e80cc..5c3c8cf1f0 100644 --- a/spec/integration/rest/chat/v2/credential.spec.js +++ b/spec/integration/rest/chat/v2/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -268,8 +267,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +313,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -360,8 +359,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v2/service.spec.js b/spec/integration/rest/chat/v2/service.spec.js index c7fd80baaa..930cee1d2c 100644 --- a/spec/integration/rest/chat/v2/service.spec.js +++ b/spec/integration/rest/chat/v2/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -116,8 +115,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -519,8 +518,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v2/service/binding.spec.js b/spec/integration/rest/chat/v2/service/binding.spec.js index 6cd269469d..67e1f5ef8a 100644 --- a/spec/integration/rest/chat/v2/service/binding.spec.js +++ b/spec/integration/rest/chat/v2/service/binding.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -112,7 +111,7 @@ describe('Binding', function() { .bindings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Bindings', params: {PageSize: 20}, })); } @@ -171,8 +170,8 @@ describe('Binding', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Bindings`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -271,11 +270,9 @@ describe('Binding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -333,11 +330,9 @@ describe('Binding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v2/service/channel.spec.js b/spec/integration/rest/chat/v2/service/channel.spec.js index ba9ee55697..65bb06b5ea 100644 --- a/spec/integration/rest/chat/v2/service/channel.spec.js +++ b/spec/integration/rest/chat/v2/service/channel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -106,11 +103,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -148,8 +143,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -279,7 +274,7 @@ describe('Channel', function() { .channels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels', params: {PageSize: 20}, })); } @@ -339,8 +334,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -440,11 +435,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v2/service/channel/invite.spec.js b/spec/integration/rest/chat/v2/service/channel/invite.spec.js index 1b00228320..286805a852 100644 --- a/spec/integration/rest/chat/v2/service/channel/invite.spec.js +++ b/spec/integration/rest/chat/v2/service/channel/invite.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -101,11 +98,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -211,7 +206,7 @@ describe('Invite', function() { .invites.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites', params: {PageSize: 20}, })); } @@ -263,11 +258,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v2/service/channel/member.spec.js b/spec/integration/rest/chat/v2/service/channel/member.spec.js index 846b709d2e..fba8e4c442 100644 --- a/spec/integration/rest/chat/v2/service/channel/member.spec.js +++ b/spec/integration/rest/chat/v2/service/channel/member.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -219,7 +214,7 @@ describe('Member', function() { .members.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members', params: {PageSize: 20}, })); } @@ -273,11 +268,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -372,12 +365,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -417,12 +408,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v2/service/channel/message.spec.js b/spec/integration/rest/chat/v2/service/channel/message.spec.js index 6db472f88a..dae80de283 100644 --- a/spec/integration/rest/chat/v2/service/channel/message.spec.js +++ b/spec/integration/rest/chat/v2/service/channel/message.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -146,11 +143,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -392,7 +387,7 @@ describe('Message', function() { .messages.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages', params: {PageSize: 20}, })); } @@ -473,11 +468,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -599,12 +592,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -644,12 +635,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v2/service/channel/webhook.spec.js b/spec/integration/rest/chat/v2/service/channel/webhook.spec.js index e0ad3f7607..d7a177d43e 100644 --- a/spec/integration/rest/chat/v2/service/channel/webhook.spec.js +++ b/spec/integration/rest/chat/v2/service/channel/webhook.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -174,7 +173,7 @@ describe('Webhook', function() { .webhooks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks', params: {PageSize: 20}, })); } @@ -265,11 +264,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -401,12 +398,10 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -459,11 +454,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks`; var values = {Type: 'webhook', }; holodeck.assertHasRequest(new Request({ @@ -524,12 +517,10 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -587,12 +578,10 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v2/service/role.spec.js b/spec/integration/rest/chat/v2/service/role.spec.js index e8ceee99c1..c12056200e 100644 --- a/spec/integration/rest/chat/v2/service/role.spec.js +++ b/spec/integration/rest/chat/v2/service/role.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -145,8 +140,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles`; var values = { FriendlyName: 'friendly_name', @@ -265,7 +260,7 @@ describe('Role', function() { .roles.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Roles', params: {PageSize: 20}, })); } @@ -319,8 +314,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -415,11 +410,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles/${sid}`; var values = {Permission: serialize.map(['permission'], function(e) { return e; }), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/chat/v2/service/user.spec.js b/spec/integration/rest/chat/v2/service/user.spec.js index d4f68150b5..4978cdad80 100644 --- a/spec/integration/rest/chat/v2/service/user.spec.js +++ b/spec/integration/rest/chat/v2/service/user.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -146,8 +141,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -271,7 +266,7 @@ describe('User', function() { .users.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Users', params: {PageSize: 20}, })); } @@ -328,8 +323,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -426,11 +421,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/chat/v2/service/user/userBinding.spec.js b/spec/integration/rest/chat/v2/service/user/userBinding.spec.js index 217dd4e5f7..e886c5869f 100644 --- a/spec/integration/rest/chat/v2/service/user/userBinding.spec.js +++ b/spec/integration/rest/chat/v2/service/user/userBinding.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -110,7 +109,7 @@ describe('UserBinding', function() { .userBindings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings', params: {PageSize: 20}, })); } @@ -169,11 +168,9 @@ describe('UserBinding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -273,12 +270,10 @@ describe('UserBinding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -336,12 +331,10 @@ describe('UserBinding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/chat/v2/service/user/userChannel.spec.js b/spec/integration/rest/chat/v2/service/user/userChannel.spec.js index 6086ac8cf7..238833f61b 100644 --- a/spec/integration/rest/chat/v2/service/user/userChannel.spec.js +++ b/spec/integration/rest/chat/v2/service/user/userChannel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -104,7 +103,7 @@ describe('UserChannel', function() { .userChannels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels', params: {PageSize: 20}, })); } @@ -160,11 +159,9 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -261,12 +258,10 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels/<%= channelSid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels/${channelSid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -322,12 +317,10 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels/<%= channelSid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels/${channelSid}`; var values = {NotificationLevel: 'default', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/fax/v1/fax.spec.js b/spec/integration/rest/fax/v1/fax.spec.js index cc6b376e61..d59fa091af 100644 --- a/spec/integration/rest/fax/v1/fax.spec.js +++ b/spec/integration/rest/fax/v1/fax.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Fax', function() { }); promise.done(); - var solution = {sid: 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://fax.twilio.com/v1/Faxes/<%= sid %>')(solution); + var sid = 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://fax.twilio.com/v1/Faxes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -386,8 +385,8 @@ describe('Fax', function() { }); promise.done(); - var solution = {sid: 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://fax.twilio.com/v1/Faxes/<%= sid %>')(solution); + var sid = 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://fax.twilio.com/v1/Faxes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -444,8 +443,8 @@ describe('Fax', function() { }); promise.done(); - var solution = {sid: 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://fax.twilio.com/v1/Faxes/<%= sid %>')(solution); + var sid = 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://fax.twilio.com/v1/Faxes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/fax/v1/fax/faxMedia.spec.js b/spec/integration/rest/fax/v1/fax/faxMedia.spec.js index dbc10b80ec..53096c0399 100644 --- a/spec/integration/rest/fax/v1/fax/faxMedia.spec.js +++ b/spec/integration/rest/fax/v1/fax/faxMedia.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('FaxMedia', function() { }); promise.done(); - var solution = { - faxSid: 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://fax.twilio.com/v1/Faxes/<%= faxSid %>/Media/<%= sid %>')(solution); + var faxSid = 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://fax.twilio.com/v1/Faxes/${faxSid}/Media/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -138,7 +135,7 @@ describe('FaxMedia', function() { .media.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://fax.twilio.com/v1/Faxes/<%= faxSid %>/Media', + url: 'https://fax.twilio.com/v1/Faxes/${faxSid}/Media', params: {PageSize: 20}, })); } @@ -185,8 +182,8 @@ describe('FaxMedia', function() { }); promise.done(); - var solution = {faxSid: 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://fax.twilio.com/v1/Faxes/<%= faxSid %>/Media')(solution); + var faxSid = 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://fax.twilio.com/v1/Faxes/${faxSid}/Media`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -245,11 +242,9 @@ describe('FaxMedia', function() { }); promise.done(); - var solution = { - faxSid: 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://fax.twilio.com/v1/Faxes/<%= faxSid %>/Media/<%= sid %>')(solution); + var faxSid = 'FXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://fax.twilio.com/v1/Faxes/${faxSid}/Media/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/flexApi/v1/configuration.spec.js b/spec/integration/rest/flexApi/v1/configuration.spec.js index 50baace2c2..d139597049 100644 --- a/spec/integration/rest/flexApi/v1/configuration.spec.js +++ b/spec/integration/rest/flexApi/v1/configuration.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/flexApi/v1/flexFlow.spec.js b/spec/integration/rest/flexApi/v1/flexFlow.spec.js index c1acefe26d..ea1c16c762 100644 --- a/spec/integration/rest/flexApi/v1/flexFlow.spec.js +++ b/spec/integration/rest/flexApi/v1/flexFlow.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -247,8 +246,8 @@ describe('FlexFlow', function() { }); promise.done(); - var solution = {sid: 'FOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://flex-api.twilio.com/v1/FlexFlows/<%= sid %>')(solution); + var sid = 'FOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://flex-api.twilio.com/v1/FlexFlows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -368,8 +367,8 @@ describe('FlexFlow', function() { }); promise.done(); - var solution = {sid: 'FOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://flex-api.twilio.com/v1/FlexFlows/<%= sid %>')(solution); + var sid = 'FOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://flex-api.twilio.com/v1/FlexFlows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -421,8 +420,8 @@ describe('FlexFlow', function() { }); promise.done(); - var solution = {sid: 'FOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://flex-api.twilio.com/v1/FlexFlows/<%= sid %>')(solution); + var sid = 'FOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://flex-api.twilio.com/v1/FlexFlows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/insights/v1/summary.spec.js b/spec/integration/rest/insights/v1/summary.spec.js index 690573f886..8155979fb7 100644 --- a/spec/integration/rest/insights/v1/summary.spec.js +++ b/spec/integration/rest/insights/v1/summary.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('CallSummary', function() { }); promise.done(); - var solution = {callSid: 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://insights.twilio.com/v1/Voice/<%= callSid %>/Summary')(solution); + var callSid = 'CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://insights.twilio.com/v1/Voice/${callSid}/Summary`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/ipMessaging/v1/credential.spec.js b/spec/integration/rest/ipMessaging/v1/credential.spec.js index ea26e24d1a..be1ef67f75 100644 --- a/spec/integration/rest/ipMessaging/v1/credential.spec.js +++ b/spec/integration/rest/ipMessaging/v1/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -268,8 +267,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +313,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -360,8 +359,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v1/service.spec.js b/spec/integration/rest/ipMessaging/v1/service.spec.js index ef79d62631..b6ca35b688 100644 --- a/spec/integration/rest/ipMessaging/v1/service.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -107,8 +106,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -465,8 +464,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v1/service/channel.spec.js b/spec/integration/rest/ipMessaging/v1/service/channel.spec.js index f799243d1a..123c08347f 100644 --- a/spec/integration/rest/ipMessaging/v1/service/channel.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/channel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -105,11 +102,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -147,8 +142,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -275,7 +270,7 @@ describe('Channel', function() { .channels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels', params: {PageSize: 20}, })); } @@ -334,8 +329,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -434,11 +429,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v1/service/channel/invite.spec.js b/spec/integration/rest/ipMessaging/v1/service/channel/invite.spec.js index 8d3ad034de..9bf0e741b8 100644 --- a/spec/integration/rest/ipMessaging/v1/service/channel/invite.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/channel/invite.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -101,11 +98,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -211,7 +206,7 @@ describe('Invite', function() { .invites.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites', params: {PageSize: 20}, })); } @@ -263,11 +258,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v1/service/channel/member.spec.js b/spec/integration/rest/ipMessaging/v1/service/channel/member.spec.js index 27571516b9..13d5c70b9c 100644 --- a/spec/integration/rest/ipMessaging/v1/service/channel/member.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/channel/member.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -215,7 +210,7 @@ describe('Member', function() { .members.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members', params: {PageSize: 20}, })); } @@ -268,11 +263,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -366,12 +359,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -411,12 +402,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v1/service/channel/message.spec.js b/spec/integration/rest/ipMessaging/v1/service/channel/message.spec.js index 46aa182ef6..b3980f5afa 100644 --- a/spec/integration/rest/ipMessaging/v1/service/channel/message.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/channel/message.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -104,11 +101,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages`; var values = {Body: 'body', }; holodeck.assertHasRequest(new Request({ @@ -256,7 +251,7 @@ describe('Message', function() { .messages.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages', params: {PageSize: 20}, })); } @@ -311,11 +306,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -411,12 +404,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -456,12 +447,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v1/service/role.spec.js b/spec/integration/rest/ipMessaging/v1/service/role.spec.js index 88da34c5ee..8c585e26cb 100644 --- a/spec/integration/rest/ipMessaging/v1/service/role.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/role.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -145,8 +140,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles`; var values = { FriendlyName: 'friendly_name', @@ -265,7 +260,7 @@ describe('Role', function() { .roles.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Roles', params: {PageSize: 20}, })); } @@ -319,8 +314,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -415,11 +410,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Roles/${sid}`; var values = {Permission: serialize.map(['permission'], function(e) { return e; }), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/ipMessaging/v1/service/user.spec.js b/spec/integration/rest/ipMessaging/v1/service/user.spec.js index 82177bddf7..11adb2f2b5 100644 --- a/spec/integration/rest/ipMessaging/v1/service/user.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/user.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -145,8 +140,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -267,7 +262,7 @@ describe('User', function() { .users.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Users', params: {PageSize: 20}, })); } @@ -323,8 +318,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -420,11 +415,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v1/service/user/userChannel.spec.js b/spec/integration/rest/ipMessaging/v1/service/user/userChannel.spec.js index 7a81f00317..f0946d1ea9 100644 --- a/spec/integration/rest/ipMessaging/v1/service/user/userChannel.spec.js +++ b/spec/integration/rest/ipMessaging/v1/service/user/userChannel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -98,7 +97,7 @@ describe('UserChannel', function() { .userChannels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels', + url: 'https://chat.twilio.com/v1/Services/${serviceSid}/Users/${userSid}/Channels', params: {PageSize: 20}, })); } @@ -151,11 +150,9 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v1/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v1/Services/${serviceSid}/Users/${userSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/ipMessaging/v2/credential.spec.js b/spec/integration/rest/ipMessaging/v2/credential.spec.js index cc2a0183ed..fcb7e5e5fa 100644 --- a/spec/integration/rest/ipMessaging/v2/credential.spec.js +++ b/spec/integration/rest/ipMessaging/v2/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -268,8 +267,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +313,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -360,8 +359,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v2/service.spec.js b/spec/integration/rest/ipMessaging/v2/service.spec.js index af986d9f76..33a10192d4 100644 --- a/spec/integration/rest/ipMessaging/v2/service.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -116,8 +115,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -519,8 +518,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v2/service/binding.spec.js b/spec/integration/rest/ipMessaging/v2/service/binding.spec.js index 60e6cb51b8..fe61d9892c 100644 --- a/spec/integration/rest/ipMessaging/v2/service/binding.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/binding.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -112,7 +111,7 @@ describe('Binding', function() { .bindings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Bindings', params: {PageSize: 20}, })); } @@ -171,8 +170,8 @@ describe('Binding', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Bindings`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -271,11 +270,9 @@ describe('Binding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -333,11 +330,9 @@ describe('Binding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v2/service/channel.spec.js b/spec/integration/rest/ipMessaging/v2/service/channel.spec.js index d0ef427e76..74300b87cc 100644 --- a/spec/integration/rest/ipMessaging/v2/service/channel.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/channel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -106,11 +103,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -148,8 +143,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -279,7 +274,7 @@ describe('Channel', function() { .channels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels', params: {PageSize: 20}, })); } @@ -339,8 +334,8 @@ describe('Channel', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -440,11 +435,9 @@ describe('Channel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v2/service/channel/invite.spec.js b/spec/integration/rest/ipMessaging/v2/service/channel/invite.spec.js index 7ac465e680..53dae5de28 100644 --- a/spec/integration/rest/ipMessaging/v2/service/channel/invite.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/channel/invite.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -101,11 +98,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -211,7 +206,7 @@ describe('Invite', function() { .invites.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites', params: {PageSize: 20}, })); } @@ -263,11 +258,9 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -360,12 +353,10 @@ describe('Invite', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Invites/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'INXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Invites/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v2/service/channel/member.spec.js b/spec/integration/rest/ipMessaging/v2/service/channel/member.spec.js index 943aadfe80..02fdf22514 100644 --- a/spec/integration/rest/ipMessaging/v2/service/channel/member.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/channel/member.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -219,7 +214,7 @@ describe('Member', function() { .members.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members', params: {PageSize: 20}, })); } @@ -273,11 +268,9 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -372,12 +365,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -417,12 +408,10 @@ describe('Member', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Members/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Members/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v2/service/channel/message.spec.js b/spec/integration/rest/ipMessaging/v2/service/channel/message.spec.js index 4439a749c2..8899c17395 100644 --- a/spec/integration/rest/ipMessaging/v2/service/channel/message.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/channel/message.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -146,11 +143,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -392,7 +387,7 @@ describe('Message', function() { .messages.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages', params: {PageSize: 20}, })); } @@ -473,11 +468,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -599,12 +592,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -644,12 +635,10 @@ describe('Message', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Messages/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v2/service/channel/webhook.spec.js b/spec/integration/rest/ipMessaging/v2/service/channel/webhook.spec.js index ded1e3923c..e3d6f111b9 100644 --- a/spec/integration/rest/ipMessaging/v2/service/channel/webhook.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/channel/webhook.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -174,7 +173,7 @@ describe('Webhook', function() { .webhooks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks', params: {PageSize: 20}, })); } @@ -265,11 +264,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -401,12 +398,10 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -459,11 +454,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks`; var values = {Type: 'webhook', }; holodeck.assertHasRequest(new Request({ @@ -524,12 +517,10 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -587,12 +578,10 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Channels/<%= channelSid %>/Webhooks/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Channels/${channelSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v2/service/role.spec.js b/spec/integration/rest/ipMessaging/v2/service/role.spec.js index dc362c4d0a..c8934f65c8 100644 --- a/spec/integration/rest/ipMessaging/v2/service/role.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/role.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,11 +99,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -145,8 +140,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles`; var values = { FriendlyName: 'friendly_name', @@ -265,7 +260,7 @@ describe('Role', function() { .roles.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Roles', params: {PageSize: 20}, })); } @@ -319,8 +314,8 @@ describe('Role', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -415,11 +410,9 @@ describe('Role', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Roles/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Roles/${sid}`; var values = {Permission: serialize.map(['permission'], function(e) { return e; }), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/ipMessaging/v2/service/user.spec.js b/spec/integration/rest/ipMessaging/v2/service/user.spec.js index aee97470ff..930b38a1d3 100644 --- a/spec/integration/rest/ipMessaging/v2/service/user.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/user.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -146,8 +141,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users`; var values = {Identity: 'identity', }; holodeck.assertHasRequest(new Request({ @@ -271,7 +266,7 @@ describe('User', function() { .users.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Users', params: {PageSize: 20}, })); } @@ -328,8 +323,8 @@ describe('User', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -426,11 +421,9 @@ describe('User', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/ipMessaging/v2/service/user/userBinding.spec.js b/spec/integration/rest/ipMessaging/v2/service/user/userBinding.spec.js index a7bcc9edce..d54f573ec9 100644 --- a/spec/integration/rest/ipMessaging/v2/service/user/userBinding.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/user/userBinding.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -110,7 +109,7 @@ describe('UserBinding', function() { .userBindings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings', params: {PageSize: 20}, })); } @@ -169,11 +168,9 @@ describe('UserBinding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -273,12 +270,10 @@ describe('UserBinding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -336,12 +331,10 @@ describe('UserBinding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/ipMessaging/v2/service/user/userChannel.spec.js b/spec/integration/rest/ipMessaging/v2/service/user/userChannel.spec.js index 498cd63a80..b9233584ae 100644 --- a/spec/integration/rest/ipMessaging/v2/service/user/userChannel.spec.js +++ b/spec/integration/rest/ipMessaging/v2/service/user/userChannel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -104,7 +103,7 @@ describe('UserChannel', function() { .userChannels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels', + url: 'https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels', params: {PageSize: 20}, })); } @@ -160,11 +159,9 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -261,12 +258,10 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels/<%= channelSid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels/${channelSid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -322,12 +317,10 @@ describe('UserChannel', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - userSid: 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - channelSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://chat.twilio.com/v2/Services/<%= serviceSid %>/Users/<%= userSid %>/Channels/<%= channelSid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var userSid = 'USXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var channelSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://chat.twilio.com/v2/Services/${serviceSid}/Users/${userSid}/Channels/${channelSid}`; var values = {NotificationLevel: 'default', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/lookups/v1/phoneNumber.spec.js b/spec/integration/rest/lookups/v1/phoneNumber.spec.js index 72407543d0..a22e4ef39b 100644 --- a/spec/integration/rest/lookups/v1/phoneNumber.spec.js +++ b/spec/integration/rest/lookups/v1/phoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {phoneNumber: '+15017122661'}; - var url = _.template('https://lookups.twilio.com/v1/PhoneNumbers/<%= phoneNumber %>')(solution); + var phoneNumber = '+15017122661'; + var url = `https://lookups.twilio.com/v1/PhoneNumbers/${phoneNumber}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/messaging/v1/service.spec.js b/spec/integration/rest/messaging/v1/service.spec.js index 697cc66d97..13edbf0a2a 100644 --- a/spec/integration/rest/messaging/v1/service.spec.js +++ b/spec/integration/rest/messaging/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -109,8 +108,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -395,8 +394,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -459,8 +458,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/messaging/v1/service/alphaSender.spec.js b/spec/integration/rest/messaging/v1/service/alphaSender.spec.js index c2df920dc2..1eb6335f47 100644 --- a/spec/integration/rest/messaging/v1/service/alphaSender.spec.js +++ b/spec/integration/rest/messaging/v1/service/alphaSender.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('AlphaSender', function() { }); promise.done(); - var solution = {serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/AlphaSenders')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/AlphaSenders`; var values = {AlphaSender: 'alpha_sender', }; holodeck.assertHasRequest(new Request({ @@ -142,7 +141,7 @@ describe('AlphaSender', function() { .alphaSenders.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://messaging.twilio.com/v1/Services/<%= serviceSid %>/AlphaSenders', + url: 'https://messaging.twilio.com/v1/Services/${serviceSid}/AlphaSenders', params: {PageSize: 20}, })); } @@ -190,8 +189,8 @@ describe('AlphaSender', function() { }); promise.done(); - var solution = {serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/AlphaSenders')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/AlphaSenders`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -251,11 +250,9 @@ describe('AlphaSender', function() { }); promise.done(); - var solution = { - serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'AIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/AlphaSenders/<%= sid %>')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'AIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/AlphaSenders/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -302,11 +299,9 @@ describe('AlphaSender', function() { }); promise.done(); - var solution = { - serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'AIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/AlphaSenders/<%= sid %>')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'AIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/AlphaSenders/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/messaging/v1/service/phoneNumber.spec.js b/spec/integration/rest/messaging/v1/service/phoneNumber.spec.js index f10b2de431..f8b287f823 100644 --- a/spec/integration/rest/messaging/v1/service/phoneNumber.spec.js +++ b/spec/integration/rest/messaging/v1/service/phoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/PhoneNumbers`; var values = {PhoneNumberSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -128,11 +127,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -219,7 +216,7 @@ describe('PhoneNumber', function() { .phoneNumbers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://messaging.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers', + url: 'https://messaging.twilio.com/v1/Services/${serviceSid}/PhoneNumbers', params: {PageSize: 20}, })); } @@ -268,8 +265,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/PhoneNumbers`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -330,11 +327,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/messaging/v1/service/shortCode.spec.js b/spec/integration/rest/messaging/v1/service/shortCode.spec.js index acb0748f48..f6e5963fbe 100644 --- a/spec/integration/rest/messaging/v1/service/shortCode.spec.js +++ b/spec/integration/rest/messaging/v1/service/shortCode.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('ShortCode', function() { }); promise.done(); - var solution = {serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/ShortCodes`; var values = {ShortCodeSid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -96,11 +95,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes/<%= sid %>')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/ShortCodes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -187,7 +184,7 @@ describe('ShortCode', function() { .shortCodes.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://messaging.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes', + url: 'https://messaging.twilio.com/v1/Services/${serviceSid}/ShortCodes', params: {PageSize: 20}, })); } @@ -236,8 +233,8 @@ describe('ShortCode', function() { }); promise.done(); - var solution = {serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/ShortCodes`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -298,11 +295,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - serviceSid: 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes/<%= sid %>')(solution); + var serviceSid = 'MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Services/${serviceSid}/ShortCodes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/messaging/v1/session.spec.js b/spec/integration/rest/messaging/v1/session.spec.js index e90f1d38f4..e04e7d92e9 100644 --- a/spec/integration/rest/messaging/v1/session.spec.js +++ b/spec/integration/rest/messaging/v1/session.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Session', function() { }); promise.done(); - var solution = {sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sid %>')(solution); + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -95,8 +94,8 @@ describe('Session', function() { }); promise.done(); - var solution = {sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sid %>')(solution); + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -188,8 +187,8 @@ describe('Session', function() { }); promise.done(); - var solution = {sid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sid %>')(solution); + var sid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/messaging/v1/session/message.spec.js b/spec/integration/rest/messaging/v1/session/message.spec.js index 5c87d2b943..11039e31da 100644 --- a/spec/integration/rest/messaging/v1/session/message.spec.js +++ b/spec/integration/rest/messaging/v1/session/message.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Messages/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -98,8 +95,8 @@ describe('Message', function() { }); promise.done(); - var solution = {sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Messages')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -150,11 +147,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Messages/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -288,7 +283,7 @@ describe('Message', function() { .messages.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Messages', + url: 'https://messaging.twilio.com/v1/Sessions/${sessionSid}/Messages', params: {PageSize: 20}, })); } @@ -354,8 +349,8 @@ describe('Message', function() { }); promise.done(); - var solution = {sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Messages')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Messages`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -433,11 +428,9 @@ describe('Message', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Messages/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'IMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Messages/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/messaging/v1/session/participant.spec.js b/spec/integration/rest/messaging/v1/session/participant.spec.js index 1f4e7ba867..37c24ea5a6 100644 --- a/spec/integration/rest/messaging/v1/session/participant.spec.js +++ b/spec/integration/rest/messaging/v1/session/participant.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Participant', function() { }); promise.done(); - var solution = {sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Participants')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Participants`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -127,11 +126,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Participants/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -183,11 +180,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Participants/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -296,7 +291,7 @@ describe('Participant', function() { .participants.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Participants', + url: 'https://messaging.twilio.com/v1/Sessions/${sessionSid}/Participants', params: {PageSize: 20}, })); } @@ -349,8 +344,8 @@ describe('Participant', function() { }); promise.done(); - var solution = {sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Participants')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Participants`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -415,11 +410,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Participants/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/messaging/v1/session/webhook.spec.js b/spec/integration/rest/messaging/v1/session/webhook.spec.js index 41fc23a201..f31f002f8e 100644 --- a/spec/integration/rest/messaging/v1/session/webhook.spec.js +++ b/spec/integration/rest/messaging/v1/session/webhook.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -176,7 +175,7 @@ describe('Webhook', function() { .webhooks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Webhooks', + url: 'https://messaging.twilio.com/v1/Sessions/${sessionSid}/Webhooks', params: {PageSize: 20}, })); } @@ -267,8 +266,8 @@ describe('Webhook', function() { }); promise.done(); - var solution = {sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Webhooks')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Webhooks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -399,11 +398,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Webhooks/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -454,8 +451,8 @@ describe('Webhook', function() { }); promise.done(); - var solution = {sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Webhooks')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Webhooks`; var values = {Target: 'webhook', }; holodeck.assertHasRequest(new Request({ @@ -515,11 +512,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Webhooks/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -576,11 +571,9 @@ describe('Webhook', function() { }); promise.done(); - var solution = { - sessionSid: 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://messaging.twilio.com/v1/Sessions/<%= sessionSid %>/Webhooks/<%= sid %>')(solution); + var sessionSid = 'CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://messaging.twilio.com/v1/Sessions/${sessionSid}/Webhooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/messaging/v1/webhook.spec.js b/spec/integration/rest/messaging/v1/webhook.spec.js index 326c7e9489..8dc3002450 100644 --- a/spec/integration/rest/messaging/v1/webhook.spec.js +++ b/spec/integration/rest/messaging/v1/webhook.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/monitor/v1/alert.spec.js b/spec/integration/rest/monitor/v1/alert.spec.js index dec33676de..27544681f0 100644 --- a/spec/integration/rest/monitor/v1/alert.spec.js +++ b/spec/integration/rest/monitor/v1/alert.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Alert', function() { }); promise.done(); - var solution = {sid: 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://monitor.twilio.com/v1/Alerts/<%= sid %>')(solution); + var sid = 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://monitor.twilio.com/v1/Alerts/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -97,8 +96,8 @@ describe('Alert', function() { }); promise.done(); - var solution = {sid: 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://monitor.twilio.com/v1/Alerts/<%= sid %>')(solution); + var sid = 'NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://monitor.twilio.com/v1/Alerts/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/monitor/v1/event.spec.js b/spec/integration/rest/monitor/v1/event.spec.js index bb610b8924..16f8683fe4 100644 --- a/spec/integration/rest/monitor/v1/event.spec.js +++ b/spec/integration/rest/monitor/v1/event.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Event', function() { }); promise.done(); - var solution = {sid: 'AEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://monitor.twilio.com/v1/Events/<%= sid %>')(solution); + var sid = 'AEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://monitor.twilio.com/v1/Events/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/notify/v1/credential.spec.js b/spec/integration/rest/notify/v1/credential.spec.js index 1112b2a9f6..eba449844c 100644 --- a/spec/integration/rest/notify/v1/credential.spec.js +++ b/spec/integration/rest/notify/v1/credential.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -268,8 +267,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +313,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -360,8 +359,8 @@ describe('Credential', function() { }); promise.done(); - var solution = {sid: 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Credentials/<%= sid %>')(solution); + var sid = 'CRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Credentials/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/notify/v1/service.spec.js b/spec/integration/rest/notify/v1/service.spec.js index cc425e3873..4a2aa239b3 100644 --- a/spec/integration/rest/notify/v1/service.spec.js +++ b/spec/integration/rest/notify/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -103,8 +102,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -140,8 +139,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -443,8 +442,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/notify/v1/service/binding.spec.js b/spec/integration/rest/notify/v1/service/binding.spec.js index 9f5be49a76..f32e1b30b1 100644 --- a/spec/integration/rest/notify/v1/service/binding.spec.js +++ b/spec/integration/rest/notify/v1/service/binding.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Binding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://notify.twilio.com/v1/Services/<%= serviceSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${serviceSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -104,11 +101,9 @@ describe('Binding', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://notify.twilio.com/v1/Services/<%= serviceSid %>/Bindings/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'BSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${serviceSid}/Bindings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -147,8 +142,8 @@ describe('Binding', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Services/<%= serviceSid %>/Bindings')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${serviceSid}/Bindings`; var values = {Identity: 'identity', BindingType: 'apn', Address: 'address', }; holodeck.assertHasRequest(new Request({ @@ -275,7 +270,7 @@ describe('Binding', function() { .bindings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://notify.twilio.com/v1/Services/<%= serviceSid %>/Bindings', + url: 'https://notify.twilio.com/v1/Services/${serviceSid}/Bindings', params: {PageSize: 20}, })); } @@ -333,8 +328,8 @@ describe('Binding', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Services/<%= serviceSid %>/Bindings')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${serviceSid}/Bindings`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/notify/v1/service/notification.spec.js b/spec/integration/rest/notify/v1/service/notification.spec.js index 806d2b76f1..d0ecd343b6 100644 --- a/spec/integration/rest/notify/v1/service/notification.spec.js +++ b/spec/integration/rest/notify/v1/service/notification.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Notification', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://notify.twilio.com/v1/Services/<%= serviceSid %>/Notifications')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://notify.twilio.com/v1/Services/${serviceSid}/Notifications`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/acc_security/service.spec.js b/spec/integration/rest/preview/acc_security/service.spec.js index 81ddd423ed..b3fe5113a1 100644 --- a/spec/integration/rest/preview/acc_security/service.spec.js +++ b/spec/integration/rest/preview/acc_security/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -94,8 +93,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Verification/Services/<%= sid %>')(solution); + var sid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Verification/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -305,8 +304,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Verification/Services/<%= sid %>')(solution); + var sid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Verification/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/acc_security/service/verification.spec.js b/spec/integration/rest/preview/acc_security/service/verification.spec.js index b4c983169c..3f21d2dd1a 100644 --- a/spec/integration/rest/preview/acc_security/service/verification.spec.js +++ b/spec/integration/rest/preview/acc_security/service/verification.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('Verification', function() { }); promise.done(); - var solution = {serviceSid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Verification/Services/<%= serviceSid %>/Verifications')(solution); + var serviceSid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Verification/Services/${serviceSid}/Verifications`; var values = {To: 'to', Channel: 'channel', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/preview/acc_security/service/verificationCheck.spec.js b/spec/integration/rest/preview/acc_security/service/verificationCheck.spec.js index 70fa40fb4c..13e6dde0c6 100644 --- a/spec/integration/rest/preview/acc_security/service/verificationCheck.spec.js +++ b/spec/integration/rest/preview/acc_security/service/verificationCheck.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('VerificationCheck', function() { }); promise.done(); - var solution = {serviceSid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Verification/Services/<%= serviceSid %>/VerificationCheck')(solution); + var serviceSid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Verification/Services/${serviceSid}/VerificationCheck`; var values = {Code: 'code', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/preview/bulk_exports/export.spec.js b/spec/integration/rest/preview/bulk_exports/export.spec.js index 07d38f10ac..333500db6d 100644 --- a/spec/integration/rest/preview/bulk_exports/export.spec.js +++ b/spec/integration/rest/preview/bulk_exports/export.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Export', function() { }); promise.done(); - var solution = {resourceType: 'resource_type'}; - var url = _.template('https://preview.twilio.com/BulkExports/Exports/<%= resourceType %>')(solution); + var resourceType = 'resource_type'; + var url = `https://preview.twilio.com/BulkExports/Exports/${resourceType}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/bulk_exports/export/day.spec.js b/spec/integration/rest/preview/bulk_exports/export/day.spec.js index 65cf5e7c08..f37720412e 100644 --- a/spec/integration/rest/preview/bulk_exports/export/day.spec.js +++ b/spec/integration/rest/preview/bulk_exports/export/day.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -80,7 +79,7 @@ describe('Day', function() { .days.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/BulkExports/Exports/<%= resourceType %>/Days', + url: 'https://preview.twilio.com/BulkExports/Exports/${resourceType}/Days', params: {PageSize: 20}, })); } @@ -123,8 +122,8 @@ describe('Day', function() { }); promise.done(); - var solution = {resourceType: 'resource_type'}; - var url = _.template('https://preview.twilio.com/BulkExports/Exports/<%= resourceType %>/Days')(solution); + var resourceType = 'resource_type'; + var url = `https://preview.twilio.com/BulkExports/Exports/${resourceType}/Days`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/bulk_exports/exportConfiguration.spec.js b/spec/integration/rest/preview/bulk_exports/exportConfiguration.spec.js index 4c0ea2b25f..17deb48849 100644 --- a/spec/integration/rest/preview/bulk_exports/exportConfiguration.spec.js +++ b/spec/integration/rest/preview/bulk_exports/exportConfiguration.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('ExportConfiguration', function() { }); promise.done(); - var solution = {resourceType: 'resource_type'}; - var url = _.template('https://preview.twilio.com/BulkExports/Exports/<%= resourceType %>/Configuration')(solution); + var resourceType = 'resource_type'; + var url = `https://preview.twilio.com/BulkExports/Exports/${resourceType}/Configuration`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -85,8 +84,8 @@ describe('ExportConfiguration', function() { }); promise.done(); - var solution = {resourceType: 'resource_type'}; - var url = _.template('https://preview.twilio.com/BulkExports/Exports/<%= resourceType %>/Configuration')(solution); + var resourceType = 'resource_type'; + var url = `https://preview.twilio.com/BulkExports/Exports/${resourceType}/Configuration`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/deployed_devices/fleet.spec.js b/spec/integration/rest/preview/deployed_devices/fleet.spec.js index fe9fff6a3a..7a2b849052 100644 --- a/spec/integration/rest/preview/deployed_devices/fleet.spec.js +++ b/spec/integration/rest/preview/deployed_devices/fleet.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Fleet', function() { }); promise.done(); - var solution = {sid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= sid %>')(solution); + var sid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,8 +93,8 @@ describe('Fleet', function() { }); promise.done(); - var solution = {sid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= sid %>')(solution); + var sid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -383,8 +382,8 @@ describe('Fleet', function() { }); promise.done(); - var solution = {sid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= sid %>')(solution); + var sid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/deployed_devices/fleet/certificate.spec.js b/spec/integration/rest/preview/deployed_devices/fleet/certificate.spec.js index 9e66f1e7f7..7fccfd1d3b 100644 --- a/spec/integration/rest/preview/deployed_devices/fleet/certificate.spec.js +++ b/spec/integration/rest/preview/deployed_devices/fleet/certificate.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Certificate', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Certificates/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Certificates/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -95,11 +92,9 @@ describe('Certificate', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Certificates/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Certificates/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -138,8 +133,8 @@ describe('Certificate', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Certificates')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Certificates`; var values = {CertificateData: 'certificate_data', }; holodeck.assertHasRequest(new Request({ @@ -239,7 +234,7 @@ describe('Certificate', function() { .certificates.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Certificates', + url: 'https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Certificates', params: {PageSize: 20}, })); } @@ -288,8 +283,8 @@ describe('Certificate', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Certificates')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Certificates`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -378,11 +373,9 @@ describe('Certificate', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Certificates/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Certificates/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/deployed_devices/fleet/deployment.spec.js b/spec/integration/rest/preview/deployed_devices/fleet/deployment.spec.js index 38ed0bbd15..78a5a3f023 100644 --- a/spec/integration/rest/preview/deployed_devices/fleet/deployment.spec.js +++ b/spec/integration/rest/preview/deployed_devices/fleet/deployment.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Deployment', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'DLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Deployments/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'DLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Deployments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,11 +91,9 @@ describe('Deployment', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'DLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Deployments/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'DLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Deployments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -136,8 +131,8 @@ describe('Deployment', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Deployments')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Deployments`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -231,7 +226,7 @@ describe('Deployment', function() { .deployments.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Deployments', + url: 'https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Deployments', params: {PageSize: 20}, })); } @@ -279,8 +274,8 @@ describe('Deployment', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Deployments')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Deployments`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -368,11 +363,9 @@ describe('Deployment', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'DLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Deployments/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'DLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Deployments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/deployed_devices/fleet/device.spec.js b/spec/integration/rest/preview/deployed_devices/fleet/device.spec.js index 29cb5923d7..d2d5b86f9e 100644 --- a/spec/integration/rest/preview/deployed_devices/fleet/device.spec.js +++ b/spec/integration/rest/preview/deployed_devices/fleet/device.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Device', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'THXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Devices/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'THXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Devices/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -98,11 +95,9 @@ describe('Device', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'THXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Devices/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'THXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Devices/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -140,8 +135,8 @@ describe('Device', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Devices')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Devices`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -247,7 +242,7 @@ describe('Device', function() { .devices.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Devices', + url: 'https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Devices', params: {PageSize: 20}, })); } @@ -299,8 +294,8 @@ describe('Device', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Devices')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Devices`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -392,11 +387,9 @@ describe('Device', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'THXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Devices/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'THXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Devices/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/deployed_devices/fleet/key.spec.js b/spec/integration/rest/preview/deployed_devices/fleet/key.spec.js index 75d1d2af32..389149493d 100644 --- a/spec/integration/rest/preview/deployed_devices/fleet/key.spec.js +++ b/spec/integration/rest/preview/deployed_devices/fleet/key.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Key', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Keys/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Keys/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -95,11 +92,9 @@ describe('Key', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Keys/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Keys/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -137,8 +132,8 @@ describe('Key', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Keys')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Keys`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -235,7 +230,7 @@ describe('Key', function() { .keys.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Keys', + url: 'https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Keys', params: {PageSize: 20}, })); } @@ -284,8 +279,8 @@ describe('Key', function() { }); promise.done(); - var solution = {fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Keys')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Keys`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -374,11 +369,9 @@ describe('Key', function() { }); promise.done(); - var solution = { - fleetSid: 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/DeployedDevices/Fleets/<%= fleetSid %>/Keys/<%= sid %>')(solution); + var fleetSid = 'FLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/DeployedDevices/Fleets/${fleetSid}/Keys/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/hosted_numbers/authorizationDocument.spec.js b/spec/integration/rest/preview/hosted_numbers/authorizationDocument.spec.js index e878807f6e..97da358ec9 100644 --- a/spec/integration/rest/preview/hosted_numbers/authorizationDocument.spec.js +++ b/spec/integration/rest/preview/hosted_numbers/authorizationDocument.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('AuthorizationDocument', function() { }); promise.done(); - var solution = {sid: 'PXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/<%= sid %>')(solution); + var sid = 'PXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -96,8 +95,8 @@ describe('AuthorizationDocument', function() { }); promise.done(); - var solution = {sid: 'PXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/<%= sid %>')(solution); + var sid = 'PXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.spec.js b/spec/integration/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.spec.js index 2ac7fabbe3..b8ed9cb4f7 100644 --- a/spec/integration/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.spec.js +++ b/spec/integration/rest/preview/hosted_numbers/authorizationDocument/dependentHostedNumberOrder.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -136,7 +135,7 @@ describe('DependentHostedNumberOrder', function() { .dependentHostedNumberOrders.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/<%= signingDocumentSid %>/DependentHostedNumberOrders', + url: 'https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/${signingDocumentSid}/DependentHostedNumberOrders', params: {PageSize: 20}, })); } @@ -207,8 +206,8 @@ describe('DependentHostedNumberOrder', function() { }); promise.done(); - var solution = {signingDocumentSid: 'PXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/<%= signingDocumentSid %>/DependentHostedNumberOrders')(solution); + var signingDocumentSid = 'PXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/HostedNumbers/AuthorizationDocuments/${signingDocumentSid}/DependentHostedNumberOrders`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/hosted_numbers/hostedNumberOrder.spec.js b/spec/integration/rest/preview/hosted_numbers/hostedNumberOrder.spec.js index af8dcf50ae..3740c1c439 100644 --- a/spec/integration/rest/preview/hosted_numbers/hostedNumberOrder.spec.js +++ b/spec/integration/rest/preview/hosted_numbers/hostedNumberOrder.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('HostedNumberOrder', function() { }); promise.done(); - var solution = {sid: 'HRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/HostedNumbers/HostedNumberOrders/<%= sid %>')(solution); + var sid = 'HRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/HostedNumbers/HostedNumberOrders/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -114,8 +113,8 @@ describe('HostedNumberOrder', function() { }); promise.done(); - var solution = {sid: 'HRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/HostedNumbers/HostedNumberOrders/<%= sid %>')(solution); + var sid = 'HRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/HostedNumbers/HostedNumberOrders/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -151,8 +150,8 @@ describe('HostedNumberOrder', function() { }); promise.done(); - var solution = {sid: 'HRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/HostedNumbers/HostedNumberOrders/<%= sid %>')(solution); + var sid = 'HRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/HostedNumbers/HostedNumberOrders/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/marketplace/availableAddOn.spec.js b/spec/integration/rest/preview/marketplace/availableAddOn.spec.js index cefa1e99cd..8eb6ad48d9 100644 --- a/spec/integration/rest/preview/marketplace/availableAddOn.spec.js +++ b/spec/integration/rest/preview/marketplace/availableAddOn.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('AvailableAddOn', function() { }); promise.done(); - var solution = {sid: 'XBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/marketplace/AvailableAddOns/<%= sid %>')(solution); + var sid = 'XBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/AvailableAddOns/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/marketplace/availableAddOn/availableAddOnExtension.spec.js b/spec/integration/rest/preview/marketplace/availableAddOn/availableAddOnExtension.spec.js index 5ecd71ac48..7a950289dd 100644 --- a/spec/integration/rest/preview/marketplace/availableAddOn/availableAddOnExtension.spec.js +++ b/spec/integration/rest/preview/marketplace/availableAddOn/availableAddOnExtension.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('AvailableAddOnExtension', function() { }); promise.done(); - var solution = { - availableAddOnSid: 'XBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/marketplace/AvailableAddOns/<%= availableAddOnSid %>/Extensions/<%= sid %>')(solution); + var availableAddOnSid = 'XBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/AvailableAddOns/${availableAddOnSid}/Extensions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -135,7 +132,7 @@ describe('AvailableAddOnExtension', function() { .extensions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/marketplace/AvailableAddOns/<%= availableAddOnSid %>/Extensions', + url: 'https://preview.twilio.com/marketplace/AvailableAddOns/${availableAddOnSid}/Extensions', params: {PageSize: 20}, })); } @@ -181,8 +178,8 @@ describe('AvailableAddOnExtension', function() { }); promise.done(); - var solution = {availableAddOnSid: 'XBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/marketplace/AvailableAddOns/<%= availableAddOnSid %>/Extensions')(solution); + var availableAddOnSid = 'XBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/AvailableAddOns/${availableAddOnSid}/Extensions`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/marketplace/installedAddOn.spec.js b/spec/integration/rest/preview/marketplace/installedAddOn.spec.js index e94542d382..35b8217edd 100644 --- a/spec/integration/rest/preview/marketplace/installedAddOn.spec.js +++ b/spec/integration/rest/preview/marketplace/installedAddOn.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -103,8 +102,8 @@ describe('InstalledAddOn', function() { }); promise.done(); - var solution = {sid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/marketplace/InstalledAddOns/<%= sid %>')(solution); + var sid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/InstalledAddOns/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -140,8 +139,8 @@ describe('InstalledAddOn', function() { }); promise.done(); - var solution = {sid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/marketplace/InstalledAddOns/<%= sid %>')(solution); + var sid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/InstalledAddOns/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -193,8 +192,8 @@ describe('InstalledAddOn', function() { }); promise.done(); - var solution = {sid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/marketplace/InstalledAddOns/<%= sid %>')(solution); + var sid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/InstalledAddOns/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/marketplace/installedAddOn/installedAddOnExtension.spec.js b/spec/integration/rest/preview/marketplace/installedAddOn/installedAddOnExtension.spec.js index c2ef07dbb8..09fcd95ad8 100644 --- a/spec/integration/rest/preview/marketplace/installedAddOn/installedAddOnExtension.spec.js +++ b/spec/integration/rest/preview/marketplace/installedAddOn/installedAddOnExtension.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('InstalledAddOnExtension', function() { }); promise.done(); - var solution = { - installedAddOnSid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/marketplace/InstalledAddOns/<%= installedAddOnSid %>/Extensions/<%= sid %>')(solution); + var installedAddOnSid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/InstalledAddOns/${installedAddOnSid}/Extensions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -96,11 +93,9 @@ describe('InstalledAddOnExtension', function() { }); promise.done(); - var solution = { - installedAddOnSid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/marketplace/InstalledAddOns/<%= installedAddOnSid %>/Extensions/<%= sid %>')(solution); + var installedAddOnSid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'XFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/InstalledAddOns/${installedAddOnSid}/Extensions/${sid}`; var values = {Enabled: serialize.bool(true), }; holodeck.assertHasRequest(new Request({ @@ -194,7 +189,7 @@ describe('InstalledAddOnExtension', function() { .extensions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/marketplace/InstalledAddOns/<%= installedAddOnSid %>/Extensions', + url: 'https://preview.twilio.com/marketplace/InstalledAddOns/${installedAddOnSid}/Extensions', params: {PageSize: 20}, })); } @@ -241,8 +236,8 @@ describe('InstalledAddOnExtension', function() { }); promise.done(); - var solution = {installedAddOnSid: 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/marketplace/InstalledAddOns/<%= installedAddOnSid %>/Extensions')(solution); + var installedAddOnSid = 'XEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/marketplace/InstalledAddOns/${installedAddOnSid}/Extensions`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/sync/service.spec.js b/spec/integration/rest/preview/sync/service.spec.js index 5cbe1dafff..a7d40fd8c1 100644 --- a/spec/integration/rest/preview/sync/service.spec.js +++ b/spec/integration/rest/preview/sync/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,8 +93,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -383,8 +382,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/sync/service/document.spec.js b/spec/integration/rest/preview/sync/service/document.spec.js index dbc4368724..0a9f049bb4 100644 --- a/spec/integration/rest/preview/sync/service/document.spec.js +++ b/spec/integration/rest/preview/sync/service/document.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('Document', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -101,11 +98,9 @@ describe('Document', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -143,8 +138,8 @@ describe('Document', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -253,7 +248,7 @@ describe('Document', function() { .documents.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Documents', params: {PageSize: 20}, })); } @@ -306,8 +301,8 @@ describe('Document', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -401,11 +396,9 @@ describe('Document', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${sid}`; var values = {Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/preview/sync/service/document/documentPermission.spec.js b/spec/integration/rest/preview/sync/service/document/documentPermission.spec.js index c20f83ae84..a6aa57d5b7 100644 --- a/spec/integration/rest/preview/sync/service/document/documentPermission.spec.js +++ b/spec/integration/rest/preview/sync/service/document/documentPermission.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,12 +97,10 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -193,7 +188,7 @@ describe('DocumentPermission', function() { .documentPermissions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${documentSid}/Permissions', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${documentSid}/Permissions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -339,12 +332,10 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; var values = { Read: serialize.bool(true), diff --git a/spec/integration/rest/preview/sync/service/syncList.spec.js b/spec/integration/rest/preview/sync/service/syncList.spec.js index 41085983bb..dfcc366ac8 100644 --- a/spec/integration/rest/preview/sync/service/syncList.spec.js +++ b/spec/integration/rest/preview/sync/service/syncList.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('SyncList', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,11 +96,9 @@ describe('SyncList', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -141,8 +136,8 @@ describe('SyncList', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -251,7 +246,7 @@ describe('SyncList', function() { .syncLists.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Lists', params: {PageSize: 20}, })); } @@ -304,8 +299,8 @@ describe('SyncList', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/sync/service/syncList/syncListItem.spec.js b/spec/integration/rest/preview/sync/service/syncList/syncListItem.spec.js index 1cd4c6c035..cbe6d0d77c 100644 --- a/spec/integration/rest/preview/sync/service/syncList/syncListItem.spec.js +++ b/spec/integration/rest/preview/sync/service/syncList/syncListItem.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - index: 1 - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var index = 1; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,12 +99,10 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - index: 1 - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var index = 1; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -148,11 +143,9 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Items`; var values = {Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ @@ -258,7 +251,7 @@ describe('SyncListItem', function() { .syncListItems.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Items', params: {PageSize: 20}, })); } @@ -310,11 +303,9 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Items`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -408,12 +399,10 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - index: 1 - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var index = 1; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; var values = {Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/preview/sync/service/syncList/syncListPermission.spec.js b/spec/integration/rest/preview/sync/service/syncList/syncListPermission.spec.js index c54c8d899b..81acd11438 100644 --- a/spec/integration/rest/preview/sync/service/syncList/syncListPermission.spec.js +++ b/spec/integration/rest/preview/sync/service/syncList/syncListPermission.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,12 +97,10 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -193,7 +188,7 @@ describe('SyncListPermission', function() { .syncListPermissions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Permissions', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Permissions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -339,12 +332,10 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; var values = { Read: serialize.bool(true), diff --git a/spec/integration/rest/preview/sync/service/syncMap.spec.js b/spec/integration/rest/preview/sync/service/syncMap.spec.js index bf01fa8845..294f9389ca 100644 --- a/spec/integration/rest/preview/sync/service/syncMap.spec.js +++ b/spec/integration/rest/preview/sync/service/syncMap.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('SyncMap', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,11 +96,9 @@ describe('SyncMap', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -141,8 +136,8 @@ describe('SyncMap', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -251,7 +246,7 @@ describe('SyncMap', function() { .syncMaps.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Maps', params: {PageSize: 20}, })); } @@ -304,8 +299,8 @@ describe('SyncMap', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/sync/service/syncMap/syncMapItem.spec.js b/spec/integration/rest/preview/sync/service/syncMap/syncMapItem.spec.js index a779d91acc..b545f39283 100644 --- a/spec/integration/rest/preview/sync/service/syncMap/syncMapItem.spec.js +++ b/spec/integration/rest/preview/sync/service/syncMap/syncMapItem.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - key: 'key' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var key = 'key'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -102,12 +99,10 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - key: 'key' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var key = 'key'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -148,11 +143,9 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Items`; var values = {Key: 'key', Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ @@ -258,7 +251,7 @@ describe('SyncMapItem', function() { .syncMapItems.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Items', params: {PageSize: 20}, })); } @@ -310,11 +303,9 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Items`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -408,12 +399,10 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - key: 'key' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var key = 'key'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; var values = {Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/preview/sync/service/syncMap/syncMapPermission.spec.js b/spec/integration/rest/preview/sync/service/syncMap/syncMapPermission.spec.js index 946ea40fa9..f5e5f916cc 100644 --- a/spec/integration/rest/preview/sync/service/syncMap/syncMapPermission.spec.js +++ b/spec/integration/rest/preview/sync/service/syncMap/syncMapPermission.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,12 +97,10 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -193,7 +188,7 @@ describe('SyncMapPermission', function() { .syncMapPermissions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions', + url: 'https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Permissions', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Permissions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -339,12 +332,10 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://preview.twilio.com/Sync/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://preview.twilio.com/Sync/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; var values = { Read: serialize.bool(true), diff --git a/spec/integration/rest/preview/understand/assistant.spec.js b/spec/integration/rest/preview/understand/assistant.spec.js index fb9cbd846c..2dac9db3cb 100644 --- a/spec/integration/rest/preview/understand/assistant.spec.js +++ b/spec/integration/rest/preview/understand/assistant.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Assistant', function() { }); promise.done(); - var solution = {sid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= sid %>')(solution); + var sid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -388,8 +387,8 @@ describe('Assistant', function() { }); promise.done(); - var solution = {sid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= sid %>')(solution); + var sid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -447,8 +446,8 @@ describe('Assistant', function() { }); promise.done(); - var solution = {sid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= sid %>')(solution); + var sid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/assistantFallbackActions.spec.js b/spec/integration/rest/preview/understand/assistant/assistantFallbackActions.spec.js index 3f8f3980d4..a4a5d53ebe 100644 --- a/spec/integration/rest/preview/understand/assistant/assistantFallbackActions.spec.js +++ b/spec/integration/rest/preview/understand/assistant/assistantFallbackActions.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('AssistantFallbackActions', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FallbackActions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FallbackActions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -87,8 +86,8 @@ describe('AssistantFallbackActions', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FallbackActions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FallbackActions`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/understand/assistant/assistantInitiationActions.spec.js b/spec/integration/rest/preview/understand/assistant/assistantInitiationActions.spec.js index c8d74fbca9..dfdde2cb21 100644 --- a/spec/integration/rest/preview/understand/assistant/assistantInitiationActions.spec.js +++ b/spec/integration/rest/preview/understand/assistant/assistantInitiationActions.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('AssistantInitiationActions', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/InitiationActions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/InitiationActions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -87,8 +86,8 @@ describe('AssistantInitiationActions', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/InitiationActions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/InitiationActions`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/understand/assistant/dialogue.spec.js b/spec/integration/rest/preview/understand/assistant/dialogue.spec.js index 6240c3c7cf..a6d172f081 100644 --- a/spec/integration/rest/preview/understand/assistant/dialogue.spec.js +++ b/spec/integration/rest/preview/understand/assistant/dialogue.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Dialogue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Dialogues/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Dialogues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/understand/assistant/fieldType.spec.js b/spec/integration/rest/preview/understand/assistant/fieldType.spec.js index 13fe688928..153769eee7 100644 --- a/spec/integration/rest/preview/understand/assistant/fieldType.spec.js +++ b/spec/integration/rest/preview/understand/assistant/fieldType.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('FieldType', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -150,7 +147,7 @@ describe('FieldType', function() { .fieldTypes.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes', params: {PageSize: 20}, })); } @@ -201,8 +198,8 @@ describe('FieldType', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -294,8 +291,8 @@ describe('FieldType', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes`; var values = {UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ @@ -348,11 +345,9 @@ describe('FieldType', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -402,11 +397,9 @@ describe('FieldType', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/fieldType/fieldValue.spec.js b/spec/integration/rest/preview/understand/assistant/fieldType/fieldValue.spec.js index 817e6571d5..0448fb00a8 100644 --- a/spec/integration/rest/preview/understand/assistant/fieldType/fieldValue.spec.js +++ b/spec/integration/rest/preview/understand/assistant/fieldType/fieldValue.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -152,7 +149,7 @@ describe('FieldValue', function() { .fieldValues.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -302,11 +297,9 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues`; var values = {Language: 'language', Value: 'value', }; holodeck.assertHasRequest(new Request({ @@ -360,12 +353,10 @@ describe('FieldValue', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - fieldTypeSid: 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/FieldTypes/<%= fieldTypeSid %>/FieldValues/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var fieldTypeSid = 'UBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/FieldTypes/${fieldTypeSid}/FieldValues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/modelBuild.spec.js b/spec/integration/rest/preview/understand/assistant/modelBuild.spec.js index 3769cfc6a3..a593e84462 100644 --- a/spec/integration/rest/preview/understand/assistant/modelBuild.spec.js +++ b/spec/integration/rest/preview/understand/assistant/modelBuild.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/ModelBuilds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -147,7 +144,7 @@ describe('ModelBuild', function() { .modelBuilds.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/ModelBuilds', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/ModelBuilds', params: {PageSize: 20}, })); } @@ -197,8 +194,8 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/ModelBuilds')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/ModelBuilds`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -288,8 +285,8 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/ModelBuilds')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/ModelBuilds`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -338,11 +335,9 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/ModelBuilds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -391,11 +386,9 @@ describe('ModelBuild', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/ModelBuilds/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/ModelBuilds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/query.spec.js b/spec/integration/rest/preview/understand/assistant/query.spec.js index c382a58aad..9e4037147d 100644 --- a/spec/integration/rest/preview/understand/assistant/query.spec.js +++ b/spec/integration/rest/preview/understand/assistant/query.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Query', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Queries/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Queries/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -195,7 +192,7 @@ describe('Query', function() { .queries.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Queries', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/Queries', params: {PageSize: 20}, })); } @@ -261,8 +258,8 @@ describe('Query', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Queries')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Queries`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -369,8 +366,8 @@ describe('Query', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Queries')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Queries`; var values = {Language: 'language', Query: 'query', }; holodeck.assertHasRequest(new Request({ @@ -438,11 +435,9 @@ describe('Query', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Queries/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Queries/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -507,11 +502,9 @@ describe('Query', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Queries/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Queries/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/styleSheet.spec.js b/spec/integration/rest/preview/understand/assistant/styleSheet.spec.js index 3e3344ad8e..65bfb3bc75 100644 --- a/spec/integration/rest/preview/understand/assistant/styleSheet.spec.js +++ b/spec/integration/rest/preview/understand/assistant/styleSheet.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('StyleSheet', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/StyleSheet')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/StyleSheet`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -87,8 +86,8 @@ describe('StyleSheet', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/StyleSheet')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/StyleSheet`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/understand/assistant/task.spec.js b/spec/integration/rest/preview/understand/assistant/task.spec.js index 2e08b1c44b..f7df559703 100644 --- a/spec/integration/rest/preview/understand/assistant/task.spec.js +++ b/spec/integration/rest/preview/understand/assistant/task.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -162,7 +159,7 @@ describe('Task', function() { .tasks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks', params: {PageSize: 20}, })); } @@ -217,8 +214,8 @@ describe('Task', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -314,8 +311,8 @@ describe('Task', function() { }); promise.done(); - var solution = {assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks`; var values = {UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ @@ -372,11 +369,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -430,11 +425,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/task/field.spec.js b/spec/integration/rest/preview/understand/assistant/task/field.spec.js index a4f4ea18e6..085f8af0f9 100644 --- a/spec/integration/rest/preview/understand/assistant/task/field.spec.js +++ b/spec/integration/rest/preview/understand/assistant/task/field.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Fields/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -149,7 +146,7 @@ describe('Field', function() { .fields.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Fields', params: {PageSize: 20}, })); } @@ -200,11 +197,9 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Fields`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -297,11 +292,9 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Fields`; var values = {FieldType: 'field_type', UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ @@ -354,12 +347,10 @@ describe('Field', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Fields/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Fields/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/task/sample.spec.js b/spec/integration/rest/preview/understand/assistant/task/sample.spec.js index de949bfaf1..a22e07a2e8 100644 --- a/spec/integration/rest/preview/understand/assistant/task/sample.spec.js +++ b/spec/integration/rest/preview/understand/assistant/task/sample.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -152,7 +149,7 @@ describe('Sample', function() { .samples.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples', + url: 'https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Samples', params: {PageSize: 20}, })); } @@ -204,11 +201,9 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Samples`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -302,11 +297,9 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Samples`; var values = {Language: 'language', TaggedText: 'tagged_text', }; holodeck.assertHasRequest(new Request({ @@ -360,12 +353,10 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -416,12 +407,10 @@ describe('Sample', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Samples/<%= sid %>')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'UFXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Samples/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/understand/assistant/task/taskActions.spec.js b/spec/integration/rest/preview/understand/assistant/task/taskActions.spec.js index 6019d88a6f..206dabb605 100644 --- a/spec/integration/rest/preview/understand/assistant/task/taskActions.spec.js +++ b/spec/integration/rest/preview/understand/assistant/task/taskActions.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskActions', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Actions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Actions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,11 +91,9 @@ describe('TaskActions', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Actions')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Actions`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/understand/assistant/task/taskStatistics.spec.js b/spec/integration/rest/preview/understand/assistant/task/taskStatistics.spec.js index 413c438a1e..7c6a301391 100644 --- a/spec/integration/rest/preview/understand/assistant/task/taskStatistics.spec.js +++ b/spec/integration/rest/preview/understand/assistant/task/taskStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskStatistics', function() { }); promise.done(); - var solution = { - assistantSid: 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://preview.twilio.com/understand/Assistants/<%= assistantSid %>/Tasks/<%= taskSid %>/Statistics')(solution); + var assistantSid = 'UAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'UDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/understand/Assistants/${assistantSid}/Tasks/${taskSid}/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/wireless/command.spec.js b/spec/integration/rest/preview/wireless/command.spec.js index 2e3f17b664..0e50466e79 100644 --- a/spec/integration/rest/preview/wireless/command.spec.js +++ b/spec/integration/rest/preview/wireless/command.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Command', function() { }); promise.done(); - var solution = {sid: 'DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/Commands/<%= sid %>')(solution); + var sid = 'DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/Commands/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/preview/wireless/ratePlan.spec.js b/spec/integration/rest/preview/wireless/ratePlan.spec.js index 6e90149852..79f3da8b2e 100644 --- a/spec/integration/rest/preview/wireless/ratePlan.spec.js +++ b/spec/integration/rest/preview/wireless/ratePlan.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -259,8 +258,8 @@ describe('RatePlan', function() { }); promise.done(); - var solution = {sid: 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/RatePlans/<%= sid %>')(solution); + var sid = 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/RatePlans/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -370,8 +369,8 @@ describe('RatePlan', function() { }); promise.done(); - var solution = {sid: 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/RatePlans/<%= sid %>')(solution); + var sid = 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/RatePlans/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -426,8 +425,8 @@ describe('RatePlan', function() { }); promise.done(); - var solution = {sid: 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/RatePlans/<%= sid %>')(solution); + var sid = 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/RatePlans/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/wireless/sim.spec.js b/spec/integration/rest/preview/wireless/sim.spec.js index 0659502839..a269a276c8 100644 --- a/spec/integration/rest/preview/wireless/sim.spec.js +++ b/spec/integration/rest/preview/wireless/sim.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Sim', function() { }); promise.done(); - var solution = {sid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/Sims/<%= sid %>')(solution); + var sid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/Sims/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -350,8 +349,8 @@ describe('Sim', function() { }); promise.done(); - var solution = {sid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/Sims/<%= sid %>')(solution); + var sid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/Sims/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/preview/wireless/sim/usage.spec.js b/spec/integration/rest/preview/wireless/sim/usage.spec.js index 22c508f143..f9d4f24a28 100644 --- a/spec/integration/rest/preview/wireless/sim/usage.spec.js +++ b/spec/integration/rest/preview/wireless/sim/usage.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Usage', function() { }); promise.done(); - var solution = {simSid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://preview.twilio.com/wireless/Sims/<%= simSid %>/Usage')(solution); + var simSid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://preview.twilio.com/wireless/Sims/${simSid}/Usage`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/pricing/v1/messaging.spec.js b/spec/integration/rest/pricing/v1/messaging.spec.js index d91fcbcc20..dab11aeed1 100644 --- a/spec/integration/rest/pricing/v1/messaging.spec.js +++ b/spec/integration/rest/pricing/v1/messaging.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/pricing/v1/messaging/country.spec.js b/spec/integration/rest/pricing/v1/messaging/country.spec.js index 111187cb57..c7382974c6 100644 --- a/spec/integration/rest/pricing/v1/messaging/country.spec.js +++ b/spec/integration/rest/pricing/v1/messaging/country.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -206,8 +205,8 @@ describe('Country', function() { }); promise.done(); - var solution = {isoCountry: 'US'}; - var url = _.template('https://pricing.twilio.com/v1/Messaging/Countries/<%= isoCountry %>')(solution); + var isoCountry = 'US'; + var url = `https://pricing.twilio.com/v1/Messaging/Countries/${isoCountry}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/pricing/v1/phoneNumber.spec.js b/spec/integration/rest/pricing/v1/phoneNumber.spec.js index 7d7242e194..6e3008e824 100644 --- a/spec/integration/rest/pricing/v1/phoneNumber.spec.js +++ b/spec/integration/rest/pricing/v1/phoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/pricing/v1/phoneNumber/country.spec.js b/spec/integration/rest/pricing/v1/phoneNumber/country.spec.js index edade6f6b4..ef26ef2a35 100644 --- a/spec/integration/rest/pricing/v1/phoneNumber/country.spec.js +++ b/spec/integration/rest/pricing/v1/phoneNumber/country.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -206,8 +205,8 @@ describe('Country', function() { }); promise.done(); - var solution = {isoCountry: 'US'}; - var url = _.template('https://pricing.twilio.com/v1/PhoneNumbers/Countries/<%= isoCountry %>')(solution); + var isoCountry = 'US'; + var url = `https://pricing.twilio.com/v1/PhoneNumbers/Countries/${isoCountry}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/pricing/v1/voice.spec.js b/spec/integration/rest/pricing/v1/voice.spec.js index 8c43d400b5..c6fafb9838 100644 --- a/spec/integration/rest/pricing/v1/voice.spec.js +++ b/spec/integration/rest/pricing/v1/voice.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/pricing/v1/voice/country.spec.js b/spec/integration/rest/pricing/v1/voice/country.spec.js index 2a70d2df79..6496357e57 100644 --- a/spec/integration/rest/pricing/v1/voice/country.spec.js +++ b/spec/integration/rest/pricing/v1/voice/country.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -206,8 +205,8 @@ describe('Country', function() { }); promise.done(); - var solution = {isoCountry: 'US'}; - var url = _.template('https://pricing.twilio.com/v1/Voice/Countries/<%= isoCountry %>')(solution); + var isoCountry = 'US'; + var url = `https://pricing.twilio.com/v1/Voice/Countries/${isoCountry}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/pricing/v1/voice/number.spec.js b/spec/integration/rest/pricing/v1/voice/number.spec.js index 94dcd5e118..64216e5c4c 100644 --- a/spec/integration/rest/pricing/v1/voice/number.spec.js +++ b/spec/integration/rest/pricing/v1/voice/number.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Number', function() { }); promise.done(); - var solution = {number: '+15017122661'}; - var url = _.template('https://pricing.twilio.com/v1/Voice/Numbers/<%= number %>')(solution); + var number = '+15017122661'; + var url = `https://pricing.twilio.com/v1/Voice/Numbers/${number}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/pricing/v2/voice.spec.js b/spec/integration/rest/pricing/v2/voice.spec.js index 8c43d400b5..c6fafb9838 100644 --- a/spec/integration/rest/pricing/v2/voice.spec.js +++ b/spec/integration/rest/pricing/v2/voice.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/pricing/v2/voice/country.spec.js b/spec/integration/rest/pricing/v2/voice/country.spec.js index 68c7c43477..855939b2f7 100644 --- a/spec/integration/rest/pricing/v2/voice/country.spec.js +++ b/spec/integration/rest/pricing/v2/voice/country.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -206,8 +205,8 @@ describe('Country', function() { }); promise.done(); - var solution = {isoCountry: 'US'}; - var url = _.template('https://pricing.twilio.com/v2/Voice/Countries/<%= isoCountry %>')(solution); + var isoCountry = 'US'; + var url = `https://pricing.twilio.com/v2/Voice/Countries/${isoCountry}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/pricing/v2/voice/number.spec.js b/spec/integration/rest/pricing/v2/voice/number.spec.js index 41f2d656d6..657a35120a 100644 --- a/spec/integration/rest/pricing/v2/voice/number.spec.js +++ b/spec/integration/rest/pricing/v2/voice/number.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Number', function() { }); promise.done(); - var solution = {destinationNumber: '+15017122661'}; - var url = _.template('https://pricing.twilio.com/v2/Voice/Numbers/<%= destinationNumber %>')(solution); + var destinationNumber = '+15017122661'; + var url = `https://pricing.twilio.com/v2/Voice/Numbers/${destinationNumber}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/proxy/v1/service.spec.js b/spec/integration/rest/proxy/v1/service.spec.js index 4a3e7caf8c..92e1edc38e 100644 --- a/spec/integration/rest/proxy/v1/service.spec.js +++ b/spec/integration/rest/proxy/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -204,8 +203,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -241,8 +240,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/proxy/v1/service/phoneNumber.spec.js b/spec/integration/rest/proxy/v1/service/phoneNumber.spec.js index 29845d6be8..344067e080 100644 --- a/spec/integration/rest/proxy/v1/service/phoneNumber.spec.js +++ b/spec/integration/rest/proxy/v1/service/phoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/PhoneNumbers`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -98,11 +97,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -201,7 +198,7 @@ describe('PhoneNumber', function() { .phoneNumbers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://proxy.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers', + url: 'https://proxy.twilio.com/v1/Services/${serviceSid}/PhoneNumbers', params: {PageSize: 20}, })); } @@ -256,8 +253,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/PhoneNumbers`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -324,11 +321,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -382,11 +377,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/PhoneNumbers/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/proxy/v1/service/session.spec.js b/spec/integration/rest/proxy/v1/service/session.spec.js index a7b081d559..69c1a30be7 100644 --- a/spec/integration/rest/proxy/v1/service/session.spec.js +++ b/spec/integration/rest/proxy/v1/service/session.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Session', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -105,8 +102,8 @@ describe('Session', function() { }); promise.done(); - var solution = {serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -155,8 +152,8 @@ describe('Session', function() { }); promise.done(); - var solution = {serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -214,11 +211,9 @@ describe('Session', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -256,11 +251,9 @@ describe('Session', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/proxy/v1/service/session/interaction.spec.js b/spec/integration/rest/proxy/v1/service/session/interaction.spec.js index aa74a4bc4b..bb156c6e41 100644 --- a/spec/integration/rest/proxy/v1/service/session/interaction.spec.js +++ b/spec/integration/rest/proxy/v1/service/session/interaction.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Interaction', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Interactions/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Interactions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -109,11 +106,9 @@ describe('Interaction', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Interactions')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Interactions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -164,12 +159,10 @@ describe('Interaction', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Interactions/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Interactions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/proxy/v1/service/session/participant.spec.js b/spec/integration/rest/proxy/v1/service/session/participant.spec.js index c20d04651a..177173ff23 100644 --- a/spec/integration/rest/proxy/v1/service/session/participant.spec.js +++ b/spec/integration/rest/proxy/v1/service/session/participant.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('Participant', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -139,11 +136,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -195,11 +190,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants`; var values = {Identifier: 'identifier', }; holodeck.assertHasRequest(new Request({ @@ -293,12 +286,10 @@ describe('Participant', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/proxy/v1/service/session/participant/messageInteraction.spec.js b/spec/integration/rest/proxy/v1/service/session/participant/messageInteraction.spec.js index 3c798616c6..65947a2ee7 100644 --- a/spec/integration/rest/proxy/v1/service/session/participant/messageInteraction.spec.js +++ b/spec/integration/rest/proxy/v1/service/session/participant/messageInteraction.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,12 +44,10 @@ describe('MessageInteraction', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= participantSid %>/MessageInteractions')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${participantSid}/MessageInteractions`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -113,13 +110,11 @@ describe('MessageInteraction', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'KIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= participantSid %>/MessageInteractions/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'KIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${participantSid}/MessageInteractions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -182,12 +177,10 @@ describe('MessageInteraction', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sessionSid: 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/Sessions/<%= sessionSid %>/Participants/<%= participantSid %>/MessageInteractions')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sessionSid = 'KCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'KPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/Sessions/${sessionSid}/Participants/${participantSid}/MessageInteractions`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/proxy/v1/service/shortCode.spec.js b/spec/integration/rest/proxy/v1/service/shortCode.spec.js index 9451e0a997..23767d3054 100644 --- a/spec/integration/rest/proxy/v1/service/shortCode.spec.js +++ b/spec/integration/rest/proxy/v1/service/shortCode.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('ShortCode', function() { }); promise.done(); - var solution = {serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/ShortCodes`; var values = {Sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -100,11 +99,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/ShortCodes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -199,7 +196,7 @@ describe('ShortCode', function() { .shortCodes.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://proxy.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes', + url: 'https://proxy.twilio.com/v1/Services/${serviceSid}/ShortCodes', params: {PageSize: 20}, })); } @@ -252,8 +249,8 @@ describe('ShortCode', function() { }); promise.done(); - var solution = {serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/ShortCodes`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -318,11 +315,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/ShortCodes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -374,11 +369,9 @@ describe('ShortCode', function() { }); promise.done(); - var solution = { - serviceSid: 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://proxy.twilio.com/v1/Services/<%= serviceSid %>/ShortCodes/<%= sid %>')(solution); + var serviceSid = 'KSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://proxy.twilio.com/v1/Services/${serviceSid}/ShortCodes/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/serverless/v1/service.spec.js b/spec/integration/rest/serverless/v1/service.spec.js index 119f34d455..3aa0a2242a 100644 --- a/spec/integration/rest/serverless/v1/service.spec.js +++ b/spec/integration/rest/serverless/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -89,8 +88,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -196,8 +195,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/serverless/v1/service/asset.spec.js b/spec/integration/rest/serverless/v1/service/asset.spec.js index 65b061ea33..6f71685aab 100644 --- a/spec/integration/rest/serverless/v1/service/asset.spec.js +++ b/spec/integration/rest/serverless/v1/service/asset.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Asset', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +92,9 @@ describe('Asset', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -147,8 +144,8 @@ describe('Asset', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -201,11 +198,9 @@ describe('Asset', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets/${sid}`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/serverless/v1/service/asset/assetVersion.spec.js b/spec/integration/rest/serverless/v1/service/asset/assetVersion.spec.js index f3c31d3d73..90a7230adf 100644 --- a/spec/integration/rest/serverless/v1/service/asset/assetVersion.spec.js +++ b/spec/integration/rest/serverless/v1/service/asset/assetVersion.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('AssetVersion', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - assetSid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets/<%= assetSid %>/Versions')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var assetSid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets/${assetSid}/Versions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,12 +96,10 @@ describe('AssetVersion', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - assetSid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets/<%= assetSid %>/Versions/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var assetSid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets/${assetSid}/Versions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -155,11 +150,9 @@ describe('AssetVersion', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - assetSid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Assets/<%= assetSid %>/Versions')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var assetSid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Assets/${assetSid}/Versions`; var values = {Path: 'path', Visibility: 'public', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/serverless/v1/service/build.spec.js b/spec/integration/rest/serverless/v1/service/build.spec.js index 0cefdc84a4..4ad7ab9300 100644 --- a/spec/integration/rest/serverless/v1/service/build.spec.js +++ b/spec/integration/rest/serverless/v1/service/build.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Build', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Builds')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Builds`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +92,9 @@ describe('Build', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Builds/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Builds/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -171,8 +168,8 @@ describe('Build', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Builds')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Builds`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/serverless/v1/service/environment.spec.js b/spec/integration/rest/serverless/v1/service/environment.spec.js index ff916b35ea..cf899f08e8 100644 --- a/spec/integration/rest/serverless/v1/service/environment.spec.js +++ b/spec/integration/rest/serverless/v1/service/environment.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Environment', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +92,9 @@ describe('Environment', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -151,8 +148,8 @@ describe('Environment', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments`; var values = {UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/serverless/v1/service/environment/deployment.spec.js b/spec/integration/rest/serverless/v1/service/environment/deployment.spec.js index 6f8d91406c..89072232ee 100644 --- a/spec/integration/rest/serverless/v1/service/environment/deployment.spec.js +++ b/spec/integration/rest/serverless/v1/service/environment/deployment.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('Deployment', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Deployments')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Deployments`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,12 +96,10 @@ describe('Deployment', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Deployments/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Deployments/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -154,11 +149,9 @@ describe('Deployment', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Deployments')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Deployments`; var values = {BuildSid: 'ZBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/serverless/v1/service/environment/variable.spec.js b/spec/integration/rest/serverless/v1/service/environment/variable.spec.js index 6aab9ad843..38124fc542 100644 --- a/spec/integration/rest/serverless/v1/service/environment/variable.spec.js +++ b/spec/integration/rest/serverless/v1/service/environment/variable.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('Variable', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Variables')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Variables`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,12 +96,10 @@ describe('Variable', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Variables/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Variables/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -155,11 +150,9 @@ describe('Variable', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Variables')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Variables`; var values = {Key: 'key', Value: 'value', }; holodeck.assertHasRequest(new Request({ @@ -212,12 +205,10 @@ describe('Variable', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - environmentSid: 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Environments/<%= environmentSid %>/Variables/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var environmentSid = 'ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Environments/${environmentSid}/Variables/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/serverless/v1/service/function.spec.js b/spec/integration/rest/serverless/v1/service/function.spec.js index 9156132cfa..527733ce0c 100644 --- a/spec/integration/rest/serverless/v1/service/function.spec.js +++ b/spec/integration/rest/serverless/v1/service/function.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Function', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +92,9 @@ describe('Function', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -147,8 +144,8 @@ describe('Function', function() { }); promise.done(); - var solution = {serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -201,11 +198,9 @@ describe('Function', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions/${sid}`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/serverless/v1/service/function/functionVersion.spec.js b/spec/integration/rest/serverless/v1/service/function/functionVersion.spec.js index 0883513ec9..18f3b96e9f 100644 --- a/spec/integration/rest/serverless/v1/service/function/functionVersion.spec.js +++ b/spec/integration/rest/serverless/v1/service/function/functionVersion.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('FunctionVersion', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - functionSid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions/<%= functionSid %>/Versions')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var functionSid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions/${functionSid}/Versions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,12 +96,10 @@ describe('FunctionVersion', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - functionSid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ZNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions/<%= functionSid %>/Versions/<%= sid %>')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var functionSid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ZNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions/${functionSid}/Versions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -155,11 +150,9 @@ describe('FunctionVersion', function() { }); promise.done(); - var solution = { - serviceSid: 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - functionSid: 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://serverless.twilio.com/v1/Services/<%= serviceSid %>/Functions/<%= functionSid %>/Versions')(solution); + var serviceSid = 'ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var functionSid = 'ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://serverless.twilio.com/v1/Services/${serviceSid}/Functions/${functionSid}/Versions`; var values = {Path: 'path', Visibility: 'public', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/studio/v1/flow.spec.js b/spec/integration/rest/studio/v1/flow.spec.js index 3efd25e309..c421e91dad 100644 --- a/spec/integration/rest/studio/v1/flow.spec.js +++ b/spec/integration/rest/studio/v1/flow.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -89,8 +88,8 @@ describe('Flow', function() { }); promise.done(); - var solution = {sid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= sid %>')(solution); + var sid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -139,8 +138,8 @@ describe('Flow', function() { }); promise.done(); - var solution = {sid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= sid %>')(solution); + var sid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/studio/v1/flow/engagement.spec.js b/spec/integration/rest/studio/v1/flow/engagement.spec.js index 557b3ded59..e571f67773 100644 --- a/spec/integration/rest/studio/v1/flow/engagement.spec.js +++ b/spec/integration/rest/studio/v1/flow/engagement.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Engagement', function() { }); promise.done(); - var solution = {flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +92,9 @@ describe('Engagement', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements/<%= sid %>')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -151,8 +148,8 @@ describe('Engagement', function() { }); promise.done(); - var solution = {flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements`; var values = {To: '+15558675310', From: '+15017122661', }; holodeck.assertHasRequest(new Request({ @@ -208,11 +205,9 @@ describe('Engagement', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements/<%= sid %>')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/studio/v1/flow/engagement/engagementContext.spec.js b/spec/integration/rest/studio/v1/flow/engagement/engagementContext.spec.js index b6126890eb..360aa180a6 100644 --- a/spec/integration/rest/studio/v1/flow/engagement/engagementContext.spec.js +++ b/spec/integration/rest/studio/v1/flow/engagement/engagementContext.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('EngagementContext', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - engagementSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Context')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var engagementSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements/${engagementSid}/Context`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/studio/v1/flow/engagement/step.spec.js b/spec/integration/rest/studio/v1/flow/engagement/step.spec.js index 3e3803d162..a1555b4d59 100644 --- a/spec/integration/rest/studio/v1/flow/engagement/step.spec.js +++ b/spec/integration/rest/studio/v1/flow/engagement/step.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('Step', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - engagementSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Steps')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var engagementSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements/${engagementSid}/Steps`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,12 +96,10 @@ describe('Step', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - engagementSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Steps/<%= sid %>')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var engagementSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements/${engagementSid}/Steps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/studio/v1/flow/engagement/step/stepContext.spec.js b/spec/integration/rest/studio/v1/flow/engagement/step/stepContext.spec.js index 1863031566..8c525d4b03 100644 --- a/spec/integration/rest/studio/v1/flow/engagement/step/stepContext.spec.js +++ b/spec/integration/rest/studio/v1/flow/engagement/step/stepContext.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,12 +44,10 @@ describe('StepContext', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - engagementSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - stepSid: 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Engagements/<%= engagementSid %>/Steps/<%= stepSid %>/Context')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var engagementSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var stepSid = 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Engagements/${engagementSid}/Steps/${stepSid}/Context`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/studio/v1/flow/execution.spec.js b/spec/integration/rest/studio/v1/flow/execution.spec.js index dc859894a0..339ef0e6ab 100644 --- a/spec/integration/rest/studio/v1/flow/execution.spec.js +++ b/spec/integration/rest/studio/v1/flow/execution.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Execution', function() { }); promise.done(); - var solution = {flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +92,9 @@ describe('Execution', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions/<%= sid %>')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -151,8 +148,8 @@ describe('Execution', function() { }); promise.done(); - var solution = {flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions`; var values = {To: '+15558675310', From: '+15017122661', }; holodeck.assertHasRequest(new Request({ @@ -208,11 +205,9 @@ describe('Execution', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions/<%= sid %>')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/studio/v1/flow/execution/executionContext.spec.js b/spec/integration/rest/studio/v1/flow/execution/executionContext.spec.js index 6c40829615..fdbb9c6c17 100644 --- a/spec/integration/rest/studio/v1/flow/execution/executionContext.spec.js +++ b/spec/integration/rest/studio/v1/flow/execution/executionContext.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('ExecutionContext', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - executionSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Context')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var executionSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions/${executionSid}/Context`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/studio/v1/flow/execution/executionStep.spec.js b/spec/integration/rest/studio/v1/flow/execution/executionStep.spec.js index 7e519c6dee..767b508fde 100644 --- a/spec/integration/rest/studio/v1/flow/execution/executionStep.spec.js +++ b/spec/integration/rest/studio/v1/flow/execution/executionStep.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('ExecutionStep', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - executionSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Steps')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var executionSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions/${executionSid}/Steps`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,12 +96,10 @@ describe('ExecutionStep', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - executionSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Steps/<%= sid %>')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var executionSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions/${executionSid}/Steps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/studio/v1/flow/execution/executionStep/executionStepContext.spec.js b/spec/integration/rest/studio/v1/flow/execution/executionStep/executionStepContext.spec.js index 6995a44431..72d4349286 100644 --- a/spec/integration/rest/studio/v1/flow/execution/executionStep/executionStepContext.spec.js +++ b/spec/integration/rest/studio/v1/flow/execution/executionStep/executionStepContext.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,12 +44,10 @@ describe('ExecutionStepContext', function() { }); promise.done(); - var solution = { - flowSid: 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - executionSid: 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - stepSid: 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://studio.twilio.com/v1/Flows/<%= flowSid %>/Executions/<%= executionSid %>/Steps/<%= stepSid %>/Context')(solution); + var flowSid = 'FWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var executionSid = 'FNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var stepSid = 'FTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://studio.twilio.com/v1/Flows/${flowSid}/Executions/${executionSid}/Steps/${stepSid}/Context`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/sync/v1/service.spec.js b/spec/integration/rest/sync/v1/service.spec.js index 1176a089a9..2bbd050f19 100644 --- a/spec/integration/rest/sync/v1/service.spec.js +++ b/spec/integration/rest/sync/v1/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -96,8 +95,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -395,8 +394,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= sid %>')(solution); + var sid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/sync/v1/service/document.spec.js b/spec/integration/rest/sync/v1/service/document.spec.js index 1a070b04f7..a34f8ca090 100644 --- a/spec/integration/rest/sync/v1/service/document.spec.js +++ b/spec/integration/rest/sync/v1/service/document.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Document', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,11 +97,9 @@ describe('Document', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -142,8 +137,8 @@ describe('Document', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -255,7 +250,7 @@ describe('Document', function() { .documents.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Documents', params: {PageSize: 20}, })); } @@ -309,8 +304,8 @@ describe('Document', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -404,11 +399,9 @@ describe('Document', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/sync/v1/service/document/documentPermission.spec.js b/spec/integration/rest/sync/v1/service/document/documentPermission.spec.js index 14a749b01a..3a2cc1c7da 100644 --- a/spec/integration/rest/sync/v1/service/document/documentPermission.spec.js +++ b/spec/integration/rest/sync/v1/service/document/documentPermission.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,12 +97,10 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -193,7 +188,7 @@ describe('DocumentPermission', function() { .documentPermissions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${documentSid}/Permissions', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${documentSid}/Permissions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -339,12 +332,10 @@ describe('DocumentPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - documentSid: 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Documents/<%= documentSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var documentSid = 'ETXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Documents/${documentSid}/Permissions/${identity}`; var values = { Read: serialize.bool(true), diff --git a/spec/integration/rest/sync/v1/service/syncList.spec.js b/spec/integration/rest/sync/v1/service/syncList.spec.js index cbcac2f2cb..5bdcffdea0 100644 --- a/spec/integration/rest/sync/v1/service/syncList.spec.js +++ b/spec/integration/rest/sync/v1/service/syncList.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('SyncList', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,11 +97,9 @@ describe('SyncList', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -142,8 +137,8 @@ describe('SyncList', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -196,11 +191,9 @@ describe('SyncList', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -312,7 +305,7 @@ describe('SyncList', function() { .syncLists.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Lists', params: {PageSize: 20}, })); } @@ -366,8 +359,8 @@ describe('SyncList', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/sync/v1/service/syncList/syncListItem.spec.js b/spec/integration/rest/sync/v1/service/syncList/syncListItem.spec.js index bb79b6193f..5a48188dbc 100644 --- a/spec/integration/rest/sync/v1/service/syncList/syncListItem.spec.js +++ b/spec/integration/rest/sync/v1/service/syncList/syncListItem.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - index: 1 - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var index = 1; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,12 +100,10 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - index: 1 - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var index = 1; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -149,11 +144,9 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Items`; var values = {Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ @@ -262,7 +255,7 @@ describe('SyncListItem', function() { .syncListItems.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Items', params: {PageSize: 20}, })); } @@ -315,11 +308,9 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Items`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -413,12 +404,10 @@ describe('SyncListItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - index: 1 - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Items/<%= index %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var index = 1; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Items/${index}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/sync/v1/service/syncList/syncListPermission.spec.js b/spec/integration/rest/sync/v1/service/syncList/syncListPermission.spec.js index aa12e96b25..7bee2bc946 100644 --- a/spec/integration/rest/sync/v1/service/syncList/syncListPermission.spec.js +++ b/spec/integration/rest/sync/v1/service/syncList/syncListPermission.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,12 +97,10 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -193,7 +188,7 @@ describe('SyncListPermission', function() { .syncListPermissions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Permissions', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Permissions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -339,12 +332,10 @@ describe('SyncListPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - listSid: 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Lists/<%= listSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var listSid = 'ESXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Lists/${listSid}/Permissions/${identity}`; var values = { Read: serialize.bool(true), diff --git a/spec/integration/rest/sync/v1/service/syncMap.spec.js b/spec/integration/rest/sync/v1/service/syncMap.spec.js index 75123d01c8..5031e842bb 100644 --- a/spec/integration/rest/sync/v1/service/syncMap.spec.js +++ b/spec/integration/rest/sync/v1/service/syncMap.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('SyncMap', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,11 +97,9 @@ describe('SyncMap', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -142,8 +137,8 @@ describe('SyncMap', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -196,11 +191,9 @@ describe('SyncMap', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -312,7 +305,7 @@ describe('SyncMap', function() { .syncMaps.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Maps', params: {PageSize: 20}, })); } @@ -366,8 +359,8 @@ describe('SyncMap', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/sync/v1/service/syncMap/syncMapItem.spec.js b/spec/integration/rest/sync/v1/service/syncMap/syncMapItem.spec.js index cdc4335a4c..b8d55d4a8c 100644 --- a/spec/integration/rest/sync/v1/service/syncMap/syncMapItem.spec.js +++ b/spec/integration/rest/sync/v1/service/syncMap/syncMapItem.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - key: 'key' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var key = 'key'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,12 +100,10 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - key: 'key' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var key = 'key'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -149,11 +144,9 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Items`; var values = {Key: 'key', Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ @@ -262,7 +255,7 @@ describe('SyncMapItem', function() { .syncMapItems.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Items', params: {PageSize: 20}, })); } @@ -315,11 +308,9 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Items`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -413,12 +404,10 @@ describe('SyncMapItem', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - key: 'key' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Items/<%= key %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var key = 'key'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Items/${key}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/sync/v1/service/syncMap/syncMapPermission.spec.js b/spec/integration/rest/sync/v1/service/syncMap/syncMapPermission.spec.js index 8bb05b5da5..13925267c2 100644 --- a/spec/integration/rest/sync/v1/service/syncMap/syncMapPermission.spec.js +++ b/spec/integration/rest/sync/v1/service/syncMap/syncMapPermission.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -46,12 +45,10 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -100,12 +97,10 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -193,7 +188,7 @@ describe('SyncMapPermission', function() { .syncMapPermissions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Permissions', params: {PageSize: 20}, })); } @@ -243,11 +238,9 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Permissions`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -339,12 +332,10 @@ describe('SyncMapPermission', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - mapSid: 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - identity: 'identity' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Maps/<%= mapSid %>/Permissions/<%= identity %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var mapSid = 'MPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var identity = 'identity'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Maps/${mapSid}/Permissions/${identity}`; var values = { Read: serialize.bool(true), diff --git a/spec/integration/rest/sync/v1/service/syncStream.spec.js b/spec/integration/rest/sync/v1/service/syncStream.spec.js index 57801b8635..ad7ddc7757 100644 --- a/spec/integration/rest/sync/v1/service/syncStream.spec.js +++ b/spec/integration/rest/sync/v1/service/syncStream.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('SyncStream', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Streams/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -98,11 +95,9 @@ describe('SyncStream', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Streams/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -140,8 +135,8 @@ describe('SyncStream', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Streams`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -192,11 +187,9 @@ describe('SyncStream', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams/<%= sid %>')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Streams/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -302,7 +295,7 @@ describe('SyncStream', function() { .syncStreams.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams', + url: 'https://sync.twilio.com/v1/Services/${serviceSid}/Streams', params: {PageSize: 20}, })); } @@ -354,8 +347,8 @@ describe('SyncStream', function() { }); promise.done(); - var solution = {serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Streams`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/sync/v1/service/syncStream/streamMessage.spec.js b/spec/integration/rest/sync/v1/service/syncStream/streamMessage.spec.js index b9695490d3..58bd86587a 100644 --- a/spec/integration/rest/sync/v1/service/syncStream/streamMessage.spec.js +++ b/spec/integration/rest/sync/v1/service/syncStream/streamMessage.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -47,11 +46,9 @@ describe('StreamMessage', function() { }); promise.done(); - var solution = { - serviceSid: 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - streamSid: 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://sync.twilio.com/v1/Services/<%= serviceSid %>/Streams/<%= streamSid %>/Messages')(solution); + var serviceSid = 'ISXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var streamSid = 'TOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://sync.twilio.com/v1/Services/${serviceSid}/Streams/${streamSid}/Messages`; var values = {Data: serialize.object({}), }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/taskrouter/v1/workspace.spec.js b/spec/integration/rest/taskrouter/v1/workspace.spec.js index 7036fcfd7f..c181a7b9f9 100644 --- a/spec/integration/rest/taskrouter/v1/workspace.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Workspace', function() { }); promise.done(); - var solution = {sid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= sid %>')(solution); + var sid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -106,8 +105,8 @@ describe('Workspace', function() { }); promise.done(); - var solution = {sid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= sid %>')(solution); + var sid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -486,8 +485,8 @@ describe('Workspace', function() { }); promise.done(); - var solution = {sid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= sid %>')(solution); + var sid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/taskrouter/v1/workspace/activity.spec.js b/spec/integration/rest/taskrouter/v1/workspace/activity.spec.js index e40be8a525..44f5cc16b1 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/activity.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/activity.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Activity', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Activities/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Activities/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,11 +91,9 @@ describe('Activity', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Activities/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Activities/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -145,11 +140,9 @@ describe('Activity', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Activities/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Activities/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -236,7 +229,7 @@ describe('Activity', function() { .activities.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Activities', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Activities', params: {PageSize: 20}, })); } @@ -285,8 +278,8 @@ describe('Activity', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Activities')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Activities`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -377,8 +370,8 @@ describe('Activity', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Activities')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Activities`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/taskrouter/v1/workspace/event.spec.js b/spec/integration/rest/taskrouter/v1/workspace/event.spec.js index 4d4ed66894..2ccd78bd6c 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/event.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/event.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Event', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'EVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Events/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'EVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Events/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -198,7 +195,7 @@ describe('Event', function() { .events.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Events', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Events', params: {PageSize: 20}, })); } @@ -265,8 +262,8 @@ describe('Event', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Events')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Events`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/task.spec.js b/spec/integration/rest/taskrouter/v1/workspace/task.spec.js index e3a639d707..b6c3d50f3e 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/task.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/task.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -111,11 +108,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -179,11 +174,9 @@ describe('Task', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -302,7 +295,7 @@ describe('Task', function() { .tasks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks', params: {PageSize: 20}, })); } @@ -367,8 +360,8 @@ describe('Task', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -501,8 +494,8 @@ describe('Task', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/taskrouter/v1/workspace/task/reservation.spec.js b/spec/integration/rest/taskrouter/v1/workspace/task/reservation.spec.js index 2f1c704ac0..cc7532e842 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/task/reservation.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/task/reservation.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -106,7 +105,7 @@ describe('Reservation', function() { .reservations.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= taskSid %>/Reservations', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations', params: {PageSize: 20}, })); } @@ -163,11 +162,9 @@ describe('Reservation', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= taskSid %>/Reservations')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -265,12 +262,10 @@ describe('Reservation', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= taskSid %>/Reservations/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -326,12 +321,10 @@ describe('Reservation', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskSid: 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Tasks/<%= taskSid %>/Reservations/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskSid = 'WTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Tasks/${taskSid}/Reservations/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/taskrouter/v1/workspace/taskChannel.spec.js b/spec/integration/rest/taskrouter/v1/workspace/taskChannel.spec.js index 3a6f4c7c51..de02945796 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/taskChannel.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/taskChannel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('TaskChannel', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskChannels/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskChannels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -179,7 +176,7 @@ describe('TaskChannel', function() { .taskChannels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskChannels', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskChannels', params: {PageSize: 20}, })); } @@ -230,8 +227,8 @@ describe('TaskChannel', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskChannels')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskChannels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -322,11 +319,9 @@ describe('TaskChannel', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskChannels/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskChannels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -405,11 +400,9 @@ describe('TaskChannel', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'TCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskChannels/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'TCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskChannels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -465,8 +458,8 @@ describe('TaskChannel', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskChannels')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskChannels`; var values = {FriendlyName: 'friendly_name', UniqueName: 'unique_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/taskrouter/v1/workspace/taskQueue.spec.js b/spec/integration/rest/taskrouter/v1/workspace/taskQueue.spec.js index 1f57e6064f..5271072cf8 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/taskQueue.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/taskQueue.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('TaskQueue', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -109,11 +106,9 @@ describe('TaskQueue', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -252,7 +247,7 @@ describe('TaskQueue', function() { .taskQueues.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues', params: {PageSize: 20}, })); } @@ -315,8 +310,8 @@ describe('TaskQueue', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -420,8 +415,8 @@ describe('TaskQueue', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -486,11 +481,9 @@ describe('TaskQueue', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.spec.js index 6f00a3c51e..469c0cb860 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueCumulativeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskQueueCumulativeStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskQueueSid: 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/<%= taskQueueSid %>/CumulativeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskQueueSid = 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/CumulativeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.spec.js index 22cac79f5b..8f9f49a063 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueRealTimeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskQueueRealTimeStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskQueueSid: 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/<%= taskQueueSid %>/RealTimeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskQueueSid = 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/RealTimeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.spec.js index bab01429aa..476d82fd85 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueueStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('TaskQueueStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - taskQueueSid: 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/<%= taskQueueSid %>/Statistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var taskQueueSid = 'WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/${taskQueueSid}/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.spec.js index 1fe8b92efd..e1f84c01b9 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/taskQueue/taskQueuesStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -202,7 +201,7 @@ describe('TaskQueuesStatistics', function() { .statistics.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/Statistics', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/Statistics', params: {PageSize: 20}, })); } @@ -307,8 +306,8 @@ describe('TaskQueuesStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/TaskQueues/Statistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/TaskQueues/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker.spec.js index bddc3bcd64..0486a82f6a 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -120,7 +119,7 @@ describe('Worker', function() { .workers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers', params: {PageSize: 20}, })); } @@ -183,8 +182,8 @@ describe('Worker', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -288,8 +287,8 @@ describe('Worker', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ @@ -354,11 +353,9 @@ describe('Worker', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -420,11 +417,9 @@ describe('Worker', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -486,11 +481,9 @@ describe('Worker', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker/reservation.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker/reservation.spec.js index de2f639e80..262fcc49cf 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker/reservation.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker/reservation.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -106,7 +105,7 @@ describe('Reservation', function() { .reservations.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Reservations', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations', params: {PageSize: 20}, })); } @@ -163,11 +162,9 @@ describe('Reservation', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Reservations')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -265,12 +262,10 @@ describe('Reservation', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Reservations/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -326,12 +321,10 @@ describe('Reservation', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Reservations/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Reservations/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker/workerChannel.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker/workerChannel.spec.js index 79a24e54b4..7332e9f76b 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker/workerChannel.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker/workerChannel.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -102,7 +101,7 @@ describe('WorkerChannel', function() { .workerChannels.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Channels', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels', params: {PageSize: 20}, })); } @@ -157,11 +156,9 @@ describe('WorkerChannel', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Channels')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -257,12 +254,10 @@ describe('WorkerChannel', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Channels/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -316,12 +311,10 @@ describe('WorkerChannel', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Channels/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Channels/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker/workerStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker/workerStatistics.spec.js index 35f22417a4..5aee652559 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker/workerStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker/workerStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('WorkerStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workerSid: 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/<%= workerSid %>/Statistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workerSid = 'WKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/${workerSid}/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.spec.js index 5f4d314002..9393e26ef7 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker/workersCumulativeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('WorkersCumulativeStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/CumulativeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/CumulativeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.spec.js index bd14b072e2..c1d32d8d91 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker/workersRealTimeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('WorkersRealTimeStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/RealTimeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/RealTimeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/worker/workersStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/worker/workersStatistics.spec.js index 4383540615..2020890f1c 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/worker/workersStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/worker/workersStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('WorkersStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workers/Statistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workers/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/workflow.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workflow.spec.js index e416736dca..55bb05dfe4 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workflow.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workflow.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Workflow', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -103,11 +100,9 @@ describe('Workflow', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -163,11 +158,9 @@ describe('Workflow', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows/<%= sid %>')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -272,7 +265,7 @@ describe('Workflow', function() { .workflows.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows', + url: 'https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows', params: {PageSize: 20}, })); } @@ -330,8 +323,8 @@ describe('Workflow', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -431,8 +424,8 @@ describe('Workflow', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows`; var values = {FriendlyName: 'friendly_name', Configuration: 'configuration', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.spec.js index 97a810962d..2bca590ac4 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowCumulativeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('WorkflowCumulativeStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workflowSid: 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows/<%= workflowSid %>/CumulativeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workflowSid = 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows/${workflowSid}/CumulativeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.spec.js index f9e96bc09c..2cc7752d88 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowRealTimeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('WorkflowRealTimeStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workflowSid: 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows/<%= workflowSid %>/RealTimeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workflowSid = 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows/${workflowSid}/RealTimeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowStatistics.spec.js index 70f713de5d..5645fa1700 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workflow/workflowStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('WorkflowStatistics', function() { }); promise.done(); - var solution = { - workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - workflowSid: 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Workflows/<%= workflowSid %>/Statistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var workflowSid = 'WWXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Workflows/${workflowSid}/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.spec.js index 574e27810a..4d2fc837ae 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workspaceCumulativeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('WorkspaceCumulativeStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/CumulativeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/CumulativeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.spec.js index 609e3a295a..1a7b6635b5 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workspaceRealTimeStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('WorkspaceRealTimeStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/RealTimeStatistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/RealTimeStatistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/taskrouter/v1/workspace/workspaceStatistics.spec.js b/spec/integration/rest/taskrouter/v1/workspace/workspaceStatistics.spec.js index 69d95d9bd0..81ca38165f 100644 --- a/spec/integration/rest/taskrouter/v1/workspace/workspaceStatistics.spec.js +++ b/spec/integration/rest/taskrouter/v1/workspace/workspaceStatistics.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('WorkspaceStatistics', function() { }); promise.done(); - var solution = {workspaceSid: 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://taskrouter.twilio.com/v1/Workspaces/<%= workspaceSid %>/Statistics')(solution); + var workspaceSid = 'WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://taskrouter.twilio.com/v1/Workspaces/${workspaceSid}/Statistics`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/trunking/v1/trunk.spec.js b/spec/integration/rest/trunking/v1/trunk.spec.js index fee6bdf507..ede3ffa928 100644 --- a/spec/integration/rest/trunking/v1/trunk.spec.js +++ b/spec/integration/rest/trunking/v1/trunk.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Trunk', function() { }); promise.done(); - var solution = {sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= sid %>')(solution); + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -105,8 +104,8 @@ describe('Trunk', function() { }); promise.done(); - var solution = {sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= sid %>')(solution); + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -449,8 +448,8 @@ describe('Trunk', function() { }); promise.done(); - var solution = {sid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= sid %>')(solution); + var sid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/trunking/v1/trunk/credentialList.spec.js b/spec/integration/rest/trunking/v1/trunk/credentialList.spec.js index 09535ac37b..95f27054ba 100644 --- a/spec/integration/rest/trunking/v1/trunk/credentialList.spec.js +++ b/spec/integration/rest/trunking/v1/trunk/credentialList.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('CredentialList', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/CredentialLists/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/CredentialLists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +90,9 @@ describe('CredentialList', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/CredentialLists/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/CredentialLists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -136,8 +131,8 @@ describe('CredentialList', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/CredentialLists')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/CredentialLists`; var values = {CredentialListSid: 'CLXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -231,7 +226,7 @@ describe('CredentialList', function() { .credentialsLists.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/CredentialLists', + url: 'https://trunking.twilio.com/v1/Trunks/${trunkSid}/CredentialLists', params: {PageSize: 20}, })); } @@ -278,8 +273,8 @@ describe('CredentialList', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/CredentialLists')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/CredentialLists`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/trunking/v1/trunk/ipAccessControlList.spec.js b/spec/integration/rest/trunking/v1/trunk/ipAccessControlList.spec.js index e20d874cf3..191a1cddc2 100644 --- a/spec/integration/rest/trunking/v1/trunk/ipAccessControlList.spec.js +++ b/spec/integration/rest/trunking/v1/trunk/ipAccessControlList.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/IpAccessControlLists/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/IpAccessControlLists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -93,11 +90,9 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/IpAccessControlLists/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/IpAccessControlLists/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -136,8 +131,8 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/IpAccessControlLists')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/IpAccessControlLists`; var values = {IpAccessControlListSid: 'ALXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -231,7 +226,7 @@ describe('IpAccessControlList', function() { .ipAccessControlLists.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/IpAccessControlLists', + url: 'https://trunking.twilio.com/v1/Trunks/${trunkSid}/IpAccessControlLists', params: {PageSize: 20}, })); } @@ -278,8 +273,8 @@ describe('IpAccessControlList', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/IpAccessControlLists')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/IpAccessControlLists`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/trunking/v1/trunk/originationUrl.spec.js b/spec/integration/rest/trunking/v1/trunk/originationUrl.spec.js index b123a7a283..c9a9523609 100644 --- a/spec/integration/rest/trunking/v1/trunk/originationUrl.spec.js +++ b/spec/integration/rest/trunking/v1/trunk/originationUrl.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -45,11 +44,9 @@ describe('OriginationUrl', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'OUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/OriginationUrls/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'OUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/OriginationUrls/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,11 +96,9 @@ describe('OriginationUrl', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'OUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/OriginationUrls/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'OUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/OriginationUrls/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -148,8 +143,8 @@ describe('OriginationUrl', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/OriginationUrls')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/OriginationUrls`; var values = { Weight: 1, @@ -267,7 +262,7 @@ describe('OriginationUrl', function() { .originationUrls.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/OriginationUrls', + url: 'https://trunking.twilio.com/v1/Trunks/${trunkSid}/OriginationUrls', params: {PageSize: 20}, })); } @@ -318,8 +313,8 @@ describe('OriginationUrl', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/OriginationUrls')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/OriginationUrls`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -410,11 +405,9 @@ describe('OriginationUrl', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'OUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/OriginationUrls/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'OUXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/OriginationUrls/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/trunking/v1/trunk/phoneNumber.spec.js b/spec/integration/rest/trunking/v1/trunk/phoneNumber.spec.js index 65d735f560..661c875244 100644 --- a/spec/integration/rest/trunking/v1/trunk/phoneNumber.spec.js +++ b/spec/integration/rest/trunking/v1/trunk/phoneNumber.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/PhoneNumbers/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -118,11 +115,9 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/PhoneNumbers/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/PhoneNumbers/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -161,8 +156,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/PhoneNumbers')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/PhoneNumbers`; var values = {PhoneNumberSid: 'PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -331,7 +326,7 @@ describe('PhoneNumber', function() { .phoneNumbers.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/PhoneNumbers', + url: 'https://trunking.twilio.com/v1/Trunks/${trunkSid}/PhoneNumbers', params: {PageSize: 20}, })); } @@ -403,8 +398,8 @@ describe('PhoneNumber', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/PhoneNumbers')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/PhoneNumbers`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/trunking/v1/trunk/terminatingSipDomain.spec.js b/spec/integration/rest/trunking/v1/trunk/terminatingSipDomain.spec.js index 5f4d1b0ed0..0c8ba71302 100644 --- a/spec/integration/rest/trunking/v1/trunk/terminatingSipDomain.spec.js +++ b/spec/integration/rest/trunking/v1/trunk/terminatingSipDomain.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('TerminatingSipDomain', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/TerminatingSipDomains/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/TerminatingSipDomains/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -106,11 +103,9 @@ describe('TerminatingSipDomain', function() { }); promise.done(); - var solution = { - trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/TerminatingSipDomains/<%= sid %>')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/TerminatingSipDomains/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -149,8 +144,8 @@ describe('TerminatingSipDomain', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/TerminatingSipDomains')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/TerminatingSipDomains`; var values = {SipDomainSid: 'SDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', }; holodeck.assertHasRequest(new Request({ @@ -283,7 +278,7 @@ describe('TerminatingSipDomain', function() { .terminatingSipDomains.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/TerminatingSipDomains', + url: 'https://trunking.twilio.com/v1/Trunks/${trunkSid}/TerminatingSipDomains', params: {PageSize: 20}, })); } @@ -343,8 +338,8 @@ describe('TerminatingSipDomain', function() { }); promise.done(); - var solution = {trunkSid: 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://trunking.twilio.com/v1/Trunks/<%= trunkSid %>/TerminatingSipDomains')(solution); + var trunkSid = 'TRXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://trunking.twilio.com/v1/Trunks/${trunkSid}/TerminatingSipDomains`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/verify/v2/service.spec.js b/spec/integration/rest/verify/v2/service.spec.js index b62cc6617e..276ff79ed3 100644 --- a/spec/integration/rest/verify/v2/service.spec.js +++ b/spec/integration/rest/verify/v2/service.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -99,8 +98,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://verify.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -153,8 +152,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://verify.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -372,8 +371,8 @@ describe('Service', function() { }); promise.done(); - var solution = {sid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= sid %>')(solution); + var sid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://verify.twilio.com/v2/Services/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/verify/v2/service/verification.spec.js b/spec/integration/rest/verify/v2/service/verification.spec.js index e4557af182..c91f1cd3ad 100644 --- a/spec/integration/rest/verify/v2/service/verification.spec.js +++ b/spec/integration/rest/verify/v2/service/verification.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('Verification', function() { }); promise.done(); - var solution = {serviceSid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= serviceSid %>/Verifications')(solution); + var serviceSid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://verify.twilio.com/v2/Services/${serviceSid}/Verifications`; var values = {To: 'to', Channel: 'channel', }; holodeck.assertHasRequest(new Request({ @@ -109,8 +108,9 @@ describe('Verification', function() { }); promise.done(); - var solution = {serviceSid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', sid: 'sid'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= serviceSid %>/Verifications/<%= sid %>')(solution); + var serviceSid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'sid'; + var url = `https://verify.twilio.com/v2/Services/${serviceSid}/Verifications/${sid}`; var values = {Status: 'canceled', }; holodeck.assertHasRequest(new Request({ @@ -173,8 +173,9 @@ describe('Verification', function() { }); promise.done(); - var solution = {serviceSid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', sid: 'sid'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= serviceSid %>/Verifications/<%= sid %>')(solution); + var serviceSid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'sid'; + var url = `https://verify.twilio.com/v2/Services/${serviceSid}/Verifications/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/verify/v2/service/verificationCheck.spec.js b/spec/integration/rest/verify/v2/service/verificationCheck.spec.js index 369680cf07..8855c6c5fa 100644 --- a/spec/integration/rest/verify/v2/service/verificationCheck.spec.js +++ b/spec/integration/rest/verify/v2/service/verificationCheck.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,8 +43,8 @@ describe('VerificationCheck', function() { }); promise.done(); - var solution = {serviceSid: 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://verify.twilio.com/v2/Services/<%= serviceSid %>/VerificationCheck')(solution); + var serviceSid = 'VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://verify.twilio.com/v2/Services/${serviceSid}/VerificationCheck`; var values = {Code: 'code', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/video/v1/composition.spec.js b/spec/integration/rest/video/v1/composition.spec.js index 250db3e076..3394e6812d 100644 --- a/spec/integration/rest/video/v1/composition.spec.js +++ b/spec/integration/rest/video/v1/composition.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Composition', function() { }); promise.done(); - var solution = {sid: 'CJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Compositions/<%= sid %>')(solution); + var sid = 'CJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Compositions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -536,8 +535,8 @@ describe('Composition', function() { }); promise.done(); - var solution = {sid: 'CJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Compositions/<%= sid %>')(solution); + var sid = 'CJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Compositions/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/video/v1/compositionHook.spec.js b/spec/integration/rest/video/v1/compositionHook.spec.js index faa9a5a91c..de0649661a 100644 --- a/spec/integration/rest/video/v1/compositionHook.spec.js +++ b/spec/integration/rest/video/v1/compositionHook.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('CompositionHook', function() { }); promise.done(); - var solution = {sid: 'HKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/CompositionHooks/<%= sid %>')(solution); + var sid = 'HKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/CompositionHooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -477,8 +476,8 @@ describe('CompositionHook', function() { }); promise.done(); - var solution = {sid: 'HKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/CompositionHooks/<%= sid %>')(solution); + var sid = 'HKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/CompositionHooks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', @@ -597,8 +596,8 @@ describe('CompositionHook', function() { }); promise.done(); - var solution = {sid: 'HKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/CompositionHooks/<%= sid %>')(solution); + var sid = 'HKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/CompositionHooks/${sid}`; var values = {FriendlyName: 'friendly_name', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/video/v1/compositionSettings.spec.js b/spec/integration/rest/video/v1/compositionSettings.spec.js index 250a59269b..fd7af3a1a3 100644 --- a/spec/integration/rest/video/v1/compositionSettings.spec.js +++ b/spec/integration/rest/video/v1/compositionSettings.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/video/v1/recording.spec.js b/spec/integration/rest/video/v1/recording.spec.js index 8934c4775e..7603db0cfa 100644 --- a/spec/integration/rest/video/v1/recording.spec.js +++ b/spec/integration/rest/video/v1/recording.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Recording', function() { }); promise.done(); - var solution = {sid: 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Recordings/<%= sid %>')(solution); + var sid = 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Recordings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -344,8 +343,8 @@ describe('Recording', function() { }); promise.done(); - var solution = {sid: 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Recordings/<%= sid %>')(solution); + var sid = 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Recordings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/video/v1/recordingSettings.spec.js b/spec/integration/rest/video/v1/recordingSettings.spec.js index eb337705da..9ee53abee3 100644 --- a/spec/integration/rest/video/v1/recordingSettings.spec.js +++ b/spec/integration/rest/video/v1/recordingSettings.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/video/v1/room.spec.js b/spec/integration/rest/video/v1/room.spec.js index 987464f8f9..363ead92ce 100644 --- a/spec/integration/rest/video/v1/room.spec.js +++ b/spec/integration/rest/video/v1/room.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Room', function() { }); promise.done(); - var solution = {sid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= sid %>')(solution); + var sid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -401,8 +400,8 @@ describe('Room', function() { }); promise.done(); - var solution = {sid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= sid %>')(solution); + var sid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${sid}`; var values = {Status: 'in-progress', }; holodeck.assertHasRequest(new Request({ diff --git a/spec/integration/rest/video/v1/room/recording.spec.js b/spec/integration/rest/video/v1/room/recording.spec.js index 537ef47b4c..d4adfb223d 100644 --- a/spec/integration/rest/video/v1/room/recording.spec.js +++ b/spec/integration/rest/video/v1/room/recording.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('RoomRecording', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Recordings/<%= sid %>')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Recordings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -191,7 +188,7 @@ describe('RoomRecording', function() { .recordings.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://video.twilio.com/v1/Rooms/<%= roomSid %>/Recordings', + url: 'https://video.twilio.com/v1/Rooms/${roomSid}/Recordings', params: {PageSize: 20}, })); } @@ -256,8 +253,8 @@ describe('RoomRecording', function() { }); promise.done(); - var solution = {roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Recordings')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Recordings`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -362,11 +359,9 @@ describe('RoomRecording', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Recordings/<%= sid %>')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'RTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Recordings/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/video/v1/room/roomParticipant.spec.js b/spec/integration/rest/video/v1/room/roomParticipant.spec.js index 213019ab8f..cf8e4fff94 100644 --- a/spec/integration/rest/video/v1/room/roomParticipant.spec.js +++ b/spec/integration/rest/video/v1/room/roomParticipant.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,11 +42,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= sid %>')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -162,7 +159,7 @@ describe('Participant', function() { .participants.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants', + url: 'https://video.twilio.com/v1/Rooms/${roomSid}/Participants', params: {PageSize: 20}, })); } @@ -217,8 +214,8 @@ describe('Participant', function() { }); promise.done(); - var solution = {roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -313,11 +310,9 @@ describe('Participant', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= sid %>')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.spec.js b/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.spec.js index 771e370dd8..080b03b6a2 100644 --- a/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.spec.js +++ b/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantPublishedTrack.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,12 +43,10 @@ describe('PublishedTrack', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'MTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/PublishedTracks/<%= sid %>')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'MTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${participantSid}/PublishedTracks/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -99,11 +96,9 @@ describe('PublishedTrack', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/PublishedTracks')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${participantSid}/PublishedTracks`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.spec.js b/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.spec.js index fcded47d20..c4fd496973 100644 --- a/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.spec.js +++ b/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -94,7 +93,7 @@ describe('SubscribedTrack', function() { .subscribedTracks.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= subscriberSid %>/SubscribedTracks', + url: 'https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${subscriberSid}/SubscribedTracks', params: {PageSize: 20}, })); } @@ -145,11 +144,9 @@ describe('SubscribedTrack', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - subscriberSid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= subscriberSid %>/SubscribedTracks')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var subscriberSid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${subscriberSid}/SubscribedTracks`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -241,11 +238,9 @@ describe('SubscribedTrack', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - subscriberSid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= subscriberSid %>/SubscribedTracks')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var subscriberSid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${subscriberSid}/SubscribedTracks`; holodeck.assertHasRequest(new Request({ method: 'POST', diff --git a/spec/integration/rest/voice/v1/dialingPermissions.spec.js b/spec/integration/rest/voice/v1/dialingPermissions.spec.js index 200923a259..f5d773436d 100644 --- a/spec/integration/rest/voice/v1/dialingPermissions.spec.js +++ b/spec/integration/rest/voice/v1/dialingPermissions.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/voice/v1/dialingPermissions/bulkCountryUpdate.spec.js b/spec/integration/rest/voice/v1/dialingPermissions/bulkCountryUpdate.spec.js index 9377040ae7..57d57c93b5 100644 --- a/spec/integration/rest/voice/v1/dialingPermissions/bulkCountryUpdate.spec.js +++ b/spec/integration/rest/voice/v1/dialingPermissions/bulkCountryUpdate.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/voice/v1/dialingPermissions/country.spec.js b/spec/integration/rest/voice/v1/dialingPermissions/country.spec.js index 921572d5f3..7da5de0a9d 100644 --- a/spec/integration/rest/voice/v1/dialingPermissions/country.spec.js +++ b/spec/integration/rest/voice/v1/dialingPermissions/country.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -43,8 +42,8 @@ describe('Country', function() { }); promise.done(); - var solution = {isoCode: 'US'}; - var url = _.template('https://voice.twilio.com/v1/DialingPermissions/Countries/<%= isoCode %>')(solution); + var isoCode = 'US'; + var url = `https://voice.twilio.com/v1/DialingPermissions/Countries/${isoCode}`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.spec.js b/spec/integration/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.spec.js index 7553c82349..1f9922cc67 100644 --- a/spec/integration/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.spec.js +++ b/spec/integration/rest/voice/v1/dialingPermissions/country/highriskSpecialPrefix.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -84,7 +83,7 @@ describe('HighriskSpecialPrefix', function() { .highriskSpecialPrefixes.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://voice.twilio.com/v1/DialingPermissions/Countries/<%= isoCode %>/HighRiskSpecialPrefixes', + url: 'https://voice.twilio.com/v1/DialingPermissions/Countries/${isoCode}/HighRiskSpecialPrefixes', params: {PageSize: 20}, })); } @@ -130,8 +129,8 @@ describe('HighriskSpecialPrefix', function() { }); promise.done(); - var solution = {isoCode: 'US'}; - var url = _.template('https://voice.twilio.com/v1/DialingPermissions/Countries/<%= isoCode %>/HighRiskSpecialPrefixes')(solution); + var isoCode = 'US'; + var url = `https://voice.twilio.com/v1/DialingPermissions/Countries/${isoCode}/HighRiskSpecialPrefixes`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/voice/v1/dialingPermissions/settings.spec.js b/spec/integration/rest/voice/v1/dialingPermissions/settings.spec.js index cc216a5912..ded858601d 100644 --- a/spec/integration/rest/voice/v1/dialingPermissions/settings.spec.js +++ b/spec/integration/rest/voice/v1/dialingPermissions/settings.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/wireless/v1/command.spec.js b/spec/integration/rest/wireless/v1/command.spec.js index fa551b055e..36cfbd80b5 100644 --- a/spec/integration/rest/wireless/v1/command.spec.js +++ b/spec/integration/rest/wireless/v1/command.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Command', function() { }); promise.done(); - var solution = {sid: 'DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Commands/<%= sid %>')(solution); + var sid = 'DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Commands/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -439,8 +438,8 @@ describe('Command', function() { }); promise.done(); - var solution = {sid: 'DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Commands/<%= sid %>')(solution); + var sid = 'DCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Commands/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/wireless/v1/ratePlan.spec.js b/spec/integration/rest/wireless/v1/ratePlan.spec.js index 9c7d3f10ad..975b37dfaf 100644 --- a/spec/integration/rest/wireless/v1/ratePlan.spec.js +++ b/spec/integration/rest/wireless/v1/ratePlan.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -267,8 +266,8 @@ describe('RatePlan', function() { }); promise.done(); - var solution = {sid: 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/RatePlans/<%= sid %>')(solution); + var sid = 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/RatePlans/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -382,8 +381,8 @@ describe('RatePlan', function() { }); promise.done(); - var solution = {sid: 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/RatePlans/<%= sid %>')(solution); + var sid = 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/RatePlans/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -440,8 +439,8 @@ describe('RatePlan', function() { }); promise.done(); - var solution = {sid: 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/RatePlans/<%= sid %>')(solution); + var sid = 'WPXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/RatePlans/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/wireless/v1/sim.spec.js b/spec/integration/rest/wireless/v1/sim.spec.js index a29a48399b..c22e74c2ea 100644 --- a/spec/integration/rest/wireless/v1/sim.spec.js +++ b/spec/integration/rest/wireless/v1/sim.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ @@ -42,8 +41,8 @@ describe('Sim', function() { }); promise.done(); - var solution = {sid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Sims/<%= sid %>')(solution); + var sid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Sims/${sid}`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -365,8 +364,8 @@ describe('Sim', function() { }); promise.done(); - var solution = {sid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Sims/<%= sid %>')(solution); + var sid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Sims/${sid}`; holodeck.assertHasRequest(new Request({ method: 'POST', @@ -431,8 +430,8 @@ describe('Sim', function() { }); promise.done(); - var solution = {sid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Sims/<%= sid %>')(solution); + var sid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Sims/${sid}`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/wireless/v1/sim/dataSession.spec.js b/spec/integration/rest/wireless/v1/sim/dataSession.spec.js index 2ee2e68ae7..737b621f78 100644 --- a/spec/integration/rest/wireless/v1/sim/dataSession.spec.js +++ b/spec/integration/rest/wireless/v1/sim/dataSession.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -142,7 +141,7 @@ describe('DataSession', function() { .dataSessions.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://wireless.twilio.com/v1/Sims/<%= simSid %>/DataSessions', + url: 'https://wireless.twilio.com/v1/Sims/${simSid}/DataSessions', params: {PageSize: 20}, })); } @@ -216,8 +215,8 @@ describe('DataSession', function() { }); promise.done(); - var solution = {simSid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Sims/<%= simSid %>/DataSessions')(solution); + var simSid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Sims/${simSid}/DataSessions`; holodeck.assertHasRequest(new Request({ method: 'GET', diff --git a/spec/integration/rest/wireless/v1/sim/usageRecord.spec.js b/spec/integration/rest/wireless/v1/sim/usageRecord.spec.js index 32088d9fb5..0a724a891d 100644 --- a/spec/integration/rest/wireless/v1/sim/usageRecord.spec.js +++ b/spec/integration/rest/wireless/v1/sim/usageRecord.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -98,7 +97,7 @@ describe('UsageRecord', function() { .usageRecords.each({pageSize: 20}, () => done()); holodeck.assertHasRequest(new Request({ method: 'GET', - url: 'https://wireless.twilio.com/v1/Sims/<%= simSid %>/UsageRecords', + url: 'https://wireless.twilio.com/v1/Sims/${simSid}/UsageRecords', params: {PageSize: 20}, })); } @@ -150,8 +149,8 @@ describe('UsageRecord', function() { }); promise.done(); - var solution = {simSid: 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'}; - var url = _.template('https://wireless.twilio.com/v1/Sims/<%= simSid %>/UsageRecords')(solution); + var simSid = 'DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://wireless.twilio.com/v1/Sims/${simSid}/UsageRecords`; holodeck.assertHasRequest(new Request({ method: 'GET', From e89b22d73af7e2a8c3f8e9864b9741e694819688 Mon Sep 17 00:00:00 2001 From: Sam Harrison Date: Tue, 21 May 2019 09:47:18 -0500 Subject: [PATCH 2/2] Sync with latest release --- lib/rest/preview/trusted_comms/currentCall.js | 4 +--- lib/rest/preview/trusted_comms/device.js | 4 +--- lib/rest/preview/trusted_comms/phoneCall.js | 4 +--- .../roomParticipantSubscribeRule.js | 4 +--- .../roomParticipantSubscribedTrack.js | 4 +--- .../rest/api/v2010/account/connectApp.spec.js | 8 +++----- .../preview/trusted_comms/currentCall.spec.js | 1 - .../rest/preview/trusted_comms/device.spec.js | 1 - .../preview/trusted_comms/phoneCall.spec.js | 1 - .../roomParticipantSubscribeRule.spec.js | 17 ++++++----------- 10 files changed, 14 insertions(+), 34 deletions(-) diff --git a/lib/rest/preview/trusted_comms/currentCall.js b/lib/rest/preview/trusted_comms/currentCall.js index 5e29a42b4e..fa79f0e58e 100644 --- a/lib/rest/preview/trusted_comms/currentCall.js +++ b/lib/rest/preview/trusted_comms/currentCall.js @@ -270,9 +270,7 @@ CurrentCallContext = function CurrentCallContext(version) { // Path Solution this._solution = {}; - this._uri = _.template( - '/CurrentCall' // jshint ignore:line - )(this._solution); + this._uri = `/CurrentCall`; }; /* jshint ignore:start */ diff --git a/lib/rest/preview/trusted_comms/device.js b/lib/rest/preview/trusted_comms/device.js index ffc6261976..26799ce9f2 100644 --- a/lib/rest/preview/trusted_comms/device.js +++ b/lib/rest/preview/trusted_comms/device.js @@ -50,9 +50,7 @@ DeviceList = function DeviceList(version) { DeviceListInstance._version = version; // Path Solution DeviceListInstance._solution = {}; - DeviceListInstance._uri = _.template( - '/Devices' // jshint ignore:line - )(DeviceListInstance._solution); + DeviceListInstance._uri = `/Devices`; /* jshint ignore:start */ /** * create a DeviceInstance diff --git a/lib/rest/preview/trusted_comms/phoneCall.js b/lib/rest/preview/trusted_comms/phoneCall.js index 0b3a5f1fa0..814638c12c 100644 --- a/lib/rest/preview/trusted_comms/phoneCall.js +++ b/lib/rest/preview/trusted_comms/phoneCall.js @@ -52,9 +52,7 @@ PhoneCallList = function PhoneCallList(version) { PhoneCallListInstance._version = version; // Path Solution PhoneCallListInstance._solution = {}; - PhoneCallListInstance._uri = _.template( - '/Business/PhoneCalls' // jshint ignore:line - )(PhoneCallListInstance._solution); + PhoneCallListInstance._uri = `/Business/PhoneCalls`; /* jshint ignore:start */ /** * create a PhoneCallInstance diff --git a/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.js b/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.js index be71d4ec4b..fc689e0a4d 100644 --- a/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.js +++ b/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.js @@ -57,9 +57,7 @@ SubscribeRulesList = function SubscribeRulesList(version, roomSid, SubscribeRulesListInstance._version = version; // Path Solution SubscribeRulesListInstance._solution = {roomSid: roomSid, participantSid: participantSid}; - SubscribeRulesListInstance._uri = _.template( - '/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/SubscribeRules' // jshint ignore:line - )(SubscribeRulesListInstance._solution); + SubscribeRulesListInstance._uri = `/Rooms/${roomSid}/Participants/${participantSid}/SubscribeRules`; /* jshint ignore:start */ /** * fetch a SubscribeRulesInstance diff --git a/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js b/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js index 7fcbb4cc9d..52cd41e847 100644 --- a/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js +++ b/lib/rest/video/v1/room/roomParticipant/roomParticipantSubscribedTrack.js @@ -545,9 +545,7 @@ SubscribedTrackContext = function SubscribedTrackContext(version, roomSid, // Path Solution this._solution = {roomSid: roomSid, participantSid: participantSid, sid: sid, }; - this._uri = _.template( - '/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/SubscribedTracks/<%= sid %>' // jshint ignore:line - )(this._solution); + this._uri = `/Rooms/${roomSid}/Participants/${participantSid}/SubscribedTracks/${sid}`; }; /* jshint ignore:start */ diff --git a/spec/integration/rest/api/v2010/account/connectApp.spec.js b/spec/integration/rest/api/v2010/account/connectApp.spec.js index 13823ed67b..7529b00496 100644 --- a/spec/integration/rest/api/v2010/account/connectApp.spec.js +++ b/spec/integration/rest/api/v2010/account/connectApp.spec.js @@ -337,11 +337,9 @@ describe('ConnectApp', function() { }); promise.done(); - var solution = { - accountSid: 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - sid: 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://api.twilio.com/2010-04-01/Accounts/<%= accountSid %>/ConnectApps/<%= sid %>.json')(solution); + var accountSid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var sid = 'CNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://api.twilio.com/2010-04-01/Accounts/${accountSid}/ConnectApps/${sid}.json`; holodeck.assertHasRequest(new Request({ method: 'DELETE', diff --git a/spec/integration/rest/preview/trusted_comms/currentCall.spec.js b/spec/integration/rest/preview/trusted_comms/currentCall.spec.js index 6390777e25..db272c3896 100644 --- a/spec/integration/rest/preview/trusted_comms/currentCall.spec.js +++ b/spec/integration/rest/preview/trusted_comms/currentCall.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/preview/trusted_comms/device.spec.js b/spec/integration/rest/preview/trusted_comms/device.spec.js index d1db5de62e..b21f1bcd59 100644 --- a/spec/integration/rest/preview/trusted_comms/device.spec.js +++ b/spec/integration/rest/preview/trusted_comms/device.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/preview/trusted_comms/phoneCall.spec.js b/spec/integration/rest/preview/trusted_comms/phoneCall.spec.js index ff6313229a..61cf511918 100644 --- a/spec/integration/rest/preview/trusted_comms/phoneCall.spec.js +++ b/spec/integration/rest/preview/trusted_comms/phoneCall.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../lib/http/request'); /* jshint ignore:line */ diff --git a/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.spec.js b/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.spec.js index 265c3db5c6..3552df0cd2 100644 --- a/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.spec.js +++ b/spec/integration/rest/video/v1/room/roomParticipant/roomParticipantSubscribeRule.spec.js @@ -9,7 +9,6 @@ */ /* jshint ignore:end */ -var _ = require('lodash'); /* jshint ignore:line */ var Holodeck = require('../../../../../holodeck'); /* jshint ignore:line */ var Request = require( '../../../../../../../lib/http/request'); /* jshint ignore:line */ @@ -44,11 +43,9 @@ describe('SubscribeRules', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/SubscribeRules')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${participantSid}/SubscribeRules`; holodeck.assertHasRequest(new Request({ method: 'GET', @@ -94,11 +91,9 @@ describe('SubscribeRules', function() { }); promise.done(); - var solution = { - roomSid: 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', - participantSid: 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' - }; - var url = _.template('https://video.twilio.com/v1/Rooms/<%= roomSid %>/Participants/<%= participantSid %>/SubscribeRules')(solution); + var roomSid = 'RMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var participantSid = 'PAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'; + var url = `https://video.twilio.com/v1/Rooms/${roomSid}/Participants/${participantSid}/SubscribeRules`; holodeck.assertHasRequest(new Request({ method: 'POST',