-
Notifications
You must be signed in to change notification settings - Fork 732
Expand file tree
/
Copy pathreviewCommentController.test.ts
More file actions
353 lines (325 loc) · 13 KB
/
reviewCommentController.test.ts
File metadata and controls
353 lines (325 loc) · 13 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { default as assert } from 'assert';
import { SinonSandbox, createSandbox } from 'sinon';
import { CredentialStore } from '../../github/credentials';
import { MockCommandRegistry } from '../mocks/mockCommandRegistry';
import { MockTelemetry } from '../mocks/mockTelemetry';
import { ReviewCommentController } from '../../view/reviewCommentController';
import { FolderRepositoryManager } from '../../github/folderRepositoryManager';
import { MockRepository } from '../mocks/mockRepository';
import { GitFileChangeNode } from '../../view/treeNodes/fileChangeNode';
import { PullRequestsTreeDataProvider } from '../../view/prsTreeDataProvider';
import { GitChangeType } from '../../common/file';
import { toReviewUri } from '../../common/uri';
import * as vscode from 'vscode';
import { PullRequestBuilder } from '../builders/rest/pullRequestBuilder';
import { convertRESTPullRequestToRawPullRequest } from '../../github/utils';
import { IResolvedPullRequestModel, PullRequestModel } from '../../github/pullRequestModel';
import { Protocol } from '../../common/protocol';
import { GitHubRemote } from '../../common/remote';
import { GHPRCommentThread } from '../../github/prComment';
import { DiffLine } from '../../common/diffHunk';
import { MockGitHubRepository } from '../mocks/mockGitHubRepository';
import { GitApiImpl } from '../../api/api1';
import { DiffSide, SubjectType } from '../../common/comment';
import { ReviewManager, ShowPullRequest } from '../../view/reviewManager';
import { PullRequestChangesTreeDataProvider } from '../../view/prChangesTreeDataProvider';
import { MockExtensionContext } from '../mocks/mockExtensionContext';
import { ReviewModel } from '../../view/reviewModel';
import { RepositoriesManager } from '../../github/repositoriesManager';
import { GitFileChangeModel } from '../../view/fileChangeModel';
import { WebviewViewCoordinator } from '../../view/webviewViewCoordinator';
import { GitHubServerType } from '../../common/authentication';
import { CreatePullRequestHelper } from '../../view/createPullRequestHelper';
import { mergeQuerySchemaWithShared } from '../../github/common';
import { AccountType } from '../../github/interface';
import { MockThemeWatcher } from '../mocks/mockThemeWatcher';
import { asPromise } from '../../common/utils';
import { PrsTreeModel } from '../../view/prsTreeModel';
import { MockPrsTreeModel } from '../mocks/mockPRsTreeModel';
const schema = mergeQuerySchemaWithShared(require('../../github/queries.gql'), require('../../github/queriesShared.gql')) as any;
const protocol = new Protocol('https://github.com/github/test.git');
const remote = new GitHubRemote('test', 'github/test', protocol, GitHubServerType.GitHubDotCom);
class TestReviewCommentController extends ReviewCommentController {
public workspaceFileChangeCommentThreads() {
return this._workspaceFileChangeCommentThreads;
}
}
describe('ReviewCommentController', function () {
let sinon: SinonSandbox;
let credentialStore: CredentialStore;
let repository: MockRepository;
let telemetry: MockTelemetry;
let provider: PullRequestsTreeDataProvider;
let manager: FolderRepositoryManager;
let activePullRequest: PullRequestModel;
let githubRepo: MockGitHubRepository;
let reviewManager: ReviewManager;
let reposManager: RepositoriesManager;
let gitApiImpl: GitApiImpl;
let mockThemeWatcher: MockThemeWatcher;
let mockPrsTreeModel: PrsTreeModel;
beforeEach(async function () {
sinon = createSandbox();
MockCommandRegistry.install(sinon);
mockThemeWatcher = new MockThemeWatcher();
telemetry = new MockTelemetry();
const context = new MockExtensionContext();
credentialStore = new CredentialStore(telemetry, context);
repository = new MockRepository();
repository.addRemote('origin', 'git@github.com:aaa/bbb');
reposManager = new RepositoriesManager(credentialStore, telemetry);
gitApiImpl = new GitApiImpl(reposManager);
mockPrsTreeModel = new MockPrsTreeModel() as unknown as PrsTreeModel;
provider = new PullRequestsTreeDataProvider(mockPrsTreeModel, telemetry, context, reposManager);
const activePrViewCoordinator = new WebviewViewCoordinator(context);
const createPrHelper = new CreatePullRequestHelper();
manager = new FolderRepositoryManager(0, context, repository, telemetry, gitApiImpl, credentialStore, createPrHelper, mockThemeWatcher);
reposManager.insertFolderManager(manager);
const tree = new PullRequestChangesTreeDataProvider(gitApiImpl, reposManager);
reviewManager = new ReviewManager(0, context, repository, manager, telemetry, tree, provider, new ShowPullRequest(), activePrViewCoordinator, createPrHelper, gitApiImpl);
sinon.stub(manager, 'createGitHubRepository').callsFake((r, cStore) => {
return Promise.resolve(new MockGitHubRepository(GitHubRemote.remoteAsGitHub(r, GitHubServerType.GitHubDotCom), cStore, telemetry, sinon));
});
sinon.stub(credentialStore, 'isAuthenticated').returns(false);
await manager.updateRepositories();
const pr = new PullRequestBuilder().build();
githubRepo = new MockGitHubRepository(remote, credentialStore, telemetry, sinon);
activePullRequest = new PullRequestModel(
credentialStore,
telemetry,
githubRepo,
remote,
convertRESTPullRequestToRawPullRequest(pr, githubRepo),
);
manager.activePullRequest = activePullRequest;
});
afterEach(function () {
sinon.restore();
});
function createLocalFileChange(uri: vscode.Uri, fileName: string, rootUri: vscode.Uri): GitFileChangeNode {
const gitFileChangeModel = new GitFileChangeModel(
manager,
activePullRequest,
{
status: GitChangeType.MODIFY,
fileName,
blobUrl: 'https://example.com',
diffHunks:
[
{
oldLineNumber: 22,
oldLength: 5,
newLineNumber: 22,
newLength: 11,
positionInHunk: 0,
diffLines: [
new DiffLine(3, -1, -1, 0, '@@ -22,5 +22,11 @@', true),
new DiffLine(0, 22, 22, 1, " 'title': 'Papayas',", true),
new DiffLine(0, 23, 23, 2, " 'title': 'Papayas',", true),
new DiffLine(0, 24, 24, 3, " 'title': 'Papayas',", true),
new DiffLine(1, -1, 25, 4, '+ {', true),
new DiffLine(1, -1, 26, 5, '+ {', true),
new DiffLine(1, -1, 27, 6, '+ {', true),
new DiffLine(1, -1, 28, 7, '+ {', true),
new DiffLine(1, -1, 29, 8, '+ {', true),
new DiffLine(1, -1, 30, 9, '+ {', true),
new DiffLine(0, 25, 31, 10, '+ {', true),
new DiffLine(0, 26, 32, 11, '+ {', true),
],
},
]
},
uri,
toReviewUri(uri, fileName, undefined, '1', false, { base: true }, rootUri),
'abcd'
);
return new GitFileChangeNode(
provider,
manager,
activePullRequest as any as PullRequestModel & IResolvedPullRequestModel,
gitFileChangeModel
);
}
function createGHPRCommentThread(threadId: string, uri: vscode.Uri): GHPRCommentThread {
return {
gitHubThreadId: threadId,
uri,
range: new vscode.Range(new vscode.Position(21, 0), new vscode.Position(21, 0)),
comments: [],
collapsibleState: vscode.CommentThreadCollapsibleState.Expanded,
label: 'Start discussion',
state: { resolved: vscode.CommentThreadState.Unresolved, applicability: 0 },
canReply: false,
reveal: () => Promise.resolve(),
hide: () => Promise.resolve(),
dispose: () => { },
};
}
describe('initializes workspace thread data', async function () {
const fileName = 'data/products.json';
const uri = vscode.Uri.parse(`${repository.rootUri.toString()}/${fileName}`);
const localFileChanges = [createLocalFileChange(uri, fileName, repository.rootUri)];
const reviewModel = new ReviewModel();
reviewModel.localFileChanges = localFileChanges;
const reviewCommentController = new TestReviewCommentController(reviewManager, manager, repository, reviewModel, gitApiImpl, telemetry);
sinon.stub(activePullRequest, 'validateDraftMode').returns(Promise.resolve(false));
sinon.stub(activePullRequest, 'getReviewThreads').returns(
Promise.resolve([
{
id: '1',
isResolved: false,
viewerCanResolve: false,
viewerCanUnresolve: false,
path: fileName,
diffSide: DiffSide.RIGHT,
startLine: 372,
endLine: 372,
originalStartLine: 372,
originalEndLine: 372,
isOutdated: false,
comments: [
{
id: 1,
url: '',
diffHunk: '',
body: '',
createdAt: '',
htmlUrl: '',
graphNodeId: '',
isOutdated: false
}
],
subjectType: SubjectType.LINE
},
]),
);
sinon.stub(manager, 'getCurrentUser').returns(Promise.resolve({
login: 'rmacfarlane',
url: 'https://github.com/rmacfarlane',
id: '123',
accountType: AccountType.User
}));
sinon.stub(vscode.workspace, 'getWorkspaceFolder').returns({
uri: repository.rootUri,
name: '',
index: 0,
});
await reviewCommentController.initialize();
const workspaceFileChangeCommentThreads = reviewCommentController.workspaceFileChangeCommentThreads();
assert.strictEqual(Object.keys(workspaceFileChangeCommentThreads).length, 1);
assert.strictEqual(Object.keys(workspaceFileChangeCommentThreads)[0], fileName);
assert.strictEqual(workspaceFileChangeCommentThreads[fileName].length, 1);
});
describe('createOrReplyComment', function () {
it('creates a new comment on an empty thread in a local file', async function () {
const fileName = 'data/products.json';
const uri = vscode.Uri.parse(`${repository.rootUri.toString()}/${fileName}`);
await activePullRequest.initializeReviewThreadCache();
const localFileChanges = [createLocalFileChange(uri, fileName, repository.rootUri)];
const reviewModel = new ReviewModel();
reviewModel.localFileChanges = localFileChanges;
const reviewCommentController = new TestReviewCommentController(
reviewManager,
manager,
repository,
reviewModel,
gitApiImpl,
telemetry
);
const thread = createGHPRCommentThread('review-1.1', uri);
sinon.stub(activePullRequest, 'validateDraftMode').returns(Promise.resolve(false));
sinon.stub(activePullRequest, 'getReviewThreads').returns(Promise.resolve([]));
sinon.stub(activePullRequest, 'getPendingReviewId').returns(Promise.resolve(undefined));
sinon.stub(manager, 'getCurrentUser').returns(Promise.resolve({
login: 'rmacfarlane',
url: 'https://github.com/rmacfarlane',
id: '123',
accountType: AccountType.User
}));
sinon.stub(vscode.workspace, 'getWorkspaceFolder').returns({
uri: repository.rootUri,
name: '',
index: 0,
});
sinon.stub(vscode.workspace, 'asRelativePath').callsFake((pathOrUri: string | vscode.Uri): string => {
const path = pathOrUri.toString();
return path.substring('/root/'.length);
});
sinon.stub(repository, 'diffWith').returns(Promise.resolve(''));
await reviewCommentController.initialize();
const workspaceFileChangeCommentThreads = reviewCommentController.workspaceFileChangeCommentThreads();
assert.strictEqual(Object.keys(workspaceFileChangeCommentThreads).length, 0);
githubRepo.queryProvider.expectGraphQLMutation(
{
mutation: schema.AddReviewThread,
variables: {
input: {
path: fileName,
body: 'hello world',
pullRequestId: activePullRequest.graphNodeId,
pullRequestReviewId: undefined,
startLine: undefined,
line: 22,
side: 'RIGHT',
subjectType: 'LINE',
linePositioning: {
line: 22,
path: fileName,
commitOid: activePullRequest.head?.sha
},
multilinePositioning: undefined
}
}
},
{
data: {
addPullRequestReviewThread: {
thread: {
id: 1,
isResolved: false,
viewCanResolve: true,
path: fileName,
line: 22,
startLine: null,
originalStartLine: null,
originalLine: 22,
diffSide: 'RIGHT',
isOutdated: false,
subjectType: 'LINE',
comments: {
nodes: [
{
databaseId: 1,
id: 1,
body: 'hello world',
commit: {},
diffHunk: '',
reactionGroups: [],
author: {}
}
]
},
positioning: {
__typename: 'LineComment',
line: 22,
}
}
}
}
}
)
const newReviewThreadPromise = asPromise(activePullRequest.onDidChangeReviewThreads);
await reviewCommentController.createOrReplyComment(thread, 'hello world', false);
await newReviewThreadPromise;
assert.strictEqual(thread.comments.length, 1);
assert.strictEqual(thread.comments[0].parent, thread);
assert.strictEqual(Object.keys(workspaceFileChangeCommentThreads).length, 1);
assert.strictEqual(Object.keys(workspaceFileChangeCommentThreads)[0], fileName);
assert.strictEqual(workspaceFileChangeCommentThreads[fileName].length, 1);
});
});
});