chore: fix failing tests

just-dandi · Feb 16, 2020 · 3cafc00 · 3cafc00
1 parent 56873e7
commit 3cafc00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/packages/dandi/common/src/disposable.ts b/packages/dandi/common/src/disposable.ts
@@ -148,9 +148,6 @@ export class Disposable {
     const resolvedObj = isPromise(obj) ? await obj : obj
     try {
       return await use(resolvedObj)
-    } catch (err) {
-      console.error(err)
-      throw err
     } finally {
       await Disposable.dispose(resolvedObj, `after Disposable.useAsync() for ${obj.constructor.name}`)
     }

diff --git a/packages/dandi/http-pipeline/src/http-pipeline.spec.ts b/packages/dandi/http-pipeline/src/http-pipeline.spec.ts
@@ -83,6 +83,10 @@ describe('HttpPipeline', () => {
       provide: HttpPipelineTerminator,
       useFactory: () => terminator,
     },
+    {
+      provide: HttpPipelineConfig,
+      useFactory: () => config,
+    },
     stubProvider(DefaultHttpPipelineErrorHandler, HttpPipelineErrorResultHandler),
   )
 
@@ -99,17 +103,19 @@ describe('HttpPipeline', () => {
     )
   }
 
-  function invokePipeline(): Promise<any> {
-    return requestInjector.invoke(pipeline, 'handleRequest')
+  async function invokePipeline(): Promise<any> {
+    return await requestInjector.invoke(pipeline, 'handleRequest')
   }
 
+  let config: HttpPipelineConfig
   let pipeline: HttpPipeline
   let terminator: SinonStubbedInstance<HttpPipelineTerminator>
   let requestInjector: TestInjector
   let errorHandler: SinonStubbedInstance<HttpPipelineErrorResultHandler>
   let renderer: SinonStubbedInstance<HttpPipelineRenderer>
 
   beforeEach(async () => {
+    config = {}
     renderer = createStubInstance(NativeJsonObjectRenderer)
     renderer.render.resolves({
       contentType: 'text/plain',
@@ -295,14 +301,10 @@ describe('HttpPipeline', () => {
       beforeEach(async () => {
         harness.register(TestPreparer)
         registerHandler(new TestController(), 'method')
-        const config = {
+        config = {
           before: [TestPreparer, DependentTestPreparer],
         }
         harness.register(
-          {
-            provide: HttpPipelineConfig,
-            useFactory: () => config,
-          },
           underTest(TestPreparer),
           underTest(DependentTestPreparer),
         )