diff --git a/lib/utils/aws.js b/lib/utils/aws.js index 1b72cec78..2c2f0c6b4 100644 --- a/lib/utils/aws.js +++ b/lib/utils/aws.js @@ -380,7 +380,7 @@ exports.cfCreateLambdasStack = function(JAWS, stage, region, lambdaRoleArn) { var _this = this, awsProfile = JAWS._meta.profile, projRootPath = JAWS._meta.projectRootPath, - bucketName = JAWS._this._JAWS.getJawsBucket(region, stage), + bucketName = JAWS.getJawsBucket(region, stage), projName = JAWS._meta.projectJson.name; _this.configAWS(awsProfile, region); diff --git a/tests/all.js b/tests/all.js index e5b195e09..16f6b629e 100644 --- a/tests/all.js +++ b/tests/all.js @@ -24,9 +24,9 @@ describe('AllTests', function() { * Tests below create AWS Resources */ //require('./cli/dash'); - //require('./cli/deploy_lambda'); + require('./cli/deploy_lambda'); //require('./cli/deploy_resources'); //require('./cli/deploy_endpoint'); //require('./cli/new_stage_region'); - require('./cli/new_project'); + //require('./cli/new_project'); }); \ No newline at end of file diff --git a/tests/cli/new_stage_region.js b/tests/cli/new_stage_region.js index b8e74d45c..f6d314d84 100644 --- a/tests/cli/new_stage_region.js +++ b/tests/cli/new_stage_region.js @@ -18,10 +18,6 @@ var config = require('../config'), projPath, JAWS; -var tempStage = 'temp-' + shortid.generate(); -var usEast1Region = 'us-east-1'; -var euWest1Region = 'eu-west-1'; - describe('Test "new stage/region" command', function() { before(function(done) { @@ -47,14 +43,13 @@ describe('Test "new stage/region" command', function() { it('Create New Stage', function(done) { this.timeout(0); - CmdNewStageRegion.run(JAWS, 'stage', tempStage, usEast1Region, config.usEast1Bucket, config.noExecuteCf) + CmdNewStageRegion.run(JAWS, 'stage', config.stage2, config.region, config.noExecuteCf) .then(function() { - var jawsJson = utils.readAndParseJsonSync(path.join(process.cwd(), '../jaws.json')); + var jawsJson = utils.readAndParseJsonSync(path.join(process.cwd(), 'jaws.json')); var region = false; - for (var i = 0; i < jawsJson.stages[tempStage].length; i++) { - var stage = jawsJson.stages[tempStage][i]; - console.log(jawsJson.stages[tempStage][i]); - if (stage.region === usEast1Region) { + for (var i = 0; i < jawsJson.stages[config.stage2].length; i++) { + var stage = jawsJson.stages[config.stage2][i]; + if (stage.region === config.region) { region = stage.region; } } @@ -72,13 +67,13 @@ describe('Test "new stage/region" command', function() { it('Create New region', function(done) { this.timeout(0); - CmdNewStageRegion.run(JAWS, 'region', tempStage, euWest1Region, config.euWest1Bucket, config.noExecuteCf) + CmdNewStageRegion.run(JAWS, 'region', config.stage2, config.region2, config.noExecuteCf) .then(function() { - var jawsJson = utils.readAndParseJsonSync(path.join(process.cwd(), '../jaws.json')); + var jawsJson = utils.readAndParseJsonSync(path.join(process.cwd(), 'jaws.json')); var region = false; - for (var i = 0; i < jawsJson.stages[tempStage].length; i++) { - var stage = jawsJson.stages[tempStage][i]; - if (stage.region === euWest1Region) { + for (var i = 0; i < jawsJson.stages[config.stage2].length; i++) { + var stage = jawsJson.stages[config.stage2][i]; + if (stage.region === config.region2) { region = stage.region; } }