From a53d0e22c783be6abae5d5f291a3b2b864377350 Mon Sep 17 00:00:00 2001
From: Philipp Muens <raute1337@gmx.de>
Date: Wed, 17 May 2017 13:59:56 +0200
Subject: [PATCH] Fix "from scratch deployments"

---
 deploy/googleDeploy.js      |  6 +++---
 deploy/googleDeploy.test.js | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deploy/googleDeploy.js b/deploy/googleDeploy.js
index 5b7b3d6..dfe845e 100644
--- a/deploy/googleDeploy.js
+++ b/deploy/googleDeploy.js
@@ -4,8 +4,8 @@ const BbPromise = require('bluebird');
 
 const validate = require('../shared/validate');
 const utils = require('../shared/utils');
-const setDeploymentBucketName = require('../shared/setDeploymentBucketName');
 const createDeployment = require('./lib/createDeployment');
+const setDeploymentBucketName = require('../shared/setDeploymentBucketName');
 const monitorDeployment = require('../shared/monitorDeployment');
 const uploadArtifacts = require('./lib/uploadArtifacts');
 const updateDeployment = require('./lib/updateDeployment');
@@ -21,8 +21,8 @@ class GoogleDeploy {
       this,
       validate,
       utils,
-      setDeploymentBucketName,
       createDeployment,
+      setDeploymentBucketName,
       monitorDeployment,
       uploadArtifacts,
       updateDeployment,
@@ -34,8 +34,8 @@ class GoogleDeploy {
         .then(this.setDefaults),
 
       'deploy:deploy': () => BbPromise.bind(this)
-        .then(this.setDeploymentBucketName)
         .then(this.createDeployment)
+        .then(this.setDeploymentBucketName)
         .then(this.uploadArtifacts)
         .then(this.updateDeployment),
 
diff --git a/deploy/googleDeploy.test.js b/deploy/googleDeploy.test.js
index f38ac10..8403ef4 100644
--- a/deploy/googleDeploy.test.js
+++ b/deploy/googleDeploy.test.js
@@ -38,8 +38,8 @@ describe('GoogleDeploy', () => {
     describe('hooks', () => {
       let validateStub;
       let setDefaultsStub;
-      let setDeploymentBucketNameStub;
       let createDeploymentStub;
+      let setDeploymentBucketNameStub;
       let uploadArtifactsStub;
       let updateDeploymentStub;
       let cleanupDeploymentBucketStub;
@@ -49,10 +49,10 @@ describe('GoogleDeploy', () => {
           .returns(BbPromise.resolve());
         setDefaultsStub = sinon.stub(googleDeploy, 'setDefaults')
           .returns(BbPromise.resolve());
-        setDeploymentBucketNameStub = sinon.stub(googleDeploy, 'setDeploymentBucketName')
-          .returns(BbPromise.resolve());
         createDeploymentStub = sinon.stub(googleDeploy, 'createDeployment')
           .returns(BbPromise.resolve());
+        setDeploymentBucketNameStub = sinon.stub(googleDeploy, 'setDeploymentBucketName')
+          .returns(BbPromise.resolve());
         uploadArtifactsStub = sinon.stub(googleDeploy, 'uploadArtifacts')
           .returns(BbPromise.resolve());
         updateDeploymentStub = sinon.stub(googleDeploy, 'updateDeployment')
@@ -64,8 +64,8 @@ describe('GoogleDeploy', () => {
       afterEach(() => {
         googleDeploy.validate.restore();
         googleDeploy.setDefaults.restore();
-        googleDeploy.setDeploymentBucketName.restore();
         googleDeploy.createDeployment.restore();
+        googleDeploy.setDeploymentBucketName.restore();
         googleDeploy.uploadArtifacts.restore();
         googleDeploy.updateDeployment.restore();
         googleDeploy.cleanupDeploymentBucket.restore();
@@ -79,8 +79,8 @@ describe('GoogleDeploy', () => {
 
       it('should run "deploy:deploy" promise chain', () => googleDeploy
         .hooks['deploy:deploy']().then(() => {
-          expect(setDeploymentBucketNameStub.calledOnce).toEqual(true);
-          expect(createDeploymentStub.calledAfter(setDeploymentBucketNameStub)).toEqual(true);
+          expect(createDeploymentStub.calledOnce).toEqual(true);
+          expect(setDeploymentBucketNameStub.calledAfter(createDeploymentStub)).toEqual(true);
           expect(uploadArtifactsStub.calledAfter(createDeploymentStub)).toEqual(true);
           expect(updateDeploymentStub.calledAfter(uploadArtifactsStub)).toEqual(true);
         }));