Merge pull request #92 from github/brrygrdn/manually-revert-recent-ch…

…anges

Manually revert recent changes to `src/` that were not reflected in `dist/`

__tests__/container-service.test.ts

@@ -7,36 +7,18 @@ describe('ContainerService', () => {
   const docker = new Docker()
   let container: any
 
-  describe('when a container runs successfully', () => {
-    beforeEach(async () => {
-      await ImageService.pull('alpine')
-      container = await docker.createContainer({
-        Image: 'alpine',
-        AttachStdout: true,
-        AttachStderr: true,
-        Cmd: ['/bin/sh', '-c', 'echo $VAR'],
-        Env: ['VAR=env-var']
-      })
-    })
-
-    test('it returns true', async () => {
-      expect(await ContainerService.run(container)).toBe(true)
+  beforeAll(async () => {
+    await ImageService.pull('alpine')
+    container = await docker.createContainer({
+      Image: 'alpine',
+      AttachStdout: true,
+      AttachStderr: true,
+      Cmd: ['/bin/sh', '-c', 'echo $VAR'],
+      Env: ['VAR=env-var']
     })
   })
 
-  describe('when a container runs unsuccessfully', () => {
-    beforeEach(async () => {
-      await ImageService.pull('alpine')
-      container = await docker.createContainer({
-        Image: 'alpine',
-        AttachStdout: true,
-        AttachStderr: true,
-        Cmd: ['/bin/sh', '-c', 'nosuchccommand']
-      })
-    })
-
-    test('raises an exception', async () => {
-      await expect(ContainerService.run(container)).rejects.toThrow()
-    })
+  test('runs containers', async () => {
+    await ContainerService.run(container)
   })
 })

__tests__/api_client.test.ts → __tests__/dependabot-api.test.ts

@@ -1,10 +1,10 @@
-import {ApiClient} from '../src/api-client'
+import {APIClient, PackageManager} from '../src/api-client'
 
-describe('ApiClient', () => {
+describe('APIClient', () => {
   const mockAxios: any = {
     get: jest.fn()
   }
-  const api = new ApiClient(mockAxios, {
+  const api = new APIClient(mockAxios, {
     jobId: 1,
     jobToken: 'xxx',
     credentialsToken: 'yyy',
@@ -34,6 +34,6 @@ describe('ApiClient', () => {
 
     const jobDetails = await api.getJobDetails()
     expect(jobDetails['allowed-updates'].length).toBe(1)
-    expect(jobDetails['package-manager']).toBe('npm_and_yarn')
+    expect(jobDetails['package-manager']).toBe(PackageManager.NpmAndYarn)
   })
 })

__tests__/main.test.ts

@@ -1,6 +1,6 @@
 import * as core from '@actions/core'
 import {Context} from '@actions/github/lib/context'
-import {ApiClient} from '../src/api-client'
+import {APIClient} from '../src/api-client'
 import {Updater} from '../src/updater'
 import {ImageService} from '../src/image-service'
 import * as inputs from '../src/inputs'
@@ -21,10 +21,10 @@ describe('run', () => {
 
   beforeEach(async () => {
     markJobAsProcessedSpy = jest.spyOn(
-      ApiClient.prototype,
+      APIClient.prototype,
       'markJobAsProcessed'
     )
-    reportJobErrorSpy = jest.spyOn(ApiClient.prototype, 'reportJobError')
+    reportJobErrorSpy = jest.spyOn(APIClient.prototype, 'reportJobError')
 
     jest.spyOn(core, 'info').mockImplementation(jest.fn())
     jest.spyOn(core, 'setFailed').mockImplementation(jest.fn())
@@ -114,7 +114,7 @@ describe('run', () => {
   describe('when there is an error retrieving job details from DependabotAPI', () => {
     beforeEach(() => {
       jest
-        .spyOn(ApiClient.prototype, 'getJobDetails')
+        .spyOn(APIClient.prototype, 'getJobDetails')
         .mockImplementationOnce(
           jest.fn(async () =>
             Promise.reject(new Error('error getting job details'))
@@ -139,9 +139,7 @@ describe('run', () => {
 
       expect(reportJobErrorSpy).toHaveBeenCalledWith({
         'error-type': 'actions_workflow_unknown',
-        'error-details': {
-          'action-error': 'error getting job details'
-        }
+        'error-detail': 'error getting job details'
       })
       expect(markJobAsProcessedSpy).toHaveBeenCalled()
     })
@@ -150,7 +148,7 @@ describe('run', () => {
   describe('when there is an error retrieving job credentials from DependabotAPI', () => {
     beforeEach(() => {
       jest
-        .spyOn(ApiClient.prototype, 'getCredentials')
+        .spyOn(APIClient.prototype, 'getCredentials')
         .mockImplementationOnce(
           jest.fn(async () =>
             Promise.reject(new Error('error getting credentials'))
@@ -175,9 +173,7 @@ describe('run', () => {
 
       expect(reportJobErrorSpy).toHaveBeenCalledWith({
         'error-type': 'actions_workflow_unknown',
-        'error-details': {
-          'action-error': 'error getting credentials'
-        }
+        'error-detail': 'error getting credentials'
       })
       expect(markJobAsProcessedSpy).toHaveBeenCalled()
     })
@@ -211,9 +207,7 @@ describe('run', () => {
 
       expect(reportJobErrorSpy).toHaveBeenCalledWith({
         'error-type': 'actions_workflow_image',
-        'error-details': {
-          'action-error': 'error pulling an image'
-        }
+        'error-detail': 'error pulling an image'
       })
       expect(markJobAsProcessedSpy).toHaveBeenCalled()
     })
@@ -247,9 +241,7 @@ describe('run', () => {
 
       expect(reportJobErrorSpy).toHaveBeenCalledWith({
         'error-type': 'actions_workflow_updater',
-        'error-details': {
-          'action-error': 'error running the update'
-        }
+        'error-detail': 'error running the update'
       })
       expect(markJobAsProcessedSpy).toHaveBeenCalled()
     })

__tests__/proxy-integration.test.ts

@@ -1,5 +1,5 @@
 import Docker from 'dockerode'
-import {Credential, JobDetails} from '../src/api-client'
+import {Credential, JobDetails, PackageManager} from '../src/api-client'
 import {ImageService} from '../src/image-service'
 import {PROXY_IMAGE_NAME} from '../src/main'
 import {ProxyBuilder} from '../src/proxy'
@@ -17,7 +17,7 @@ describe('ProxyBuilder', () => {
         'dependency-type': 'all'
       }
     ],
-    'package-manager': 'npm_and_yarn'
+    'package-manager': PackageManager.NpmAndYarn
   }
   const credentials: Credential[] = [
     {

__tests__/updater-integration.test.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 
-import {ApiClient, JobParameters} from '../src/api-client'
+import {APIClient, JobParameters} from '../src/api-client'
 import {ImageService} from '../src/image-service'
 import {UPDATER_IMAGE_NAME, PROXY_IMAGE_NAME} from '../src/main'
 import {Updater} from '../src/updater'
@@ -27,7 +27,7 @@ describe('Updater', () => {
   )
 
   const client = axios.create({baseURL: dependabotApiUrl})
-  const apiClient = new ApiClient(client, params)
+  const apiClient = new APIClient(client, params)
 
   beforeAll(async () => {
     // Skip the test when we haven't preloaded the updater image