Merge pull request #99 from conveyal/dev

v3.1.1

Author: trevorgerhardt

__mocks__/aws-sdk.js

@@ -0,0 +1,4 @@
+/* global jest */
+
+const AWS = module.exports = jest.genMockFromModule('aws-sdk')
+AWS.S3.prototype.upload = () => ({send: (fn) => fn()})

__tests__/lib/__snapshots__/test.js.snap

@@ -19,6 +19,7 @@ Object {
     "another-folder",
   ],
   "coverageDirectory": "coverage",
+  "notify": true,
   "setupFiles": Array [
     "beforeTestsSetup.js",
   ],

bin/mastarm

@@ -12,7 +12,6 @@ commander
   .option('-e, --env <environment>', 'Environment to use.')
   .option('-m, --minify', 'Minify built files.')
   .option('-O, --outdir <dir>', 'Publish directory', '')
-  .option('-S, --skip-check-dependencies', '**DEPRECATED**')
 
 commander
   .command('build [entries...]')
@@ -77,9 +76,10 @@ commander
       minify: get('minify'),
       s3bucket: get('s3bucket')
     }))).then(() => {
-      console.log('Finished pushing to s3')
+      console.log('Finished deploying!')
       process.exit(0)
     }).catch((err) => {
+      console.error('Error while deploying!')
       console.error(err.stack)
       process.exit(1)
     })

lib/__tests__/push-to-s3.js

@@ -0,0 +1,23 @@
+/* global describe, it */
+
+const BUILD_DIR = '__tests__/test-utils/tmp'
+const MOCK_DIR = '__tests__/test-utils/mocks'
+
+describe('lib > push to s3', () => {
+  const configPush = require('../push-to-s3')
+  const loadConfig = require('../load-config')
+
+  it('should compile JavaScript and CSS and send to s3 via aws-sdk', () => {
+    const config = loadConfig(process.cwd(), '~/mastarm/configurations/default', 'test')
+    const push = configPush({
+      env: 'test',
+      config,
+      minify: false,
+      s3bucket: 'test-bucket'
+    })
+    return Promise.all([
+      push([`${MOCK_DIR}/index.js`, `${BUILD_DIR}/index.js`]),
+      push([`${MOCK_DIR}/index.css`, `${BUILD_DIR}/index.css`])
+    ])
+  })
+})

lib/push-to-s3.js

@@ -54,8 +54,8 @@ function upload ({
     console.log('building and pushing %s to s3 bucket %s', outfile, bucket)
     s3object
       .upload()
-      .send(function (err, data) {
-        if (err) reject(err)
+      .send(function (err) {
+        if (err) return reject(err)
         console.log('finished pushing %s to s3', outfile)
 
         if (cloudfront) {
@@ -72,8 +72,8 @@ function upload ({
                 ]
               }
             }
-          }, function (err, data) {
-            if (err) reject(err)
+          }, function (err) {
+            if (err) return reject(err)
             done()
           })
         } else {

lib/test.js

@@ -7,6 +7,7 @@ module.exports.generateTestConfig = (patterns, options) => {
     collectCoverage: options.coverage,
     collectCoverageFrom: ['lib/**/*.js'],
     coverageDirectory: 'coverage',
+    notify: true,
     transform: { '.*': path.resolve(__dirname, 'jest-preprocessor.js') },
     testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/__tests__/test-utils']
   }
@@ -41,5 +42,6 @@ module.exports.generateTestConfig = (patterns, options) => {
   if (patterns) {
     jestArguments = jestArguments.concat(patterns)
   }
+
   return jestArguments
 }

package.json

@@ -61,7 +61,7 @@
     "mkdirp": "^0.5.1",
     "postcss": "^5.0.21",
     "postcss-cssnext": "^2.6.0",
-    "postcss-import": "^8.1.2",
+    "postcss-import": "^9.0.0",
     "postcss-reporter": "^2.0.0",
     "postcss-safe-parser": "^2.0.0",
     "rimraf": "^2.5.4",