Skip to content

Commit f4cd7a0

Browse files
author
mseyma
authored
Merge pull request #10598 from ranterle/feature/backport-appcenterdistribute/154-to-152
Backport AppCenterDistributeV3 task changes from release 154 to 152
2 parents 2d1fe26 + f4a22cb commit f4cd7a0

File tree

74 files changed

+1087
-406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1087
-406
lines changed

‎Tasks/AppCenterDistributeV1/Strings/resources.resjson/en-US/resources.resjson‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"loc.friendlyName": "App Center distribute",
33
"loc.helpMarkDown": "For help with this task, visit the Visual Studio App Center [support site](https://aka.ms/appcentersupport/).",
4-
"loc.description": "Distribute app builds to testers and users via App Center",
4+
"loc.description": "Distribute app builds to testers and users via Visual Studio App Center",
55
"loc.instanceNameFormat": "Deploy $(app) to Visual Studio App Center",
66
"loc.releaseNotes": "Fix bug where feature branches were being truncated.",
77
"loc.group.displayName.symbols": "Symbols",

‎Tasks/AppCenterDistributeV1/Tests/L0.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe('AppCenterDistribute L0 Suite', function () {
8585
assert(tr.succeeded, 'task should have succeeded');
8686
});
8787

88-
it('Positive path: multiple dSYMs in the same foder', function () {
88+
it('Positive path: multiple dSYMs in the same folder', function () {
8989
this.timeout(4000);
9090

9191
let tp = path.join(__dirname, 'L0SymMultipleDSYMs_flat_1.js');
@@ -95,7 +95,7 @@ describe('AppCenterDistribute L0 Suite', function () {
9595
assert(tr.succeeded, 'task should have succeeded');
9696
});
9797

98-
it('Positive path: multiple dSYMs in parallel foders', function () {
98+
it('Positive path: multiple dSYMs in parallel folders', function () {
9999
this.timeout(4000);
100100

101101
let tp = path.join(__dirname, 'L0SymMultipleDSYMs_flat_2.js');
@@ -186,7 +186,7 @@ describe('AppCenterDistribute L0 Suite', function () {
186186
assert(tr.succeeded, 'task should have succeeded');
187187
});
188188

189-
it('Positive path: publish mandatory update)', function () {
189+
it('Positive path: publish mandatory update', function () {
190190
this.timeout(4000);
191191

192192
let tp = path.join(__dirname, 'L0PublishMandatoryUpdate.js');

‎Tasks/AppCenterDistributeV1/Tests/L0OneIpaPass.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Stats = require('fs').Stats
810

@@ -63,13 +65,6 @@ nock('https://example.test')
6365
expiration_date: 1234567
6466
});
6567

66-
//upload symbols
67-
nock('https://example.upload.test')
68-
.put('/symbol_upload')
69-
.reply(201, {
70-
status: 'success'
71-
});
72-
7368
//finishing symbol upload, commit the symbol
7469
nock('https://example.test')
7570
.patch("/v0.1/apps/testuser/testapp/symbol_uploads/100", {
@@ -115,6 +110,12 @@ fs.statSync = (s: string) => {
115110

116111
return stat;
117112
}
113+
114+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
115+
return Promise.resolve();
116+
}
117+
118+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
118119
tmr.registerMock('fs', fs);
119120

120121
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0PublishCommitInfo_1.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Stats = require('fs').Stats
810

@@ -76,13 +78,6 @@ nock('https://example.test')
7678
expiration_date: 1234567
7779
});
7880

79-
//upload symbols
80-
nock('https://example.upload.test')
81-
.put('/symbol_upload')
82-
.reply(201, {
83-
status: 'success'
84-
});
85-
8681
//finishing symbol upload, commit the symbol
8782
nock('https://example.test')
8883
.patch("/v0.1/apps/testuser/testapp/symbol_uploads/100", {
@@ -128,6 +123,12 @@ fs.statSync = (s: string) => {
128123

129124
return stat;
130125
}
126+
127+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
128+
return Promise.resolve();
129+
}
130+
131+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
131132
tmr.registerMock('fs', fs);
132133

133134
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0PublishCommitInfo_2.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Stats = require('fs').Stats
810

@@ -74,13 +76,6 @@ nock('https://example.test')
7476
expiration_date: 1234567
7577
});
7678

77-
//upload symbols
78-
nock('https://example.upload.test')
79-
.put('/symbol_upload')
80-
.reply(201, {
81-
status: 'success'
82-
});
83-
8479
//finishing symbol upload, commit the symbol
8580
nock('https://example.test')
8681
.patch("/v0.1/apps/testuser/testapp/symbol_uploads/100", {
@@ -126,6 +121,12 @@ fs.statSync = (s: string) => {
126121

127122
return stat;
128123
}
124+
125+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
126+
return Promise.resolve();
127+
}
128+
129+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
129130
tmr.registerMock('fs', fs);
130131

131132
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0PublishCommitInfo_3.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Stats = require('fs').Stats
810

@@ -74,13 +76,6 @@ nock('https://example.test')
7476
expiration_date: 1234567
7577
});
7678

77-
//upload symbols
78-
nock('https://example.upload.test')
79-
.put('/symbol_upload')
80-
.reply(201, {
81-
status: 'success'
82-
});
83-
8479
//finishing symbol upload, commit the symbol
8580
nock('https://example.test')
8681
.patch("/v0.1/apps/testuser/testapp/symbol_uploads/100", {
@@ -126,6 +121,12 @@ fs.statSync = (s: string) => {
126121

127122
return stat;
128123
}
124+
125+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
126+
return Promise.resolve();
127+
}
128+
129+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
129130
tmr.registerMock('fs', fs);
130131

131132
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0PublishCommitInfo_4.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Stats = require('fs').Stats
810

@@ -74,13 +76,6 @@ nock('https://example.test')
7476
expiration_date: 1234567
7577
});
7678

77-
//upload symbols
78-
nock('https://example.upload.test')
79-
.put('/symbol_upload')
80-
.reply(201, {
81-
status: 'success'
82-
});
83-
8479
//finishing symbol upload, commit the symbol
8580
nock('https://example.test')
8681
.patch("/v0.1/apps/testuser/testapp/symbol_uploads/100", {
@@ -126,6 +121,12 @@ fs.statSync = (s: string) => {
126121

127122
return stat;
128123
}
124+
125+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
126+
return Promise.resolve();
127+
}
128+
129+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
129130
tmr.registerMock('fs', fs);
130131

131132
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0PublishMandatoryUpdate.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Stats = require('fs').Stats
810

@@ -75,13 +77,6 @@ nock('https://example.test')
7577
expiration_date: 1234567
7678
});
7779

78-
//upload symbols
79-
nock('https://example.upload.test')
80-
.put('/symbol_upload')
81-
.reply(201, {
82-
status: 'success'
83-
});
84-
8580
//finishing symbol upload, commit the symbol
8681
nock('https://example.test')
8782
.patch("/v0.1/apps/testuser/testapp/symbol_uploads/100", {
@@ -127,6 +122,12 @@ fs.statSync = (s: string) => {
127122

128123
return stat;
129124
}
125+
126+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
127+
return Promise.resolve();
128+
}
129+
130+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
130131
tmr.registerMock('fs', fs);
131132

132133
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0SymIncludeParent.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Writable = require('stream').Writable
810
var Stats = require('fs').Stats
@@ -65,13 +67,6 @@ nock('https://example.test')
6567
expiration_date: 1234567
6668
});
6769

68-
//upload symbols
69-
nock('https://example.upload.test')
70-
.put('/symbol_upload')
71-
.reply(201, {
72-
status: 'success'
73-
});
74-
7570
//finishing symbol upload, commit the symbol
7671
nock('https://example.test')
7772
.patch('/v0.1/apps/testuser/testapp/symbol_uploads/100', {
@@ -166,6 +161,12 @@ fs.statSync = (s: string) => {
166161

167162
return stat;
168163
}
164+
165+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
166+
return Promise.resolve();
167+
}
168+
169+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
169170
tmr.registerMock('fs', fs);
170171

171172
tmr.run();

‎Tasks/AppCenterDistributeV1/Tests/L0SymMultipleDSYMs_flat_1.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import ma = require('vsts-task-lib/mock-answer');
33
import tmrm = require('vsts-task-lib/mock-run');
44
import path = require('path');
55
import fs = require('fs');
6+
import azureBlobUploadHelper = require('../azure-blob-upload-helper');
7+
68
var Readable = require('stream').Readable
79
var Writable = require('stream').Writable
810
var Stats = require('fs').Stats
@@ -81,13 +83,6 @@ nock('https://example.test')
8183
expiration_date: 1234567
8284
});
8385

84-
//upload symbols
85-
nock('https://example.upload.test')
86-
.put('/symbol_upload')
87-
.reply(201, {
88-
status: 'success'
89-
});
90-
9186
//finishing symbol upload, commit the symbol
9287
nock('https://example.test')
9388
.patch('/v0.1/apps/testuser/testapp/symbol_uploads/100', {
@@ -202,6 +197,12 @@ fs.statSync = (s: string) => {
202197

203198
return stat;
204199
}
200+
201+
azureBlobUploadHelper.AzureBlobUploadHelper.prototype.upload = async () => {
202+
return Promise.resolve();
203+
}
204+
205+
tmr.registerMock('azure-blob-upload-helper', azureBlobUploadHelper);
205206
tmr.registerMock('fs', fs);
206207

207208
tmr.run();

0 commit comments

Comments
 (0)