fix: failing tests

Author: brianleroux

test/integration/static/index-test.js

@@ -56,37 +56,32 @@ Module._load = function (request, parent) {
 
 const staticDeployMod = require(join(process.cwd(), 'src', 'static', 'index.js'))
 
-let defaultParams = () => ({
-  bucket: 'a-bucket',
-  isDryRun: false,
-  name: 'an-app',
-  production: false,
-  region: 'us-west-1',
-  stackname: undefined,
-  update: updater('Deploy'),
-  verbose: undefined,
-  // `@static` settings
-  prefix: undefined,
-  prune: false,
-})
-let params = defaultParams()
+let testParams = {}
 
 function setup () {
   published = undefined
-}
-function reset () {
-  params = defaultParams()
+  testParams = {}
 }
 
 function staticDeploy (cwd, callback) {
   inventory({ cwd }, function (err, result) {
     if (err) callback(err)
     else {
-      params.inventory = result
-      staticDeployMod(params, err => {
-        reset()
-        callback(err)
-      })
+      const params = {
+        bucket: 'a-bucket',
+        isDryRun: false,
+        name: 'an-app',
+        production: false,
+        region: 'us-west-1',
+        stackname: undefined,
+        update: updater('Deploy'),
+        verbose: undefined,
+        // `@static` settings
+        prefix: testParams.prefix !== undefined ? testParams.prefix : undefined,
+        prune: testParams.prune !== undefined ? testParams.prune : false,
+        inventory: result,
+      }
+      staticDeployMod(params, callback)
     }
   })
 }
@@ -143,10 +138,10 @@ test(`Publish static deploy if @static is defined`, async () => {
       cleanupTmpDir(cwd)
       if (err) reject(err)
       else {
-        assert.strictEqual(published.Bucket, params.bucket, 'Bucket is unchanged')
+        assert.strictEqual(published.Bucket, 'a-bucket', 'Bucket is unchanged')
         assert.strictEqual(published.prefix, null, 'Prefix set to null by default')
         assert.strictEqual(published.prune, null, 'Prune set to null by default')
-        assert.strictEqual(published.region, params.region, 'Region is unchaged')
+        assert.strictEqual(published.region, 'us-west-1', 'Region is unchaged')
         resolve()
       }
     })
@@ -171,9 +166,9 @@ test(`Publish static deploy if @http is defined and public/ folder is present`,
 
 test(`Respect prune param`, async () => {
   setup()
+  testParams.prune = true
   let arc = '@app\n an-app\n @static'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
-  params.prune = true
   await new Promise((resolve, reject) => {
     staticDeploy(cwd, err => {
       cleanupTmpDir(cwd)
@@ -204,9 +199,9 @@ test(`Respect prune setting in project manifest`, async () => {
 
 test(`Respect prefix param`, async () => {
   setup()
+  testParams.prefix = 'some-prefix'
   let arc = '@app\n an-app\n @static'
   let cwd = createTmpDir({ 'app.arc': arc, 'public': {} })
-  params.prefix = 'some-prefix'
   await new Promise((resolve, reject) => {
     staticDeploy(cwd, err => {
       cleanupTmpDir(cwd)
@@ -236,6 +231,5 @@ test(`Respect prefix setting in project manifest`, async () => {
 })
 
 test('Teardown', () => {
-  reset()
   assert.ok(true, 'Done')
 })