Skip to content
Merged
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ node_modules
.idea

oclif.manifest.json

# ignore generated nut tests
test/nuts/generated/
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^3.1.3",
"@salesforce/cli-plugins-testkit": "^2.5.2",
"@salesforce/cli-plugins-testkit": "^3.0.2",
"@salesforce/dev-config": "^3.1.0",
"@salesforce/dev-scripts": "^3.1.0",
"@salesforce/plugin-command-reference": "^2.2.8",
Expand All @@ -28,7 +28,7 @@
"@salesforce/plugin-templates": "^55.1.0",
"@salesforce/plugin-user": "^2.1.7",
"@salesforce/prettier-config": "^0.0.2",
"@salesforce/source-testkit": "^1.2.14",
"@salesforce/source-testkit": "^2.0.2",
"@salesforce/ts-sinon": "1.4.0",
"@salesforce/ts-types": "^1.5.20",
"@types/archiver": "^5.3.1",
Expand Down
1 change: 0 additions & 1 deletion test/commands/deploy.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('deploy NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/trailheadapps/dreamhouse-lwc.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/commands/deploy/metadata.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import * as path from 'path';
import { SourceTestkit } from '@salesforce/source-testkit';

describe('deploy metadata NUTs', () => {
Expand All @@ -14,7 +13,6 @@ describe('deploy metadata NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/trailheadapps/dreamhouse-lwc.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
1 change: 0 additions & 1 deletion test/commands/deploy/metadata/cancel.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ describe('deploy metadata cancel NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/trailheadapps/dreamhouse-lwc.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/commands/deploy/metadata/quick.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import * as path from 'path';
import { SourceTestkit } from '@salesforce/source-testkit';
import { DeployResultJson } from '../../../../src/utils/types';

Expand All @@ -15,7 +14,6 @@ describe('deploy metadata quick NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/salesforcecli/sample-project-multiple-packages.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/commands/deploy/metadata/report.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import * as path from 'path';
import { SourceTestkit } from '@salesforce/source-testkit';
import { DeployResultJson } from '../../../../src/utils/types';

Expand All @@ -15,7 +14,6 @@ describe('deploy metadata report NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/salesforcecli/sample-project-multiple-packages.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
1 change: 0 additions & 1 deletion test/commands/deploy/metadata/resume.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ describe('deploy metadata resume NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/salesforcecli/sample-project-multiple-packages.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/commands/deploy/metadata/validate.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import * as path from 'path';
import { SourceTestkit } from '@salesforce/source-testkit';
import { DeployResultJson } from '../../../../src/utils/types';

Expand All @@ -15,7 +14,6 @@ describe('deploy metadata validate NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/salesforcecli/sample-project-multiple-packages.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
1 change: 0 additions & 1 deletion test/commands/retrieve/metadata.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('retrieve metadata NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/trailheadapps/dreamhouse-lwc.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
await testkit.addTestFiles();
Expand Down
1 change: 0 additions & 1 deletion test/nuts/customLabels.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ context('deploy metadata CustomLabels NUTs', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: 'https://github.com/salesforcecli/sample-project-multiple-packages.git',
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down

This file was deleted.

This file was deleted.

5 changes: 2 additions & 3 deletions test/nuts/seeds/deploy.metadata.manifest.seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ context('deploy metadata --manifest NUTs [name: %REPO_NAME%]', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: REPO.gitUrl,
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
// some deploys reference other metadata not included in the deploy, if it's not already in the org it will fail
Expand Down Expand Up @@ -57,8 +56,8 @@ context('deploy metadata --manifest NUTs [name: %REPO_NAME%]', () => {

it('should throw an error if the package.xml is not valid', async () => {
const deploy = await testkit.deploy({ args: '--manifest DOES_NOT_EXIST.xml', exitCode: 1 });
const expectedError = testkit.isLocalExecutable() ? 'Error' : 'InvalidManifestError';
testkit.expect.errorToHaveName(deploy, expectedError);
testkit.expect.errorToHaveName(deploy, 'Error');
testkit.expect.errorToHaveMessage(deploy, 'No file found at DOES_NOT_EXIST.xml')
});
});
});
1 change: 0 additions & 1 deletion test/nuts/seeds/deploy.metadata.metadata-dir.seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ context('deploy metadata --metadata-dir NUTs [name: %REPO_NAME%]', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: REPO.gitUrl,
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/nuts/seeds/deploy.metadata.metadata.seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import * as path from 'path';
import { SourceTestkit } from '@salesforce/source-testkit';
import { TEST_REPOS_MAP } from '../testMatrix';
import { DeployResultJson } from '../../../src/utils/types';
Expand All @@ -19,7 +18,6 @@ context('deploy metadata --metadata NUTs [name: %REPO_NAME%]', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: REPO.gitUrl,
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
// some deploys reference other metadata not included in the deploy, if it's not already in the org it will fail
Expand Down
1 change: 0 additions & 1 deletion test/nuts/seeds/deploy.metadata.source-dir.seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ context('deploy metadata --source-dir NUTs [name: %REPO_NAME%]', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: REPO.gitUrl,
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/nuts/seeds/deploy.metadata.test-level.seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import * as path from 'path';
import { SourceTestkit } from '@salesforce/source-testkit';
import { TEST_REPOS_MAP } from '../testMatrix';

Expand All @@ -18,7 +17,6 @@ context('deploy metadata --test-level NUTs [name: %REPO_NAME%]', () => {
before(async () => {
testkit = await SourceTestkit.create({
repository: REPO.gitUrl,
executable: path.join(process.cwd(), 'bin', 'dev'),
nut: __filename,
});

Expand Down
Loading