Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions e2e/commands/cat.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('bit cat command', function () {
helper.scopeHelper.reInitWorkspace();
helper.fixtures.createComponentBarFoo("module.exports = function foo() { return 'v1'; };\n");
helper.fixtures.addComponentBarFoo();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
});

it('should show all source files with headers', () => {
Expand Down Expand Up @@ -64,9 +64,9 @@ describe('bit cat command', function () {
helper.scopeHelper.reInitWorkspace();
helper.fixtures.createComponentBarFoo("module.exports = function foo() { return 'v1'; };\n");
helper.fixtures.addComponentBarFoo();
helper.command.tagAllComponents('', '0.0.1');
helper.command.tagAllWithoutBuild('--ver 0.0.1');
helper.fixtures.createComponentBarFoo("module.exports = function foo() { return 'v2'; };\n");
helper.command.tagAllComponents('', '0.0.2');
helper.command.tagAllWithoutBuild('--ver 0.0.2');
});

it('should show files at a specific historical version', () => {
Expand Down
10 changes: 5 additions & 5 deletions e2e/commands/diff.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('bit diff command', function () {
});
describe('after the component was tagged', () => {
before(() => {
helper.command.tagAllComponents('', '0.0.5');
helper.command.tagAllWithoutBuild('--ver 0.0.5');
});
it('should still indicate that there is no diff for that component', () => {
const output = helper.command.diff('bar/foo');
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('bit diff command', function () {
helper.fixtures.addComponentUtilsIsType();
helper.fixtures.createComponentIsString('');
helper.fixtures.addComponentUtilsIsString();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();

// modify only bar/foo and utils/is-type, not utils/is-string
helper.fixtures.createComponentBarFoo(barFooV2);
Expand Down Expand Up @@ -148,7 +148,7 @@ describe('bit diff command', function () {
helper.scopeHelper.reInitWorkspace();
helper.fixtures.createComponentBarFoo(barFooV1);
helper.fixtures.addComponentBarFoo();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.fs.createFile('bar', 'foo2.js', barFooV2);
fs.removeSync(path.join(helper.scopes.localPath, 'bar/foo.js'));
helper.command.addComponent('bar', { i: 'bar/foo', m: 'bar/foo2.js' });
Expand Down Expand Up @@ -184,7 +184,7 @@ describe('bit diff command', function () {
});
describe('running bit diff between the previous version and the last version', () => {
before(() => {
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
output = helper.command.diff('bar/foo 0.0.1 0.0.2');
});
it('should indicate the deleted files as deleted', () => {
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('bit diff command', function () {
helper.fixtures.addComponentBarFoo();
helper.fixtures.createComponentIsType();
helper.fixtures.addComponentUtilsIsType();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
// modify source in bar/foo, and add a file in utils/is-type so both filesDiff and fieldsDiff appear
helper.fixtures.createComponentBarFoo(barFooV2);
helper.fs.createFile('is-type', 'extra.js', "module.exports = 'extra';\n");
Expand Down
18 changes: 9 additions & 9 deletions e2e/commands/export.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('bit export command', function () {
helper.fixtures.addComponentBarFoo();
helper.fixtures.tagComponentBarFoo();
helper.command.exportIds('bar/foo');
helper.command.tagComponent('bar/foo --unmodified');
helper.command.tagWithoutBuild('bar/foo', '--unmodified');
helper.command.exportIds('bar/foo');
});
it('should export it with no errors', () => {
Expand Down Expand Up @@ -84,7 +84,7 @@ describe('bit export command', function () {
const stats = fs.statSync(destPngFile);
pngSize = stats.size;
helper.command.addComponent('bar', { m: 'foo.js', i: 'bar/foo' });
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();
});
it('should export it with no errors', () => {
Expand Down Expand Up @@ -123,10 +123,10 @@ describe('bit export command', function () {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.createComponentBarFoo('// v2');
helper.fixtures.addComponentBarFoo();
helper.command.tagIncludeUnmodified('2.0.0');
helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0');
helper.command.export();
helper.fixtures.createComponentBarFoo('// v1');
helper.command.tagIncludeUnmodified('1.0.0');
helper.command.tagIncludeUnmodifiedWithoutBuild('1.0.0');
helper.command.export();
});
it('.bitmap should keep the current version and do not update to the latest version', () => {
Expand Down Expand Up @@ -154,7 +154,7 @@ describe('bit export command', function () {
helper.fixtures.createComponentBarFoo();
helper.fixtures.addComponentBarFoo();
helper.workspaceJsonc.setupDefault();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
scopeBeforeExport = helper.scopeHelper.cloneWorkspace();
});
describe('when the group name does not exist', () => {
Expand Down Expand Up @@ -195,7 +195,7 @@ describe('bit export command', function () {
before(() => {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.populateComponents(1);
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();
helper.scopeHelper.reInitRemoteScope();
});
Expand Down Expand Up @@ -232,11 +232,11 @@ describe('bit export command', function () {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.createComponentBarFoo();
helper.fixtures.addComponentBarFoo();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();
helper.command.tagComponent('bar/foo --unmodified');
helper.command.tagWithoutBuild('bar/foo', '--unmodified');
helper.command.export();
helper.command.tagComponent('bar/foo --unmodified');
helper.command.tagWithoutBuild('bar/foo', '--unmodified');
output = helper.command.exportIds('bar/foo');
});
// this was a bug where on the third export, it parses the id "bar/foo" as: { scope: bar, name: foo }
Expand Down
2 changes: 1 addition & 1 deletion e2e/commands/import-all.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('bit import command with no ids', function () {
let output;
before(() => {
helper.scopeHelper.getClonedWorkspace(localScope);
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
output = helper.command.runCmd(`bit import ${helper.scopes.remote}/bar/foo --merge=manual`);
});
it('should display a successful message', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/commands/import.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ describe('bit import', function () {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.createComponentBarFoo();
helper.fixtures.addComponentBarFoo();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.exportIds('bar/foo');
const bitMap = helper.bitMap.read();
helper.scopeHelper.reInitWorkspace();
Expand Down
2 changes: 1 addition & 1 deletion e2e/commands/list.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('bit list command', function () {
helper.scopeHelper.reInitWorkspace();
helper.scopeHelper.addRemoteScope();
helper.command.importComponent('bar/foo@0.0.1');
helper.command.tagComponent('bar/foo', 'msg', '--unmodified');
helper.command.tagWithoutBuild('bar/foo', '--unmodified');
helper.command.export();

helper.scopeHelper.getClonedWorkspace(clonedScopePath);
Expand Down
6 changes: 3 additions & 3 deletions e2e/commands/remove.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ describe('bit remove command', function () {
// this additional is to prevent another bug, where nested are imported only with their
// latest version and then when 'bit remove' tries to remove all versions array of
// ModelComponent, it doesn't find some of them and throws ENOENT error
helper.command.tagIncludeUnmodified('1.0.0');
helper.command.tagIncludeUnmodifiedWithoutBuild('1.0.0');

helper.command.export();
helper.scopeHelper.reInitWorkspace();
Expand Down Expand Up @@ -426,7 +426,7 @@ describe('bit remove command', function () {
before(() => {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.populateComponents(2);
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();

helper.command.deleteComponent('comp2');
Expand All @@ -440,7 +440,7 @@ describe('bit remove command', function () {
before(() => {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.populateComponents(2);
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();

helper.scopeHelper.reInitWorkspace();
Expand Down
4 changes: 2 additions & 2 deletions e2e/commands/reset.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ describe('bit reset command', function () {
let untagOutput;
before(() => {
helper.scopeHelper.getClonedWorkspace(localScope);
helper.command.tagIncludeUnmodified('0.0.5');
helper.command.tagIncludeUnmodifiedWithoutBuild('0.0.5');
untagOutput = helper.command.resetAll('--head');
});
it('should display a descriptive successful message', () => {
Expand Down Expand Up @@ -205,7 +205,7 @@ describe('bit reset command', function () {
helper.scopeHelper.reInitRemoteScope();
helper.scopeHelper.addRemoteScope();
helper.command.export();
helper.command.tagIncludeUnmodified('1.0.5');
helper.command.tagIncludeUnmodifiedWithoutBuild('1.0.5');
try {
output = helper.command.reset('utils/is-type');
} catch (err: any) {
Expand Down
2 changes: 1 addition & 1 deletion e2e/commands/tag.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('bit tag command', function () {
helper.fs.createFile('components/default', 'default.js');
helper.command.addComponent('components/default', { i: 'components/default' });
const version = 'invalidVersion';
const tag = () => helper.command.tagWithoutMessage('components/default', version);
const tag = () => helper.command.tagWithoutBuild('components/default', `--ver ${version}`);
expect(tag).to.throw(
`error: version ${version} is not a valid semantic version. learn more: https://semver.org`
);
Expand Down
2 changes: 1 addition & 1 deletion e2e/flows/id-with-wildcard.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ describe('component id with wildcard', function () {
before(() => {
helper.scopeHelper.getClonedWorkspace(scopeAfterAdd);
helper.command.tagAllWithoutBuild();
helper.command.tagIncludeUnmodified('0.0.5');
helper.command.tagIncludeUnmodifiedWithoutBuild('0.0.5');

// as an intermediate step, make sure all components are staged
const status = helper.command.statusJson();
Expand Down
6 changes: 3 additions & 3 deletions e2e/flows/out-of-sync-componets.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ describe('components that are not synced between the scope and the consumer', fu
helper.fixtures.createComponentBarFoo();
helper.fixtures.addComponentBarFoo();
helper.fixtures.tagComponentBarFoo();
helper.command.tagIncludeUnmodified('2.0.0');
helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0');
const bitMap = helper.bitMap.read();
helper.command.reset('bar/foo', true);
helper.bitMap.write(bitMap);
Expand Down Expand Up @@ -237,7 +237,7 @@ describe('components that are not synced between the scope and the consumer', fu
helper.fixtures.tagComponentBarFoo();
helper.command.export();
scopeAfterV1 = helper.scopeHelper.cloneWorkspace();
helper.command.tagIncludeUnmodified('2.0.0');
helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0');
helper.command.export();
const bitMap = helper.bitMap.read();
helper.scopeHelper.getClonedWorkspace(scopeAfterV1);
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('components that are not synced between the scope and the consumer', fu
helper.fixtures.tagComponentBarFoo();
helper.command.export();
scopeAfterV1 = helper.scopeHelper.cloneWorkspace();
helper.command.tagIncludeUnmodified('2.0.0');
helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0');
helper.command.export();
const bitMap = helper.bitMap.read();
helper.scopeHelper.getClonedWorkspace(scopeAfterV1);
Expand Down
2 changes: 1 addition & 1 deletion e2e/flows/same-name-different-scopes.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('two components with the same name but different scope-name', function
helper.fixtures.addComponentBarFoo();
helper.command.setScope(scopeName, 'bar/foo');
helper.command.tagAllWithoutBuild();
helper.command.tagIncludeUnmodified('0.0.2');
helper.command.tagIncludeUnmodifiedWithoutBuild('0.0.2');
helper.command.exportIds('bar/foo');

helper.scopeHelper.setWorkspaceWithRemoteScope();
Expand Down
6 changes: 3 additions & 3 deletions e2e/functionalities/peer-dependency-component.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ describe('set-peer', function () {
describe('unset-peer', () => {
before(() => {
helper.command.unsetPeer('comp2');
helper.command.snapAllComponents();
helper.command.snapAllComponentsWithoutBuild();
helper.command.build();
});
it('should remove the always peer fields from the scope data', () => {
Expand Down Expand Up @@ -219,7 +219,7 @@ describe('set-peer for existing component', function () {
helper.scopeHelper.reInitWorkspace();
helper.fixtures.populateComponents(2);
helper.command.install();
helper.command.snapAllComponents();
helper.command.snapAllComponentsWithoutBuild();
helper.command.setPeer('comp2', '0');
helper.command.install();
helper.command.build();
Expand Down Expand Up @@ -268,7 +268,7 @@ describe('unset-peer for existing component', function () {
helper.fixtures.populateComponents(2);
helper.command.setPeer('comp2', '0');
helper.command.install();
helper.command.snapAllComponents(); // caches comp2 as peer dep of comp1
helper.command.snapAllComponentsWithoutBuild(); // caches comp2 as peer dep of comp1
helper.command.unsetPeer('comp2');
helper.command.install();
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/aspect.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe('aspect', function () {
});
it('bit tag should save only the updated aspect and not the old one', () => {
helper.command.importComponent('my-aspect'); // otherwise, the tag will try to get it as a package
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
const cmp = helper.command.catComponent(`${helper.scopes.remote}/comp1@latest`, undefined, false);
expect(cmp).to.have.string(`${helper.scopes.remote}/my-aspect@0.0.2`);
expect(cmp).not.to.have.string(`${helper.scopes.remote}/my-aspect@0.0.1`);
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/build-cmd.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ describe('package and capsule generation identity', () => {
helper = new Helper();
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.populateComponents(3);
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();

// Only modify comp2 to trigger rebuild
Expand Down
4 changes: 2 additions & 2 deletions e2e/harmony/checkout-harmony.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ describe('bit checkout command', function () {
helper.fixtures.createComponentBarFoo('console.log("modified components");');
});
it('should throw an error NewerVersionFound', () => {
const tagFunc = () => helper.command.tagComponent('bar/foo');
const tagFunc = () => helper.command.tagWithoutBuild('bar/foo');
const error = new NewerVersionFound([
{ componentId: `${helper.scopes.remote}/bar/foo`, currentVersion: '0.0.5', latestVersion: '0.0.10' },
]);
helper.general.expectToThrow(tagFunc, error);
});
it('should allow tagging when --ignore-newest-version flag is used', () => {
const tagOutput = helper.command.tagComponent('bar/foo', 'msg', '--ignore-newest-version');
const tagOutput = helper.command.tagWithoutBuild('bar/foo', '--ignore-newest-version');
expect(tagOutput).to.have.string('1 component(s) tagged');
});
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/component-config.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('component config', function () {
helper.extensions.addExtensionToVariant(EXTENSION_FOLDER, 'teambit.harmony/aspect');
helper.command.install();
helper.command.compile();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.ejectConf('bar/foo');
componentJson = helper.componentJson.read('bar');
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/custom-env.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('custom env', function () {
describe('tag again', () => {
before(() => {
// helper.command.tagWithoutBuild(envName, '-f');
helper.command.tagComponent(envName, 'message', '--unmodified');
helper.command.tagWithoutBuild(envName, '--unmodified');
});
it('should have the correct env in the envs aspect data after additional tag', () => {
const comp1 = helper.command.catComponent('comp1@latest');
Expand Down
6 changes: 3 additions & 3 deletions e2e/harmony/delete.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ describe('bit delete command', function () {
npmCiRegistry = new NpmCiRegistry(helper);
npmCiRegistry.configureCiInPackageJsonHarmony();
await npmCiRegistry.init();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();
helper.command.createLane();
helper.command.snapAllComponentsWithoutBuild('--unmodified');
Expand Down Expand Up @@ -420,13 +420,13 @@ describe('bit delete command', function () {
helper.scopeHelper.setWorkspaceWithRemoteScope();
helper.fixtures.populateComponents(2);
helper.command.createLane();
helper.command.snapAllComponents();
helper.command.snapAllComponentsWithoutBuild();
helper.command.export();

helper.command.softRemoveOnLane('comp1');
const bitmap = helper.bitMap.read();
bitmapEntryBefore = bitmap.comp1;
helper.command.snapAllComponents('--unmodified');
helper.command.snapAllComponentsWithoutBuild('--unmodified');
output = helper.command.resetAll();
});
it('should reset the deleted component', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/dependency-resolver.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ describe('dependency-resolver extension', function () {

await npmCiRegistry.init();

helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
});
after(() => {
npmCiRegistry.destroy();
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/deps-in-capsules.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ chai.use(chaiString);
envId2 = `${helper.scopes.remote}/${envName2}`;
helper.command.install('lodash.get lodash.flatten');
helper.command.compile();
helper.command.tagAllComponents();
helper.command.tagAllWithoutBuild();
helper.command.export();

helper.scopeHelper.reInitWorkspace();
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/deps-write.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('dependencies write', function () {
},
});
helper.command.install('--add-missing-deps');
helper.command.tagAllComponents('--skip-tests');
helper.command.tagAllWithoutBuild('--skip-tests');
helper.command.export();
});
after(() => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/harmony/export-harmony.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('export functionality on Harmony', function () {
helper.command.snapAllComponentsWithoutBuild('--unmodified');
helper.command.export();
helper.command.switchLocalLane('lane-a', '-x');
helper.command.mergeLane('lane-b', '-x');
helper.command.mergeLaneWithoutBuild('lane-b', '-x');
helper.command.snapAllComponentsWithoutBuild('--unmodified');
});
// previously, it was throwing:
Expand Down
Loading
Loading