Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes escaping of double-quotes around string value #4224

Merged
merged 3 commits into from Sep 11, 2017
Merged

Removes escaping of double-quotes around string value #4224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b00ad4e
Removes escaping of double-quotes around string value
lorengordon Sep 7, 2017
6088c9f
Updates string syntax tests to call functions under test
lorengordon Sep 7, 2017
9746de3
Expects string variables to fulfill promise
lorengordon Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/classes/Variables.js
View file
Open in desktop
Expand Up @@ -203,7 +203,7 @@ class Variables {
}

getValueFromString(variableString) {
const valueToPopulate = variableString.replace(/'/g, '');
const valueToPopulate = variableString.replace(/^['"]|['"]$/g, '');
return BbPromise.resolve(valueToPopulate);
}

Expand Down
44 changes: 15 additions & 29 deletions lib/classes/Variables.test.js
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
const path = require('path');
const proxyquire = require('proxyquire');
const YAML = require('js-yaml');
const expect = require('chai').expect;
const chai = require('chai');
const Variables = require('../../lib/classes/Variables');
const Utils = require('../../lib/classes/Utils');
const Serverless = require('../../lib/Serverless');
Expand All @@ -14,6 +14,10 @@ const AwsProvider = require('../plugins/aws/provider/awsProvider');
const BbPromise = require('bluebird');
const os = require('os');

chai.use(require('chai-as-promised'));

const expect = chai.expect;

describe('Variables', () => {
describe('#constructor()', () => {
const serverless = new Serverless();
Expand Down Expand Up @@ -160,45 +164,27 @@ describe('Variables', () => {
it('should allow a single-quoted string if overwrite syntax provided', () => {
const serverless = new Serverless();
const property = "my stage is ${opt:stage, 'prod'}";
serverless.variables.options = {
stage: undefined,
};

serverless.variables.loadVariableSyntax();

const overwriteStub = sinon
.stub(serverless.variables, 'overwrite').resolves('\'prod\'');
const populateVariableStub = sinon
.stub(serverless.variables, 'populateVariable').resolves('my stage is prod');

return serverless.variables.populateProperty(property).then(newProperty => {
expect(overwriteStub.called).to.equal(true);
expect(populateVariableStub.called).to.equal(true);
expect(newProperty).to.equal('my stage is prod');

serverless.variables.overwrite.restore();
serverless.variables.populateVariable.restore();
return BbPromise.resolve();
});
return expect(serverless.variables.populateProperty(property)).to.be.fulfilled
.then(newProperty => expect(newProperty).to.equal('my stage is prod'));
});

it('should allow a double-quoted string if overwrite syntax provided', () => {
const serverless = new Serverless();
const property = 'my stage is ${opt:stage, "prod"}';
serverless.variables.options = {
stage: undefined,
};

serverless.variables.loadVariableSyntax();

const overwriteStub = sinon
.stub(serverless.variables, 'overwrite').resolves('\'prod\'');
const populateVariableStub = sinon
.stub(serverless.variables, 'populateVariable').resolves('my stage is prod');

return serverless.variables.populateProperty(property).then(newProperty => {
expect(overwriteStub.called).to.equal(true);
expect(populateVariableStub.called).to.equal(true);
expect(newProperty).to.equal('my stage is prod');

serverless.variables.overwrite.restore();
serverless.variables.populateVariable.restore();
return BbPromise.resolve();
});
return expect(serverless.variables.populateProperty(property)).to.be.fulfilled
.then(newProperty => expect(newProperty).to.equal('my stage is prod'));
});

it('should call getValueFromSource if no overwrite syntax provided', () => {
Expand Down