Skip to content

Commit 406f7f1

Browse files
committed
Fix tests
1 parent fb57183 commit 406f7f1

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/features/reportIssue.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ async function getMonoIfPlatformValid(isValidPlatformForMono: boolean, options:
8484
if (isValidPlatformForMono) {
8585
let monoVersion = "Unknown Mono version";
8686
try {
87-
let monoInfo = await monoResolver.getHostExecutableInfo(options);
88-
if (monoInfo) {
89-
monoVersion = `OmniSharp using mono :${monoInfo.version}`;
90-
}
87+
const monoInfo = await monoResolver.getHostExecutableInfo(options);
88+
monoVersion = `OmniSharp using mono: ${monoInfo.version}`;
9189
}
9290
catch (error) {
9391
monoVersion = `There is a problem with running OmniSharp on mono: ${error}`;

test/unitTests/features/reportIssue.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,52 +65,52 @@ suite(`${reportIssue.name}`, () => {
6565
});
6666

6767
test(`${OpenURL.name} event is created`, async () => {
68-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
68+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
6969
let events = eventBus.getEvents();
7070
expect(events).to.have.length(1);
7171
expect(events[0].constructor.name).to.be.equal(`${OpenURL.name}`);
7272
});
7373

7474
test(`${OpenURL.name} event is created with the omnisharp-vscode github repo issues url`, async () => {
75-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, false, options, fakeMonoResolver, fakeDotnetResolver);
75+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, false, options, fakeDotnetResolver, fakeMonoResolver);
7676
let url = (<OpenURL>eventBus.getEvents()[0]).url;
7777
expect(url).to.include("https://github.com/OmniSharp/omnisharp-vscode/issues/new?body=Please paste the output from your clipboard");
7878
});
7979

8080
suite("The body is passed to the vscode clipboard and", () => {
8181
test("it contains the vscode version", async () => {
82-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
82+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
8383
expect(issueBody).to.include(`**VSCode version**: ${vscodeVersion}`);
8484
});
8585

8686
test("it contains the csharp extension version", async () => {
87-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
87+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
8888
expect(issueBody).to.include(`**C# Extension**: ${csharpExtVersion}`);
8989
});
9090

9191
test("it contains dotnet info", async () => {
92-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
92+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
9393
expect(issueBody).to.contain(fakeDotnetInfo.FullInfo);
9494
});
9595

9696
test("mono information is obtained when it is a valid mono platform", async () => {
97-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
97+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
9898
expect(fakeMonoResolver.getMonoCalled).to.be.equal(true);
9999
});
100100

101101
test("mono version is put in the body when it is a valid mono platform", async () => {
102-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
102+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
103103
expect(fakeMonoResolver.getMonoCalled).to.be.equal(true);
104104
expect(issueBody).to.contain(fakeMonoInfo.version);
105105
});
106106

107107
test("mono information is not obtained when it is not a valid mono platform", async () => {
108-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, false, options, fakeMonoResolver, fakeDotnetResolver);
108+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, false, options, fakeDotnetResolver, fakeMonoResolver);
109109
expect(fakeMonoResolver.getMonoCalled).to.be.equal(false);
110110
});
111111

112112
test("The url contains the name, publisher and version for all the extensions that are not builtin", async () => {
113-
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeMonoResolver, fakeDotnetResolver);
113+
await reportIssue(vscode, csharpExtVersion, eventStream, getDotnetInfo, isValidForMono, options, fakeDotnetResolver, fakeMonoResolver);
114114
expect(issueBody).to.contain(extension2.packageJSON.name);
115115
expect(issueBody).to.contain(extension2.packageJSON.publisher);
116116
expect(issueBody).to.contain(extension2.packageJSON.version);

0 commit comments

Comments
 (0)