chore: minor tweak

horike37 · horike37 · commit f7671b0ef2de · 2019-09-03T16:16:00.000+09:00
diff --git a/lib/apiGateway/validate.test.js b/lib/apiGateway/validate.test.js
@@ -1330,7 +1330,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw if "tableName" is not a string or an AWS intrinsic "Ref" function', () => {
+    it('should throw if the "tableName" is not a string or an AWS intrinsic "Ref" function', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1349,7 +1349,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw if "tableName" is set to an object that is not an AWS intrinsic Ref function', () => {
+    it('should throw if the "tableName" is set to an object that is not an AWS intrinsic Ref function', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1367,7 +1367,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should not throw error if tableName is a string', () => {
+    it('should not throw error if the "tableName" is a string', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1383,7 +1383,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should not throw error if tableName is an AWS intrinsic Ref function', () => {
+    it('should not throw error if the "tableName" is an AWS intrinsic Ref function', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1399,23 +1399,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should not throw error if tableName is an AWS intrinsic Ref function', () => {
-      serverlessApigatewayServiceProxy.serverless.service.custom = {
-        apiGatewayServiceProxies: [
-          {
-            dynamodb: {
-              tableName: { Ref: 'DynamodbTableResourceId' },
-              path: 'dynamodb',
-              method: 'put'
-            }
-          }
-        ]
-      }
-
-      expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
-    })
-
-    it('should throw error if the "hashKey" property is missing when the method is post and the action is not given', () => {
+    it('should throw error if the "hashKey" is missing when the method is post and the action is not given', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1433,7 +1417,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw error if the "hashKey" property is not a string when the method is post and the action is not given', () => {
+    it('should throw error if the "hashKey" is not a string when the method is post and the action is not given', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1455,7 +1439,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw error if the "rangeKey" property is not a string when the method is post and the action is not given', () => {
+    it('should throw error if the "rangeKey" is not a string when the method is post and the action is not given', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1478,7 +1462,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should not throw error if the "hashKey" property is missing when the method is post and the action is given', () => {
+    it('should not throw error if the "hashKey" is missing when the method is post and the action is given', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1495,7 +1479,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should throw error if the "action" property is an invalid type given', () => {
+    it('should throw error if the "action" is an invalid type given', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1514,7 +1498,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw error if hashKey is not a string or an object', () => {
+    it('should throw error if the "hashKey" is not a string or an object', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1533,7 +1517,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should not throw error if hashKey is a string', () => {
+    it('should not throw error if the "hashKey" is a string', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1550,7 +1534,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should not throw error if hashKey is a pathParam', () => {
+    it('should not throw error if the "hashKey" is a pathParam', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1567,7 +1551,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should not throw error if hashKey is a queryStringParam', () => {
+    it('should not throw error if the "hashKey" is a queryStringParam', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1584,7 +1568,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should throw error if hashKey is not an attributeType and is an object', () => {
+    it('should throw error if the "hashKey" is not an attributeType', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1603,7 +1587,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw error if hashKey is a pathParam and a queryStringParam at the same time', () => {
+    it('should throw error if the "hashKey" is a pathParam and a queryStringParam at the same time', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1622,7 +1606,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw error if rangeKey is not a string or an object', () => {
+    it('should throw error if the "rangeKey" is not a string or an object', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1642,7 +1626,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should not throw error if rangeKey is a string', () => {
+    it('should not throw error if the "rangeKey" is a string', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1660,7 +1644,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should not throw error if rangeKey is a pathParam', () => {
+    it('should not throw error if the "rangeKey" is a pathParam', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1678,7 +1662,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should not throw error if rangeKey is a queryStringParam', () => {
+    it('should not throw error if the "rangeKey" is a queryStringParam', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1696,7 +1680,7 @@ describe('#validateServiceProxies()', () => {
       expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()
     })
 
-    it('should throw error if rangeKey is not an attributeType and is an object', () => {
+    it('should throw error if the "rangeKey" is not an attributeType', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {
@@ -1716,7 +1700,7 @@ describe('#validateServiceProxies()', () => {
       )
     })
 
-    it('should throw error if rangeKey is a pathParam and a queryStringParam at the same time', () => {
+    it('should throw error if the "rangeKey" is a pathParam and a queryStringParam at the same time', () => {
       serverlessApigatewayServiceProxy.serverless.service.custom = {
         apiGatewayServiceProxies: [
           {

Original file line number	Diff line number	Diff line change
`@@ -1330,7 +1330,7 @@ describe('#validateServiceProxies()', () => {`
`1330`	`1330`	`)`
`1331`	`1331`	`})`
`1332`	`1332`
`1333`		`- it('should throw if "tableName" is not a string or an AWS intrinsic "Ref" function', () => {`
	`1333`	`+ it('should throw if the "tableName" is not a string or an AWS intrinsic "Ref" function', () => {`
`1334`	`1334`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1335`	`1335`	`apiGatewayServiceProxies: [`
`1336`	`1336`	`{`
`@@ -1349,7 +1349,7 @@ describe('#validateServiceProxies()', () => {`
`1349`	`1349`	`)`
`1350`	`1350`	`})`
`1351`	`1351`
`1352`		`- it('should throw if "tableName" is set to an object that is not an AWS intrinsic Ref function', () => {`
	`1352`	`+ it('should throw if the "tableName" is set to an object that is not an AWS intrinsic Ref function', () => {`
`1353`	`1353`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1354`	`1354`	`apiGatewayServiceProxies: [`
`1355`	`1355`	`{`
`@@ -1367,7 +1367,7 @@ describe('#validateServiceProxies()', () => {`
`1367`	`1367`	`)`
`1368`	`1368`	`})`
`1369`	`1369`
`1370`		`- it('should not throw error if tableName is a string', () => {`
	`1370`	`+ it('should not throw error if the "tableName" is a string', () => {`
`1371`	`1371`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1372`	`1372`	`apiGatewayServiceProxies: [`
`1373`	`1373`	`{`
`@@ -1383,7 +1383,7 @@ describe('#validateServiceProxies()', () => {`
`1383`	`1383`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1384`	`1384`	`})`
`1385`	`1385`
`1386`		`- it('should not throw error if tableName is an AWS intrinsic Ref function', () => {`
	`1386`	`+ it('should not throw error if the "tableName" is an AWS intrinsic Ref function', () => {`
`1387`	`1387`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1388`	`1388`	`apiGatewayServiceProxies: [`
`1389`	`1389`	`{`
`@@ -1399,23 +1399,7 @@ describe('#validateServiceProxies()', () => {`
`1399`	`1399`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1400`	`1400`	`})`
`1401`	`1401`
`1402`		`- it('should not throw error if tableName is an AWS intrinsic Ref function', () => {`
`1403`		`- serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1404`		`- apiGatewayServiceProxies: [`
`1405`		`- {`
`1406`		`- dynamodb: {`
`1407`		`- tableName: { Ref: 'DynamodbTableResourceId' },`
`1408`		`- path: 'dynamodb',`
`1409`		`- method: 'put'`
`1410`		`- }`
`1411`		`- }`
`1412`		`- ]`
`1413`		`- }`
`1414`		`-`
`1415`		`- expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1416`		`- })`
`1417`		`-`
`1418`		`- it('should throw error if the "hashKey" property is missing when the method is post and the action is not given', () => {`
	`1402`	`+ it('should throw error if the "hashKey" is missing when the method is post and the action is not given', () => {`
`1419`	`1403`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1420`	`1404`	`apiGatewayServiceProxies: [`
`1421`	`1405`	`{`
`@@ -1433,7 +1417,7 @@ describe('#validateServiceProxies()', () => {`
`1433`	`1417`	`)`
`1434`	`1418`	`})`
`1435`	`1419`
`1436`		`- it('should throw error if the "hashKey" property is not a string when the method is post and the action is not given', () => {`
	`1420`	`+ it('should throw error if the "hashKey" is not a string when the method is post and the action is not given', () => {`
`1437`	`1421`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1438`	`1422`	`apiGatewayServiceProxies: [`
`1439`	`1423`	`{`
`@@ -1455,7 +1439,7 @@ describe('#validateServiceProxies()', () => {`
`1455`	`1439`	`)`
`1456`	`1440`	`})`
`1457`	`1441`
`1458`		`- it('should throw error if the "rangeKey" property is not a string when the method is post and the action is not given', () => {`
	`1442`	`+ it('should throw error if the "rangeKey" is not a string when the method is post and the action is not given', () => {`
`1459`	`1443`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1460`	`1444`	`apiGatewayServiceProxies: [`
`1461`	`1445`	`{`
`@@ -1478,7 +1462,7 @@ describe('#validateServiceProxies()', () => {`
`1478`	`1462`	`)`
`1479`	`1463`	`})`
`1480`	`1464`
`1481`		`- it('should not throw error if the "hashKey" property is missing when the method is post and the action is given', () => {`
	`1465`	`+ it('should not throw error if the "hashKey" is missing when the method is post and the action is given', () => {`
`1482`	`1466`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1483`	`1467`	`apiGatewayServiceProxies: [`
`1484`	`1468`	`{`
`@@ -1495,7 +1479,7 @@ describe('#validateServiceProxies()', () => {`
`1495`	`1479`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1496`	`1480`	`})`
`1497`	`1481`
`1498`		`- it('should throw error if the "action" property is an invalid type given', () => {`
	`1482`	`+ it('should throw error if the "action" is an invalid type given', () => {`
`1499`	`1483`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1500`	`1484`	`apiGatewayServiceProxies: [`
`1501`	`1485`	`{`
`@@ -1514,7 +1498,7 @@ describe('#validateServiceProxies()', () => {`
`1514`	`1498`	`)`
`1515`	`1499`	`})`
`1516`	`1500`
`1517`		`- it('should throw error if hashKey is not a string or an object', () => {`
	`1501`	`+ it('should throw error if the "hashKey" is not a string or an object', () => {`
`1518`	`1502`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1519`	`1503`	`apiGatewayServiceProxies: [`
`1520`	`1504`	`{`
`@@ -1533,7 +1517,7 @@ describe('#validateServiceProxies()', () => {`
`1533`	`1517`	`)`
`1534`	`1518`	`})`
`1535`	`1519`
`1536`		`- it('should not throw error if hashKey is a string', () => {`
	`1520`	`+ it('should not throw error if the "hashKey" is a string', () => {`
`1537`	`1521`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1538`	`1522`	`apiGatewayServiceProxies: [`
`1539`	`1523`	`{`
`@@ -1550,7 +1534,7 @@ describe('#validateServiceProxies()', () => {`
`1550`	`1534`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1551`	`1535`	`})`
`1552`	`1536`
`1553`		`- it('should not throw error if hashKey is a pathParam', () => {`
	`1537`	`+ it('should not throw error if the "hashKey" is a pathParam', () => {`
`1554`	`1538`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1555`	`1539`	`apiGatewayServiceProxies: [`
`1556`	`1540`	`{`
`@@ -1567,7 +1551,7 @@ describe('#validateServiceProxies()', () => {`
`1567`	`1551`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1568`	`1552`	`})`
`1569`	`1553`
`1570`		`- it('should not throw error if hashKey is a queryStringParam', () => {`
	`1554`	`+ it('should not throw error if the "hashKey" is a queryStringParam', () => {`
`1571`	`1555`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1572`	`1556`	`apiGatewayServiceProxies: [`
`1573`	`1557`	`{`
`@@ -1584,7 +1568,7 @@ describe('#validateServiceProxies()', () => {`
`1584`	`1568`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1585`	`1569`	`})`
`1586`	`1570`
`1587`		`- it('should throw error if hashKey is not an attributeType and is an object', () => {`
	`1571`	`+ it('should throw error if the "hashKey" is not an attributeType', () => {`
`1588`	`1572`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1589`	`1573`	`apiGatewayServiceProxies: [`
`1590`	`1574`	`{`
`@@ -1603,7 +1587,7 @@ describe('#validateServiceProxies()', () => {`
`1603`	`1587`	`)`
`1604`	`1588`	`})`
`1605`	`1589`
`1606`		`- it('should throw error if hashKey is a pathParam and a queryStringParam at the same time', () => {`
	`1590`	`+ it('should throw error if the "hashKey" is a pathParam and a queryStringParam at the same time', () => {`
`1607`	`1591`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1608`	`1592`	`apiGatewayServiceProxies: [`
`1609`	`1593`	`{`
`@@ -1622,7 +1606,7 @@ describe('#validateServiceProxies()', () => {`
`1622`	`1606`	`)`
`1623`	`1607`	`})`
`1624`	`1608`
`1625`		`- it('should throw error if rangeKey is not a string or an object', () => {`
	`1609`	`+ it('should throw error if the "rangeKey" is not a string or an object', () => {`
`1626`	`1610`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1627`	`1611`	`apiGatewayServiceProxies: [`
`1628`	`1612`	`{`
`@@ -1642,7 +1626,7 @@ describe('#validateServiceProxies()', () => {`
`1642`	`1626`	`)`
`1643`	`1627`	`})`
`1644`	`1628`
`1645`		`- it('should not throw error if rangeKey is a string', () => {`
	`1629`	`+ it('should not throw error if the "rangeKey" is a string', () => {`
`1646`	`1630`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1647`	`1631`	`apiGatewayServiceProxies: [`
`1648`	`1632`	`{`
`@@ -1660,7 +1644,7 @@ describe('#validateServiceProxies()', () => {`
`1660`	`1644`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1661`	`1645`	`})`
`1662`	`1646`
`1663`		`- it('should not throw error if rangeKey is a pathParam', () => {`
	`1647`	`+ it('should not throw error if the "rangeKey" is a pathParam', () => {`
`1664`	`1648`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1665`	`1649`	`apiGatewayServiceProxies: [`
`1666`	`1650`	`{`
`@@ -1678,7 +1662,7 @@ describe('#validateServiceProxies()', () => {`
`1678`	`1662`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1679`	`1663`	`})`
`1680`	`1664`
`1681`		`- it('should not throw error if rangeKey is a queryStringParam', () => {`
	`1665`	`+ it('should not throw error if the "rangeKey" is a queryStringParam', () => {`
`1682`	`1666`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1683`	`1667`	`apiGatewayServiceProxies: [`
`1684`	`1668`	`{`
`@@ -1696,7 +1680,7 @@ describe('#validateServiceProxies()', () => {`
`1696`	`1680`	`expect(() => serverlessApigatewayServiceProxy.validateServiceProxies()).to.not.throw()`
`1697`	`1681`	`})`
`1698`	`1682`
`1699`		`- it('should throw error if rangeKey is not an attributeType and is an object', () => {`
	`1683`	`+ it('should throw error if the "rangeKey" is not an attributeType', () => {`
`1700`	`1684`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1701`	`1685`	`apiGatewayServiceProxies: [`
`1702`	`1686`	`{`
`@@ -1716,7 +1700,7 @@ describe('#validateServiceProxies()', () => {`
`1716`	`1700`	`)`
`1717`	`1701`	`})`
`1718`	`1702`
`1719`		`- it('should throw error if rangeKey is a pathParam and a queryStringParam at the same time', () => {`
	`1703`	`+ it('should throw error if the "rangeKey" is a pathParam and a queryStringParam at the same time', () => {`
`1720`	`1704`	`serverlessApigatewayServiceProxy.serverless.service.custom = {`
`1721`	`1705`	`apiGatewayServiceProxies: [`
`1722`	`1706`	`{`