Skip to content

Commit

Permalink
Merge pull request #1045 from salesforcecli/dependabot-npm_and_yarn-s…
Browse files Browse the repository at this point in the history
…alesforce-core-8.2.2

fix(deps): bump @salesforce/core from 8.1.1 to 8.2.2
  • Loading branch information
svc-cli-bot authored Jul 23, 2024
2 parents 8b48588 + 2ebc5be commit 70990b4
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 163 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
"author": "Salesforce",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^4",
"@salesforce/core": "^8.0.1",
"@salesforce/core": "^8.2.3",
"@salesforce/kit": "^3.1.6",
"@salesforce/sf-plugins-core": "^11.2.0",
"@salesforce/sf-plugins-core": "^11.2.1",
"@salesforce/ts-types": "^2.0.10"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.2.5",
"@salesforce/cli-plugins-testkit": "^5.3.18",
"@oclif/core": "^4.0.14",
"@oclif/plugin-command-snapshot": "^5.2.9",
"@salesforce/cli-plugins-testkit": "^5.3.19",
"@salesforce/dev-scripts": "^10.2.2",
"@salesforce/plugin-command-reference": "^3.1.10",
"chai-each": "^0.0.1",
"eslint-plugin-sf-plugin": "^1.18.11",
"eslint-plugin-sf-plugin": "^1.19.0",
"oclif": "^4.14.1",
"ts-node": "^10.9.2",
"typescript": "^5.5.3"
Expand Down
23 changes: 12 additions & 11 deletions test/commands/display.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { expect } from 'chai';
import { DisplayUserCommand } from '../../src/commands/org/display/user.js';

const username = '[email protected]';

const instanceUrl = 'https://instance.my.salesforce.com';
const loginUrl = 'https://test.salesforce.com';
describe('org:display:user', () => {
const $$ = new TestContext();

Expand All @@ -20,8 +21,8 @@ describe('org:display:user', () => {
defaultOrg.orgId = 'abc123';
defaultOrg.username = '[email protected]';
defaultOrg.userId = '1234567890';
defaultOrg.instanceUrl = 'instanceURL';
defaultOrg.loginUrl = 'login.test.com';
defaultOrg.instanceUrl = instanceUrl;
defaultOrg.loginUrl = loginUrl;
defaultOrg.password = '-a098u234/1!@#';

async function prepareStubs(queries = false) {
Expand All @@ -36,8 +37,8 @@ describe('org:display:user', () => {
{
getFields: () => ({
username: '[email protected]',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
}),
} as AuthInfo,
])
Expand All @@ -56,8 +57,8 @@ describe('org:display:user', () => {
username: '[email protected]',
userProfileName: 'profileName',
userId: '1234567890',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
password: '-a098u234/1!@#',
}),
} as AuthInfo,
Expand All @@ -73,8 +74,8 @@ describe('org:display:user', () => {
accessToken: defaultOrg.accessToken,
alias: 'testAlias',
id: '1234567890',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
orgId: 'abc123',
password: '-a098u234/1!@#',
profileName: 'profileName',
Expand All @@ -91,8 +92,8 @@ describe('org:display:user', () => {
accessToken: defaultOrg.accessToken,
alias: 'testAlias',
id: 'QueriedId',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
orgId: 'abc123',
profileName: 'QueriedName',
username: defaultOrg.username,
Expand Down
27 changes: 15 additions & 12 deletions test/commands/list.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { ListUsersCommand } from '../../src/commands/org/list/users.js';

const user1 = '[email protected]';
const user2 = '[email protected]';
const instanceUrl = 'https://instanceURL.com';
const loginUrl = 'https://login.test.com';

const expected = [
{
defaultMarker: '(A)',
Expand All @@ -20,8 +23,8 @@ const expected = [
profileName: 'System Administrator',
orgId: 'abc123',
accessToken: 'accessToken',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
userId: '0052D0000043PbGQAU',
},
{
Expand All @@ -31,8 +34,8 @@ const expected = [
profileName: 'System Administrator',
orgId: 'abc123',
accessToken: 'accessToken',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
userId: '0052D0000043PcBQAU',
},
];
Expand All @@ -45,17 +48,17 @@ describe('org:list:users', () => {
user1Org.orgId = 'abc123';
user1Org.aliases = ['testAlias'];
user1Org.accessToken = 'accessToken';
user1Org.instanceUrl = 'instanceURL';
user1Org.loginUrl = 'login.test.com';
user1Org.instanceUrl = instanceUrl;
user1Org.loginUrl = loginUrl;
user1Org.userId = '0052D0000043PbGQAU';

const user2Org = new MockTestOrgData();
user2Org.username = user2;
user2Org.orgId = 'abc123';
user2Org.aliases = [];
user2Org.accessToken = 'accessToken';
user2Org.instanceUrl = 'instanceURL';
user2Org.loginUrl = 'login.test.com';
user2Org.instanceUrl = instanceUrl;
user2Org.loginUrl = loginUrl;
user2Org.userId = '0052D0000043PcBQAU';

beforeEach(async () => {
Expand All @@ -72,8 +75,8 @@ describe('org:list:users', () => {
username: user1,
userProfileName: 'profileName',
userId: '1234567890',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
accessToken: 'accessToken',
}),
},
Expand All @@ -83,8 +86,8 @@ describe('org:list:users', () => {
username: user2,
userProfileName: 'profileName',
userId: '1234567890',
instanceUrl: 'instanceURL',
loginUrl: 'login.test.com',
instanceUrl,
loginUrl,
accessToken: 'accessToken',
}),
},
Expand Down
Loading

0 comments on commit 70990b4

Please sign in to comment.