fixed http tests and changed some flags

Author: xavdid

commands/pull.js

@@ -6,14 +6,15 @@ const merge = require('../util/merge')
 const file = require('../util/file')
 
 function * pull (context, heroku) {
-  let fname = context.flags.env // this gets defaulted in read
+  let fname = context.flags.file // this gets defaulted in read
   let config = yield {
     remote: heroku.get(`/apps/${context.app}/config-vars`),
     local: file.read(fname)
   }
   // cli.debug(config)
   let res = merge(config.remote, config.local, context.flags)
   yield file.write(res, fname)
+// write handles success message
 }
 
 module.exports = {

commands/push.js

@@ -6,18 +6,14 @@ const merge = require('../util/merge')
 const file = require('../util/file')
 
 function * pull (context, heroku) {
-  let fname = context.flags.env // this gets defaulted in read
+  let fname = context.flags.file // this gets defaulted in read
   let config = yield {
     remote: heroku.get(`/apps/${context.app}/config-vars`),
     local: file.read(fname)
   }
   // cli.debug(config)
   let res = merge(config.local, config.remote, context.flags)
-  try {
-    yield heroku.patch(`/apps/${context.app}/config-vars`, res)
-  } catch (e) {
-    cli.error(`There was a problem saving to heroku: ${e.message}`)
-  }
+  yield heroku.patch(`/apps/${context.app}/config-vars`, res)
   cli.log('Successuflly wrote settings to heroku!')
 }
 

package.json

@@ -33,6 +33,6 @@
     "mock-fs": "^3.9.0",
     "nock": "^8.0.0",
     "rewire": "^2.5.1",
-    "standard": "^6.0.8"
+    "standard": "^7.0.0"
   }
 }

test.js

@@ -23,21 +23,20 @@ const header = file.__get__('header')
 const fs = require('fs')
 
 // HELPERS
-function fetch_cmd (name) {
+function fetchCMD (name) {
   return commands.find((c) => c.command === name)
 }
 
 function setup () {
   cli.raiseErrors = true
 }
 
-function default_fs () {
+function defaultFS () {
   // this is so I can setup without affecting other tests
   return {
     '.env': fixtures.local_file,
     'other.txt': fixtures.local_file,
-    'dnt': mock.file({mode: '000'}),
-    totally: {}
+    'dnt': mock.file({mode: '000'})
   }
 }
 
@@ -62,12 +61,14 @@ let fixtures = {
     DB_STRING: 'mongo://blah@thing.mongo.thing.com:4567',
     NAME: 'david'
   },
+
   local_file: '#comment\nNODE_ENV=test\nSOURCE=local\n\nDB_STRING=mongo://blah@thing.mongo.thing.com:4567\n',
   merged_local_file: header + 'DB_STRING="mongo://blah@thing.mongo.thing.com:4567"\nNAME="david"\nNODE_ENV="test"\nSOURCE="local"\n',
+
   // test both quote styles
-  sample_file: header + 'NAME="david"\n\n#this is a comment!\nCITY=boulder\n\n\n',
-  clean_sample_file: header + 'CITY="boulder"\nNAME="david"\n',
-  sample_obj: { NAME: 'david', CITY: 'boulder' }
+  sample_file: header + 'PIZZA="Abo\'s"\nNAME="david"\n\n#this is a comment!\nCITY=boulder\n\n\n',
+  clean_sample_file: header + 'CITY="boulder"\nNAME="david"\nPIZZA="Abo\'s"\n',
+  sample_obj: { NAME: 'david', CITY: 'boulder', PIZZA: "Abo's" }
 }
 
 // TESTS
@@ -92,7 +93,7 @@ describe('Merging', () => {
 
 describe('Reading', () => {
   beforeEach(() => {
-    mock(default_fs())
+    mock(defaultFS())
   })
 
   it('should return empty object from non-existant file', () => {
@@ -111,20 +112,19 @@ describe('Reading', () => {
 describe('Writing', () => {
   beforeEach(() => {
     cli.mockConsole()
-    mock(default_fs())
+    mock(defaultFS())
   })
 
   it('should fail to read from a file it lacks permissions for', () => {
-    return file.write({}, 'dnt').then(() => {
-      expect(cli.stderr).to.contain('EACCES, permission denied')
-    })
+    return expect(file.write({}, 'dnt')).to.be.rejectedWith(Error)
   })
 
-  // it('should successfully write a file', () => {
-  //   return file.write(fixtures.local_obj).then(() => {
-  //     let res = require('fs').readFileSync('.env')
-  //   })
-  // })
+  it('should successfully write a file', () => {
+    return file.write(fixtures.sample_obj).then(() => {
+      let res = fs.readFileSync('.env', 'utf-8')
+      expect(res).to.equal(fixtures.clean_sample_file)
+    })
+  })
 
   afterEach(() => {
     mock.restore()
@@ -133,40 +133,64 @@ describe('Writing', () => {
 
 describe('Transforming', () => {
   it('should decode files correctly', () => {
-    expect(file.__get__('obj_from_file_format')(fixtures.sample_file)).to.deep.equal(fixtures.sample_obj)
+    expect(file.__get__('objFromFileFormat')(fixtures.sample_file)).to.deep.equal(fixtures.sample_obj)
   })
 
   it('should encode file correctly', () => {
-    expect(file.__get__('obj_to_file_format')(fixtures.sample_obj)).to.equal(fixtures.clean_sample_file)
+    expect(file.__get__('objToFileFormat')(fixtures.sample_obj)).to.equal(fixtures.clean_sample_file)
   })
 })
 
-// describe('Pushing', {skip: true}, (t) => {
-//   let api_get = nock('https://api.heroku.com:443')
-//     .get('/apps/test/config-vars')
-//     .reply(200, remote)
+describe('Pushing', () => {
+  beforeEach(() => {
+    cli.mockConsole()
+    mock(defaultFS())
+  })
+
+  it('should correctly push configs w/ flags', () => {
+    nock('https://api.heroku.com:443')
+      .get('/apps/test/config-vars')
+      .reply(200, fixtures.remote_obj)
+
+    // this will fail if we don't pass the correct body, as intended
+    nock('https://api.heroku.com:443')
+      .patch('/apps/test/config-vars', fixtures.remote_win_obj)
+      .reply(200, fixtures.remote_win_obj)
 
-//   let api_patch = nock('https://api.heroku.com:443')
-//     .patch('/apps/test/config-vars')
-//     .reply(200, remote_win_obj)
+    // fetch the updated value
+    nock('https://api.heroku.com:443')
+      .get('/apps/test/config-vars')
+      .reply(200, fixtures.remote_win_obj)
+
+    let cmd = fetchCMD('mypush')
+    let fname = 'other.txt'
+    return cmd.run({flags: {file: fname}, app: 'test'}).then(() => {
+      return cli.got('https://api.heroku.com:443/apps/test/config-vars')
+    }).then((res) => {
+      expect(JSON.parse(res.body)).to.deep.equal(fixtures.remote_win_obj)
+    })
+  })
 
-//   let cmd = fetch_cmd('mypush')
-// })
+  afterEach(() => {
+    mock.restore()
+  })
+})
 
 describe('Pulling', () => {
   beforeEach(() => {
     cli.mockConsole()
-    mock(default_fs())
+    mock(defaultFS())
   })
 
   it('should correctly pull configs', () => {
     nock('https://api.heroku.com:443')
       .get('/apps/test/config-vars')
       .reply(200, fixtures.remote_obj)
 
-    let cmd = fetch_cmd('mypull')
-    return cmd.run({flags: {}, app: 'test'}).then(() => {
-      let res = fs.readFileSync('.env', 'utf-8')
+    let cmd = fetchCMD('mypull')
+    let fname = 'other.txt'
+    return cmd.run({flags: {file: fname}, app: 'test'}).then(() => {
+      let res = fs.readFileSync(fname, 'utf-8')
       expect(res).to.include(fixtures.merged_local_file)
     })
   })

util/file.js

@@ -7,7 +7,7 @@ const cli = require('heroku-cli-util')
 const DEFAULT_FNAME = '.env'
 const header = '# this file was creatd automatically by heroku-config\n\n'
 
-function obj_to_file_format (obj) {
+function objToFileFormat (obj) {
   let res = `${header}`
   // always write keys alphabetically
   // makes file writing deterministic
@@ -19,7 +19,7 @@ function obj_to_file_format (obj) {
   return res
 }
 
-function obj_from_file_format (s) {
+function objFromFileFormat (s) {
   let res = {}
   let data = s.split('\n')
   data.forEach(function (v) {
@@ -40,7 +40,7 @@ module.exports = {
     fname = fname || DEFAULT_FNAME
     // let data = fs.readFileSync(fname, 'utf-8')
     return fs.readFile(fname, 'utf-8').then((data) => {
-      return Promise.resolve(obj_from_file_format(data))
+      return Promise.resolve(objFromFileFormat(data))
     }).catch(() => {
       // cli.warning(`WARN - Unable to read from ${fname}`)
       // if it doesn't exist or we can't read, just start from scratch
@@ -49,13 +49,10 @@ module.exports = {
   },
   write: (obj, fname) => {
     fname = fname || DEFAULT_FNAME
-    return fs.writeFile(fname, obj_to_file_format(obj)).then(() => {
+    return fs.writeFile(fname, objToFileFormat(obj)).then(() => {
       cli.log(`Successfully wrote config to ${fname}!`)
     }).catch((err) => {
-      cli.error(`Error writing to file ${fname} (${err.message})`)
-    // return Promise.reject()
-    // dunno if i actually need to throw this
-    // throw new Error()
+      throw new Error(`Error writing to file ${fname} (${err.message})`)
     })
   }
 }

util/flags.js

@@ -1,15 +1,16 @@
 // command line args
 
 module.exports = [{
-  name: 'env',
-  char: 'e',
+  name: 'file',
+  char: 'f',
   hasValue: true,
   description: 'specify target filename'
 }, {
-  name: 'interactive',
-  char: 'i',
-  description: 'prompt whether to overwrite each config var'
-}, {
+  // i'll do this later
+  //   name: 'interactive',
+  //   char: 'i',
+  //   description: 'prompt whether to overwrite each config var'
+  // }, {
   name: 'overwrite',
   char: 'o',
   description: 'overwrite existing config vars'