fix: extend tslint test to cover all test files (#588)

alexa · Oct 30, 2019 · b142590 · b142590
1 parent 55da659
commit b142590
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 7 deletions.
diff --git a/ask-sdk-core/gulpfile-base.js b/ask-sdk-core/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');

diff --git a/ask-sdk-core/tst/util/RequestEnvelopeUtil.spec.ts b/ask-sdk-core/tst/util/RequestEnvelopeUtil.spec.ts
@@ -21,15 +21,15 @@ import {
     getAccountLinkingAccessToken,
     getApiAccessToken,
     getDeviceId,
-    getUserId,
     getDialogState,
     getIntentName,
-    getRequest,
     getLocale,
+    getRequest,
     getRequestType,
     getSlot,
     getSlotValue,
     getSupportedInterfaces,
+    getUserId,
     isNewSession,
 } from '../../lib/util/RequestEnvelopeUtils';
 import { JsonProvider } from '../mocks/JsonProvider';
@@ -46,7 +46,7 @@ describe('RequestEnvelopeUtils', () => {
             markupVersion : '1.0',
         },
     };
-    requestEnvelope.context.System.user.userId = 'mockUserId'
+    requestEnvelope.context.System.user.userId = 'mockUserId';
 
     const intentRequestEnvelope : RequestEnvelope = JsonProvider.requestEnvelope();
     intentRequestEnvelope.request.type = 'IntentRequest';
@@ -89,7 +89,7 @@ describe('RequestEnvelopeUtils', () => {
     });
 
     it('should return the intent request object', () => {
-        const request = getRequest<IntentRequest>(intentRequestEnvelope)
+        const request = getRequest<IntentRequest>(intentRequestEnvelope);
         expect(request).deep.eq({
             type: 'IntentRequest',
             requestId: null,
@@ -132,8 +132,8 @@ describe('RequestEnvelopeUtils', () => {
     });
 
     it('should return null if there is no user info', () => {
-        const requestEnvelopeWithNoUser = Object.assign({}, requestEnvelope)
-        delete requestEnvelopeWithNoUser.context.System.user
+        const requestEnvelopeWithNoUser = { ...requestEnvelope };
+        delete requestEnvelopeWithNoUser.context.System.user;
         expect(getUserId(requestEnvelopeWithNoUser)).eq(null);
     });
 

diff --git a/ask-sdk-dynamodb-persistence-adapter/gulpfile-base.js b/ask-sdk-dynamodb-persistence-adapter/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');

diff --git a/ask-sdk-express-adapter/gulpfile-base.js b/ask-sdk-express-adapter/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');

diff --git a/ask-sdk-runtime/gulpfile-base.js b/ask-sdk-runtime/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');

diff --git a/ask-sdk-runtime/tst/util/AskSdkUtils.spec.ts b/ask-sdk-runtime/tst/util/AskSdkUtils.spec.ts
@@ -29,7 +29,7 @@ describe('AskSdkUtils', () => {
     });
 
     it('should be able to create user agent string', () => {
-        const userAgent = createAskSdkUserAgent('2.0.0',undefined);
+        const userAgent = createAskSdkUserAgent('2.0.0', undefined);
 
         expect(userAgent).equal(`ask-node/2.0.0 Node/${process.version}`);
     });

diff --git a/ask-sdk-s3-persistence-adapter/gulpfile-base.js b/ask-sdk-s3-persistence-adapter/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');

diff --git a/ask-sdk-v1adapter/gulpfile-base.js b/ask-sdk-v1adapter/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');

diff --git a/ask-sdk/gulpfile-base.js b/ask-sdk/gulpfile-base.js
@@ -13,8 +13,10 @@ module.exports = {
   tslint : (done) => {
     const tslintPath = path.normalize('./node_modules/.bin/tslint');
     const command = `${tslintPath} -p tsconfig.json -c tslint.json`;
+    const commandForTests = `${tslintPath} ./tst/**/*.ts -c tslint.json`;
 
     exec(command, done);
+    exec(commandForTests, done);
   },
   test : (done) => {
     const nycPath = path.normalize('./node_modules/.bin/nyc');