archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

fixed issue 2500

Browse Source
This commit is contained in:
horike37 2016-10-23 19:19:14 +09:00
parent 866ae8d01d
commit bdc5170d43
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/Variables.js
View File

@ -75,9 +75,10 @@ class Variables {
populateVariable(propertyParam, matchedString, valueToPopulate) {
let property = propertyParam;
if (typeof valueToPopulate === 'string') {
property = replaceall(matchedString, valueToPopulate, property);
} else if (typeof valueToPopulate === 'number') {
property = replaceall(matchedString, String(valueToPopulate), property);
} else {
if (property !== matchedString) {
const errorMessage = [

15
lib/classes/Variables.test.js
View File

@ -155,22 +155,21 @@ describe('Variables', () => {
expect(newProperty).to.equal('my stage is dev');
});
it('should populate non string variables', () => {
it('should populate number variables as sub string', () => {
const serverless = new Serverless();
const valueToPopulate = 5;
const matchedString = '${opt:number}';
const property = '${opt:number}';
const property = 'your account number is ${opt:number}';
const newProperty = serverless.variables
.populateVariable(property, matchedString, valueToPopulate);
expect(newProperty).to.equal(5);
expect(newProperty).to.equal('your account number is 5');
});
it('should throw error if populating non string variable as sub string', () => {
it('should throw error if populating non string or non number variable as sub string', () => {
const serverless = new Serverless();
const valueToPopulate = 5;
const matchedString = '${opt:number}';
const property = 'hello ${opt:number}';
const valueToPopulate = {};
const matchedString = '${opt:object}';
const property = 'your account number is ${opt:object}';
expect(() => serverless.variables
.populateVariable(property, matchedString, valueToPopulate))
.to.throw(Error);