Skip to content

Commit

Permalink
Merge pull request #34 from wei-lee/support-node10
Browse files Browse the repository at this point in the history
update module to support node10
  • Loading branch information
Wei Li authored Aug 22, 2018
2 parents d4d51c2 + a4c226a commit 06c1010
Show file tree
Hide file tree
Showing 12 changed files with 9,771 additions and 1,266 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: node_js
node_js:
- 4
- 6
- 8
- 10
sudo: required
before_install:
- sudo apt-get update
Expand Down
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ module.exports = function(grunt) {
// Just set shell commands for running different types of tests
// the NO_FLUSH_TIMER env var stops the reporting flush interval function from being set up and
grunt.initConfig({
_test_runner: 'turbo',
_unit_args: './test/unit',
_accept_args: '--setUp ./test/setup.js --tearDown ./test/setup.js ./test/accept',
_test_runner: 'mocha',
_unit_args: '-A -u exports --recursive -t 10000 ./test/unit',
_accept_args: '-A -u exports --recursive -t 10000 ./test/setup.js ./test/accept',

// These are the properties that grunt-fh-build will use
unit: 'NO_FLUSH_TIMER=true <%= _test_runner %> <%= _unit_args %>',
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// https://github.com/feedhenry/fh-pipeline-library
@Library('fh-pipeline-library') _

node('nodejs4') {
node('nodejs6-ubuntu') {

step([$class: 'WsCleanup'])

Expand Down
1 change: 1 addition & 0 deletions lib/cloud/cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var paramsUtils = require('./params');
var headersUtils = require('../common/headers');
var parseHeaders = require('../common/parseFHHeaders');
var multer = require('multer');
var feedhenryReporting = require('./fh-reports');

var mainjs;

Expand Down
4 changes: 2 additions & 2 deletions lib/errorHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var util = require('util');
var url = require('url');
var messaging = require('./common/message.js')();
var request = require('request');
var mbaasClient = require('fh-mbaas-client');
var MbaasClientModule = require('fh-mbaas-client');
var fhreports = require('./cloud/fh-reports.js');

process.on('uncaughtException', function(err) {
Expand Down Expand Up @@ -110,7 +110,7 @@ function putErrorOnBus(mess, cb) {
function createMBaasEvent(params, cb) {

// Init the env prior to mbaas call
mbaasClient.initEnvironment(params.env, {
var mbaasClient = new MbaasClientModule(params.env, {
url: url.format(params.protocol + '://' + params.host),
accessKey: params.envAccessKey,
project: params.project,
Expand Down
Loading

0 comments on commit 06c1010

Please sign in to comment.