Skip to content
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

e2e-tests: remove "dereference" option from the copy on linux #4781

Merged
merged 4 commits into from
Aug 21, 2021
+15 −5
Merged

e2e-tests: remove "dereference" option from the copy on linux #4781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f62b01
e2e-tests: remove "dereference" option from the copy on linux
davidfirst Aug 20, 2021
e993ac7
upgrade fs-extra from 9.x to 10.x to fix coping dirs with broken syml…
davidfirst Aug 20, 2021
cd84d8a
Merge branch 'master' into e2e-tests-copy
davidfirst Aug 20, 2021
d829f1b
fix tests
davidfirst Aug 20, 2021
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 e2e/commands/export.e2e.1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ describe('bit export command', function () {
forkScope = scopeName;
forkScopePath = scopePath;
helper.scopeHelper.addRemoteScope(forkScopePath);
localScope = helper.scopeHelper.cloneLocalScope();
localScope = helper.scopeHelper.cloneLocalScope(true);
});
describe('with id and --include-dependencies flag', () => {
let forkScopeIds;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"execa": "2.1.0",
"find-up": "5.0.0",
"firstline": "2.0.2",
"fs-extra": "9.1.0",
"fs-extra": "10.0.0",
"gitconfig": "2.0.8",
"glob": "7.1.6",
"globby": "11.0.1",
Expand Down
3 changes: 1 addition & 2 deletions src/e2e-helper/e2e-scope-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import fs from 'fs-extra';
import * as path from 'path';

import { InteractiveInputs } from '../interactive/utils/run-interactive-cmd';
import { generateRandomStr } from '../utils';
import createSymlinkOrCopy from '../utils/fs/create-symlink-or-copy';
Expand Down Expand Up @@ -212,7 +211,7 @@ export default class ScopeHelper {
* To make it faster, use this method before all tests, and then use getClonedLocalScope method to restore from the
* cloned scope.
*/
cloneLocalScope(dereferenceSymlinks = true) {
cloneLocalScope(dereferenceSymlinks = false) {
const clonedScope = `${generateRandomStr()}-clone`;
const clonedScopePath = path.join(this.scopes.e2eDir, clonedScope);
if (this.debugMode) console.log(`cloning a scope from ${this.scopes.localPath} to ${clonedScopePath}`);
Expand Down
13 changes: 12 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7133,7 +7133,7 @@ __metadata:
find-up: 5.0.0
firstline: 2.0.2
flatted: 3.1.0
fs-extra: 9.1.0
fs-extra: 10.0.0
fuse.js: 6.4.6
get-port: 5.1.1
gh-release: 3.5.0
Expand Down Expand Up @@ -18366,6 +18366,17 @@ __metadata:
languageName: node
linkType: hard

"fs-extra@npm:10.0.0":
version: 10.0.0
resolution: "fs-extra@npm:10.0.0"
dependencies:
graceful-fs: ^4.2.0
jsonfile: ^6.0.1
universalify: ^2.0.0
checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a
languageName: node
linkType: hard

"fs-extra@npm:9.1.0, fs-extra@npm:^9.0.1":
version: 9.1.0
resolution: "fs-extra@npm:9.1.0"
Expand Down