remove try catch and expect test to throw error

prabalsingh24 · prabalsingh24 · commit 5f364bb7efa2 · 2020-05-27T11:54:27.000+05:30
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "amqplib": "^0.5.2",
+    "chai-as-promised": "^7.1.1",
     "newrelic": "^6.5.0",
     "raven": "^2.6.4",
     "shelljs": "^0.8.1"
diff --git a/src/tasks/index.ts b/src/tasks/index.ts
@@ -28,25 +28,16 @@ export async function execute (job: Job) {
     scenario = new ProjectScenario()
   }
 
-  let result
-  try {
-    // Setup RUNBOX
-    await scenario.setup(currentJobDir, job)
+  // Setup RUNBOX
+  await scenario.setup(currentJobDir, job)
 
-    // Run worker
-    await scenario.run(currentJobDir, job)
+  // Run worker
+  await scenario.run(currentJobDir, job)
 
-    // Get result
-    result = await scenario.result(currentJobDir, job)
-  }
-  catch(err) {
-    result = {
-      id: job.id,
-      stderr: err
-    }
-  }
+  // Get result
+  const result = await scenario.result(currentJobDir, job)
 
   rm('-rf', currentJobDir)
 
-  return result;
+  return result
 }
diff --git a/test/project/project.nodejs.spec.ts b/test/project/project.nodejs.spec.ts
@@ -1,7 +1,10 @@
 import { execute } from '../../src/tasks/'
-import { expect } from 'chai'
 import { ProjectJob } from '../../src/tasks/jobs/project'
 
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+const {expect} = chai
+chai.use(chaiAsPromised)
 
 describe('project-nodejs', () => {
   it('should run nodejs project correctly', async () => {
@@ -50,23 +53,22 @@ describe('project-nodejs', () => {
     expect(projectResult.score).to.equal(0)
   })
 
-  it('should not break when url is invalid', async () => {
-    const projectResult = await execute(new ProjectJob({
+  it('should throw error when url is invalid', async () => {
+    const job = new ProjectJob({
       id: 25,
       source: 'https://www.invalidurl.com',
       problem: 'https://www.invalidurl.com',
       submissionDirs: 'src/*',
       lang: 'nodejs',
       timelimit: 20,
       scenario: 'project'
-    }))
-    expect(projectResult).to.have.keys(
-        'id',
-        'stderr',
-    )
+    })
+
+    await expect(execute(job)).to.be.rejected;
   })
 
   it('should return code = 1 when there is a build error', async () => {
+    // file downloaded from google.com will not be a nodejs project, hence build error
     const projectResult = await execute(new ProjectJob({
       id: 25,
       source: 'https://www.google.com',
@@ -87,21 +89,4 @@ describe('project-nodejs', () => {
     expect(projectResult.code).to.equal(1)
     expect(projectResult.score).to.equal(0)
   })
-
-  it('should not break if lang is incorrect', async () => {
-    const projectResult = await execute(new ProjectJob({
-      id: 25,
-      source: 'https://minio.cb.lk/public/problem.zip',
-      problem: 'https://minio.cb.lk/public/solution.zip',
-      submissionDirs: 'src/*',
-      lang: 'abcd',
-      timelimit: 20,
-      scenario: 'project'
-    }))
-
-    expect(projectResult).to.have.keys(
-        'id',
-        'stderr',
-    )
-  })
 })
