edited test cases

updated test cases for logs to match the enhancement
serverless-heaven · Jan 5, 2018 · 22000b3 · 22000b3
1 parent f230c79
commit 22000b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/lib/logs.js b/lib/logs.js
@@ -77,9 +77,15 @@ module.exports = {
 						throw new this.serverless.classes
 							.Error('No existing streams for the function alias');
 					}
-					return _.map(
+					const logStreamNames = _.map(
 						_.filter(reply.logStreams, stream => _.includes(stream.logStreamName, `[${version}]`)),
 						stream => stream.logStreamName);
+
+					if (_.isEmpty(logStreamNames)) {
+						return BbPromise.reject(new this.serverless.classes
+							.Error('No existing streams for the latest version of function alias. If you want to view logs of a specific function version, please use --version to specify'));
+					}
+					return logStreamNames
 				});
 		});
 
@@ -125,10 +131,6 @@ module.exports = {
 	},
 
 	functionLogsShowLogs(logStreamNames) {
-		if (_.isEmpty(logStreamNames)) {
-			return BbPromise.reject(new this.serverless.classes
-				.Error('No existing streams for the latest version of function alias. If you want to view logs of a specific function version, please use --version to specify'));
-		}
 		const formatLambdaLogEvent = event => {
 			const msgParam = event.message;
 			let msg = msgParam;

diff --git a/test/logs.test.js b/test/logs.test.js
@@ -23,7 +23,7 @@ describe('logs', () => {
 	let sandbox;
 	let providerRequestStub;
 	let logStub;
-	let aliasGetAliasFunctionVersionsStub;
+	let aliasGetAliasLatestFunctionVersionByFunctionNameStub;
 	let aliasStacksDescribeResourceStub;
 
 	before(() => {
@@ -45,7 +45,7 @@ describe('logs', () => {
 		awsAlias = new AWSAlias(serverless, options);
 		providerRequestStub = sandbox.stub(awsAlias._provider, 'request');
 		logStub = sandbox.stub(serverless.cli, 'log');
-		aliasGetAliasFunctionVersionsStub = sandbox.stub(awsAlias, 'aliasGetAliasFunctionVersions');
+		aliasGetAliasLatestFunctionVersionByFunctionNameStub = sandbox.stub(awsAlias, 'aliasGetAliasLatestFunctionVersionByFunctionName');
 		aliasStacksDescribeResourceStub = sandbox.stub(awsAlias, 'aliasStacksDescribeResource');
 
 		logStub.returns();
@@ -206,12 +206,7 @@ describe('logs', () => {
 				],
 			};
 			providerRequestStub.resolves(streamReply);
-			aliasGetAliasFunctionVersionsStub.returns(BbPromise.resolve([
-				{
-					functionName: 'func1',
-					functionVersion: '20'
-				}
-			]));
+			aliasGetAliasLatestFunctionVersionByFunctionNameStub.returns(BbPromise.resolve('20'));
 			awsAlias._lambdaName = 'func1';
 
 			return expect(awsAlias.logsGetLogStreams()).to.be.fulfilled
@@ -239,7 +234,7 @@ describe('logs', () => {
 
 		it('should throw error if no log streams found', () => {
 			providerRequestStub.resolves();
-			aliasGetAliasFunctionVersionsStub.returns(BbPromise.resolve([]));
+			aliasGetAliasLatestFunctionVersionByFunctionNameStub.returns(BbPromise.resolve(null));
 
 			return expect(awsAlias.logsGetLogStreams()).to.be.rejectedWith("");
 		});