Skip to content

Commit

Permalink
Merge pull request #3655 from iclanton/fix-rush-test-on-windows
Browse files Browse the repository at this point in the history
[rush] Fix a rush-lib test on Windows.
  • Loading branch information
iclanton authored Sep 27, 2022
2 parents 519c2be + 39e29ee commit 3fea12f
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 18 deletions.
32 changes: 16 additions & 16 deletions build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@microsoft/rush"
}
],
"packageName": "@microsoft/rush",
"email": "[email protected]"
}
6 changes: 4 additions & 2 deletions libraries/rush-lib/src/api/test/RushConfiguration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import * as path from 'path';

import { Text } from '@rushstack/node-core-library';
import { Path, Text } from '@rushstack/node-core-library';
import { RushConfiguration } from '../RushConfiguration';
import { ApprovedPackagesPolicy } from '../ApprovedPackagesPolicy';
import { RushConfigurationProject } from '../RushConfigurationProject';
Expand Down Expand Up @@ -250,7 +250,9 @@ describe(RushConfiguration.name, () => {

expect(rushConfiguration.packageManager).toEqual('pnpm');
expect(rushConfiguration.pnpmOptions.pnpmStore).toEqual('local');
expect(rushConfiguration.pnpmOptions.pnpmStorePath).toEqual(EXPECT_STORE_PATH);
expect(Path.convertToSlashes(rushConfiguration.pnpmOptions.pnpmStorePath)).toEqual(
Path.convertToSlashes(EXPECT_STORE_PATH)
);
expect(path.isAbsolute(rushConfiguration.pnpmOptions.pnpmStorePath)).toEqual(true);
});

Expand Down

0 comments on commit 3fea12f

Please sign in to comment.