Skip to content

Fixes main by updating baselines #46160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2021
Merged

Fixes main by updating baselines #46160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/testRunner/parallel/host.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ namespace Harness.Parallel.Host {
completeBar();
progressBars.disable();

const replayRunner = new Mocha.Runner(new Mocha.Suite(""), /*delay*/ false);
const replayRunner = new Mocha.Runner(new Mocha.Suite(""), { delay: false });
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you do a fresh npm install then you get runtime warnings about this

Copy link
Member

@weswigham weswigham Oct 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was deprecated officially in mocha 9, released in June, and has had the object form listed as an option for at least a few major versions longer - so the change seems fine to me~

replayRunner.started = true;
const createStatsCollector = require("mocha/lib/stats-collector");
createStatsCollector(replayRunner); // manually init stats collector like mocha.run would
Expand Down
2 changes: 1 addition & 1 deletion src/testRunner/parallel/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ namespace Harness.Parallel.Worker {
const errors: ErrorInfo[] = [];
const passes: TestInfo[] = [];
const start = +new Date();
const runner = new Mocha.Runner(suite, /*delay*/ false);
const runner = new Mocha.Runner(suite, { delay: false });

runner
.on("start", () => {
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/multipleClassPropertyModifiersErrors.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,16): error TS1005: ';' expected.
tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,9): error TS1434: Unexpected keyword or identifier.


==== tests/cases/compiler/multipleClassPropertyModifiersErrors.ts (1 errors) ====
class C {
public public p1;
private private p2;
static static p3;
~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
public private p4;
private public p5;
public static p6;
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,18): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,11): error TS1434: Unexpected keyword or identifier.


==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts (1 errors) ====
class C {
static static [x: string]: string;
~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}
6 changes: 3 additions & 3 deletions tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,19): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,12): error TS1434: Unexpected keyword or identifier.
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,23): error TS2378: A 'get' accessor must return a value.


==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ====
class C {
static static get Foo() { }
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
~~~
!!! error TS2378: A 'get' accessor must return a value.
}
6 changes: 3 additions & 3 deletions tests/baselines/reference/parserMemberFunctionDeclaration2.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,19): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,12): error TS1434: Unexpected keyword or identifier.


==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts (1 errors) ====
class C {
static static Foo() { }
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}
6 changes: 3 additions & 3 deletions tests/baselines/reference/parserMemberVariableDeclaration2.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,17): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,10): error TS1434: Unexpected keyword or identifier.


==== tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts (1 errors) ====
class C {
static static Foo;
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}
12 changes: 6 additions & 6 deletions tests/baselines/reference/staticAsIdentifier.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tests/cases/compiler/staticAsIdentifier.ts(12,19): error TS1005: ';' expected.
tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected.
tests/cases/compiler/staticAsIdentifier.ts(12,12): error TS1434: Unexpected keyword or identifier.
tests/cases/compiler/staticAsIdentifier.ts(16,12): error TS1434: Unexpected keyword or identifier.


==== tests/cases/compiler/staticAsIdentifier.ts (2 errors) ====
Expand All @@ -15,14 +15,14 @@ tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected.

class C3 {
static static p: string;
~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}

class C4 {
static static foo() {}
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}

class C5 {
Expand Down
12 changes: 6 additions & 6 deletions tests/baselines/reference/staticModifierAlreadySeen.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
tests/cases/compiler/staticModifierAlreadySeen.ts(2,19): error TS1005: ';' expected.
tests/cases/compiler/staticModifierAlreadySeen.ts(2,12): error TS1434: Unexpected keyword or identifier.
tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS1434: Unexpected keyword or identifier.
tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS2300: Duplicate identifier 'static'.
tests/cases/compiler/staticModifierAlreadySeen.ts(3,26): error TS1005: ';' expected.


==== tests/cases/compiler/staticModifierAlreadySeen.ts (3 errors) ====
class C {
static static foo = 1;
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
public static static bar() { }
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
~~~~~~
!!! error TS2300: Duplicate identifier 'static'.
~~~
!!! error TS1005: ';' expected.
}