Merge branch 'master' into add_authorizer_support

Author: vlewin

lib/deploy/events/apiGateway/resources.test.js

@@ -434,17 +434,46 @@ describe('#compileResources()', () => {
       .to.throw(Error, 'Resource ID for path users is required');
   });
 
+  it('should throw error if API root resourceId of existing resource is required', () => {
+    serverlessStepFunctions.serverless.service.provider.apiGateway = {
+      restApiId: '6fyzt1pfpk',
+      restApiRootResourceId: '',
+      restApiResources: {
+        'users/friends': 'fcasdoojp1',
+      },
+    };
+
+    serverlessStepFunctions.pluginhttpValidated.events = [
+      {
+        http: {
+          path: 'users/test/{id}',
+          method: 'GET',
+        },
+      },
+    ];
+
+    expect(() => serverlessStepFunctions.compileResources())
+      .to.throw(Error, 'Resource ID for path users is required');
+  });
+
   it('should named all method paths if all resources are predefined', () => {
     serverlessStepFunctions.serverless.service.provider.apiGateway = {
       restApiId: '6fyzt1pfpk',
       restApiRootResourceId: 'z5d4qh4oqi',
       restApiResources: {
+        'users/{id}': 'fcasdoojp1',
         'users/friends': 'fcasdoojp1',
         'users/friends/{id}': 'fcasdoojp1',
       },
     };
 
     serverlessStepFunctions.pluginhttpValidated.events = [
+      {
+        http: {
+          path: '/users/{id}',
+          method: 'GET',
+        },
+      },
       {
         http: {
           path: 'users/friends',
@@ -485,4 +514,23 @@ describe('#compileResources()', () => {
       .to.equal(true);
     });
   });
+
+  it('should return empty string if path is empty', () => {
+    expect(serverlessStepFunctions.getResourceName('')).to.equal('');
+  });
+
+  it('should return empty string if no resources', () => {
+    expect(serverlessStepFunctions.getResourceName('users/friends')).to.equal('');
+  });
+
+  it('should return resource name for given path', () => {
+    serverlessStepFunctions.apiGatewayResources = {
+      'users/create': {
+        name: 'UsersCreate',
+        resourceLogicalId: 'ApiGatewayResourceUsersCreate',
+      },
+    };
+
+    expect(serverlessStepFunctions.getResourceName('users/create')).to.equal('UsersCreate');
+  });
 });