test fixup

Author: jpinkney-aws

packages/core/src/test/lambda/vue/remoteInvoke/invokeLambda.test.ts

@@ -21,6 +21,7 @@ import { FakeExtensionContext } from '../../../fakeExtensionContext'
 import * as samCliRemoteTestEvent from '../../../../shared/sam/cli/samCliRemoteTestEvent'
 import { TestEventsOperation, SamCliRemoteTestEventsParameters } from '../../../../shared/sam/cli/samCliRemoteTestEvent'
 import { assertLogsContain } from '../../../globalSetup.test'
+import { createResponse } from '../../../testUtil'
 
 describe('RemoteInvokeWebview', () => {
     let outputChannel: vscode.OutputChannel
@@ -394,7 +395,7 @@ describe('RemoteInvokeWebview', () => {
             createQuickPickStub.returns({})
             promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
             verifySinglePickerOutputStub.returns({ label: 'testEvent', filename: 'testEvent.json' })
-            httpFetcherStub.resolves(mockSampleContent)
+            httpFetcherStub.resolves(createResponse(mockSampleContent))
 
             const result = await remoteInvokeWebview.getSamplePayload()
 

packages/core/src/test/lambda/vue/samInvokeBackend.test.ts

@@ -28,6 +28,7 @@ import { SamDebugConfigProvider } from '../../../shared/sam/debugger/awsSamDebug
 import sinon from 'sinon'
 import * as nls from 'vscode-nls'
 import { assertLogsContain } from '../../../test/globalSetup.test'
+import { createResponse } from '../../testUtil'
 
 const localize = nls.loadMessageBundle()
 
@@ -166,7 +167,7 @@ describe('SamInvokeWebview', () => {
             createQuickPickStub.returns({})
             promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
             verifySinglePickerOutputStub.returns({ label: 'testEvent', filename: 'testEvent.json' })
-            httpFetcherStub.resolves(mockSampleContent)
+            httpFetcherStub.resolves(createResponse(mockSampleContent))
 
             const result = await samInvokeWebview.getSamplePayload()
 

packages/core/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts

@@ -6,6 +6,7 @@
 import assert from 'assert'
 import { HttpResourceFetcher, getPropertyFromJsonUrl } from '../../../shared/resourcefetcher/httpResourceFetcher'
 import { stub } from '../../utilities/stubber'
+import { createResponse } from '../../testUtil'
 
 describe('getPropertyFromJsonUrl', function () {
     const dummyUrl = 'url'
@@ -19,18 +20,18 @@ describe('getPropertyFromJsonUrl', function () {
 
     it('undefined if resource is not JSON', async function () {
         const mockFetcher = stub(HttpResourceFetcher)
-        mockFetcher.get.resolves('foo' as any) // horrible hack: this works without the declaration but the language server latches onto this using a FetcherResult return type
+        mockFetcher.get.resolves(createResponse('foo'))
         assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher), undefined)
     })
 
     it('undefined if property is not present', async function () {
         const mockFetcher = stub(HttpResourceFetcher)
-        mockFetcher.get.resolves('{"foo": "bar"}' as any)
+        mockFetcher.get.resolves(createResponse('{"foo": "bar"}'))
         assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher), undefined)
     })
     it('returns value if property is present', async function () {
         const mockFetcher = stub(HttpResourceFetcher)
-        mockFetcher.get.resolves('{"property": "111"}' as any)
+        mockFetcher.get.resolves(createResponse('{"property": "111"}'))
         mockFetcher.getNewETagContent.resolves({ content: 'foo', eTag: '' })
         const value = await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher)
         assert.strictEqual(value, '111')

packages/core/src/test/testUtil.ts

@@ -18,7 +18,7 @@ import { DeclaredCommand } from '../shared/vscode/commands2'
 import { mkdirSync, existsSync } from 'fs' // eslint-disable-line no-restricted-imports
 import { randomBytes } from 'crypto'
 import request from '../shared/request'
-import { stub } from 'sinon'
+import { createStubInstance, stub } from 'sinon'
 
 const testTempDirs: string[] = []
 
@@ -634,3 +634,10 @@ export function getFetchStubWithResponse(response: Partial<Response>) {
 export function copyEnv(): NodeJS.ProcessEnv {
     return { ...process.env }
 }
+
+// Returns a stubbed response object
+export function createResponse(text: string): Response {
+    const responseStub = createStubInstance(Response)
+    responseStub.text.resolves(text)
+    return responseStub
+}