Merge pull request #42 from serverless/rearrange-function-order

Rearrange function order

Author: pmuens

deploy/googleDeploy.js

@@ -8,9 +8,9 @@ const prepareDeployment = require('./lib/prepareDeployment');
 const createDeployment = require('./lib/createDeployment');
 const monitorDeployment = require('../shared/monitorDeployment');
 const generateArtifactDirectoryName = require('./lib/generateArtifactDirectoryName');
+const compileFunctions = require('./lib/compileFunctions');
 const mergeServiceResources = require('./lib/mergeServiceResources');
 const uploadArtifacts = require('./lib/uploadArtifacts');
-const compileFunctions = require('./lib/compileFunctions');
 const updateDeployment = require('./lib/updateDeployment');
 const cleanupDeploymentBucket = require('./lib/cleanupDeploymentBucket');
 
@@ -28,9 +28,9 @@ class GoogleDeploy {
       createDeployment,
       monitorDeployment,
       generateArtifactDirectoryName,
+      compileFunctions,
       mergeServiceResources,
       uploadArtifacts,
-      compileFunctions,
       updateDeployment,
       cleanupDeploymentBucket);
 

deploy/googleDeploy.test.js

@@ -41,8 +41,8 @@ describe('GoogleDeploy', () => {
       let prepareDeploymentStub;
       let createDeploymentStub;
       let generateArtifactDirectoryNameStub;
-      let mergeServiceResourcesStub;
       let compileFunctionsStub;
+      let mergeServiceResourcesStub;
       let uploadArtifactsStub;
       let updateDeploymentStub;
       let cleanupDeploymentBucketStub;
@@ -59,10 +59,10 @@ describe('GoogleDeploy', () => {
         generateArtifactDirectoryNameStub = sinon
           .stub(googleDeploy, 'generateArtifactDirectoryName')
           .returns(BbPromise.resolve());
-        mergeServiceResourcesStub = sinon.stub(googleDeploy, 'mergeServiceResources')
-          .returns(BbPromise.resolve());
         compileFunctionsStub = sinon.stub(googleDeploy, 'compileFunctions')
           .returns(BbPromise.resolve());
+        mergeServiceResourcesStub = sinon.stub(googleDeploy, 'mergeServiceResources')
+          .returns(BbPromise.resolve());
         uploadArtifactsStub = sinon.stub(googleDeploy, 'uploadArtifacts')
           .returns(BbPromise.resolve());
         updateDeploymentStub = sinon.stub(googleDeploy, 'updateDeployment')
@@ -77,8 +77,8 @@ describe('GoogleDeploy', () => {
         googleDeploy.prepareDeployment.restore();
         googleDeploy.createDeployment.restore();
         googleDeploy.generateArtifactDirectoryName.restore();
-        googleDeploy.mergeServiceResources.restore();
         googleDeploy.compileFunctions.restore();
+        googleDeploy.mergeServiceResources.restore();
         googleDeploy.uploadArtifacts.restore();
         googleDeploy.updateDeployment.restore();
         googleDeploy.cleanupDeploymentBucket.restore();