Skip to content

Commit 6d74d78

Browse files
committed
Fix tests again
1 parent 28ae296 commit 6d74d78

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

src/github/folderRepositoryManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class DetachedHeadError extends Error {
136136
}
137137

138138
override get message() {
139-
return vscode.l10n.t('{0} has a detached HEAD (create a branch first', this.repository.rootUri.toString());
139+
return vscode.l10n.t('{0} has a detached HEAD (create a branch first)', this.repository.rootUri.toString());
140140
}
141141
}
142142

src/test/mocks/mockRepository.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ export class MockRepository implements Repository {
6868
}
6969

7070
private _state: Mutable<RepositoryState & { refs: Ref[] }> = {
71-
HEAD: undefined,
71+
HEAD: {
72+
type: RefType.Head
73+
},
7274
refs: [],
7375
remotes: [],
7476
submodules: [],

src/test/view/prsTree.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ describe('GitHub Pull Requests view', function () {
118118
it('opens the viewlet and displays the default categories', async function () {
119119
const repository = new MockRepository();
120120
repository.addRemote('origin', 'git@github.com:aaa/bbb');
121-
reposManager.insertFolderManager(new FolderRepositoryManager(0, context, repository, telemetry, new GitApiImpl(reposManager), credentialStore, createPrHelper, mockThemeWatcher));
121+
const folderManager = new FolderRepositoryManager(0, context, repository, telemetry, new GitApiImpl(reposManager), credentialStore, createPrHelper, mockThemeWatcher);
122+
sinon.stub(folderManager, 'getPullRequestDefaults').returns(Promise.resolve({ owner: 'aaa', repo: 'bbb', base: 'main' }));
123+
reposManager.insertFolderManager(folderManager);
122124
sinon.stub(credentialStore, 'isAuthenticated').returns(true);
123125
await reposManager.folderManagers[0].updateRepositories();
124126
provider.initialize([], credentialStore);

src/view/treeNodes/categoryNode.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,14 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
169169

170170
this.id = parent instanceof TreeNode ? `${parent.id ?? parent.label}/${this.label}` : this.label;
171171

172-
this.collapsibleState =
173-
this._prsTreeModel.expandedQueries?.has(this.id)
174-
? vscode.TreeItemCollapsibleState.Expanded
175-
: vscode.TreeItemCollapsibleState.Collapsed;
172+
if ((this._prsTreeModel.expandedQueries === undefined) && (this.type === PRType.All)) {
173+
this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
174+
} else {
175+
this.collapsibleState =
176+
this._prsTreeModel.expandedQueries?.has(this.id)
177+
? vscode.TreeItemCollapsibleState.Expanded
178+
: vscode.TreeItemCollapsibleState.Collapsed;
179+
}
176180

177181
if (this._categoryQuery) {
178182
this.contextValue = 'query';

0 commit comments

Comments
 (0)