@sprucelabs/spruce-test-fixtures 58.0.12 → 58.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/__tests__/behavioral/ResettingLocalEventListeningBeforeSeeding.test.js +6 -1
- package/build/__tests__/behavioral/seeding/UsingDecorators.test.d.ts +1 -1
- package/build/__tests__/behavioral/seeding/UsingDecorators.test.js +3 -4
- package/build/esm/__tests__/behavioral/ResettingLocalEventListeningBeforeSeeding.test.js +7 -2
- package/build/esm/__tests__/behavioral/seeding/UsingDecorators.test.d.ts +1 -1
- package/build/esm/__tests__/behavioral/seeding/UsingDecorators.test.js +5 -6
- package/build/esm/tests/decorators/login.js +1 -1
- package/build/esm/tests/decorators/seed.js +10 -3
- package/build/tests/decorators/login.js +1 -1
- package/build/tests/decorators/seed.js +10 -3
- package/package.json +18 -18
|
@@ -18,7 +18,12 @@ let ResettingLocalEventListeningBeforeSeedingTest = class ResettingLocalEventLis
|
|
|
18
18
|
await __1.login.getClient().on('create-organization::v2020_12_25', () => {
|
|
19
19
|
this.hitCount++;
|
|
20
20
|
return {
|
|
21
|
-
organization: {
|
|
21
|
+
organization: {
|
|
22
|
+
id: (0, test_utils_1.generateId)(),
|
|
23
|
+
dateCreated: new Date().getTime(),
|
|
24
|
+
name: (0, test_utils_1.generateId)(),
|
|
25
|
+
slug: (0, test_utils_1.generateId)(),
|
|
26
|
+
},
|
|
22
27
|
};
|
|
23
28
|
});
|
|
24
29
|
}
|
|
@@ -23,8 +23,8 @@ export default class UsingDecoratorsTest extends AbstractSpruceFixtureTest {
|
|
|
23
23
|
protected static storeGetsVariablesPassed(): Promise<void>;
|
|
24
24
|
protected static storeGetsVariablesPassed2(): Promise<void>;
|
|
25
25
|
protected static canSeedPeople(baseCounts: Record<string, number>): Promise<void>;
|
|
26
|
-
private static assertExpectedSeededPeople;
|
|
27
26
|
protected static canSeedMorePeople(baseCounts: Record<string, number>): Promise<void>;
|
|
27
|
+
private static assertExpectedSeededPeople;
|
|
28
28
|
private static assertCountOrgs;
|
|
29
29
|
private static assertCountLocations;
|
|
30
30
|
private static assertCountGoods;
|
|
@@ -47,7 +47,6 @@ let UsingDecoratorsTest = class UsingDecoratorsTest extends AbstractSpruceFixtur
|
|
|
47
47
|
await super.afterAll();
|
|
48
48
|
const client = __1.MercuryFixture.getDefaultClient();
|
|
49
49
|
test_utils_1.assert.isFalsy(client);
|
|
50
|
-
test_utils_1.assert.isFalse(this.lastClient.isConnected());
|
|
51
50
|
}
|
|
52
51
|
static async loginSetsDefaultClient() {
|
|
53
52
|
const client = __1.MercuryFixture.getDefaultClient();
|
|
@@ -119,6 +118,9 @@ let UsingDecoratorsTest = class UsingDecoratorsTest extends AbstractSpruceFixtur
|
|
|
119
118
|
static async canSeedPeople(baseCounts) {
|
|
120
119
|
await this.assertExpectedSeededPeople(baseCounts);
|
|
121
120
|
}
|
|
121
|
+
static async canSeedMorePeople(baseCounts) {
|
|
122
|
+
await this.assertExpectedSeededPeople(baseCounts);
|
|
123
|
+
}
|
|
122
124
|
static async assertExpectedSeededPeople(baseCounts) {
|
|
123
125
|
const bases = Object.keys(baseCounts);
|
|
124
126
|
for (const base of bases) {
|
|
@@ -126,9 +128,6 @@ let UsingDecoratorsTest = class UsingDecoratorsTest extends AbstractSpruceFixtur
|
|
|
126
128
|
await this.assertTotalPeopleByRole(base, count);
|
|
127
129
|
}
|
|
128
130
|
}
|
|
129
|
-
static async canSeedMorePeople(baseCounts) {
|
|
130
|
-
await this.assertExpectedSeededPeople(baseCounts);
|
|
131
|
-
}
|
|
132
131
|
static async assertCountOrgs(expected) {
|
|
133
132
|
const organizations = await this.organizations.listOrganizations();
|
|
134
133
|
test_utils_1.assert.isLength(organizations, expected);
|
|
@@ -13,7 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
14
14
|
});
|
|
15
15
|
};
|
|
16
|
-
import { assert, test } from '@sprucelabs/test-utils';
|
|
16
|
+
import { assert, generateId, test } from '@sprucelabs/test-utils';
|
|
17
17
|
import { AbstractSpruceFixtureTest, login, seed } from '../../index.js';
|
|
18
18
|
import { DEMO_NUMBER_TEST_CLIENT_RECENT } from '../../tests/constants.js';
|
|
19
19
|
let ResettingLocalEventListeningBeforeSeedingTest = class ResettingLocalEventListeningBeforeSeedingTest extends AbstractSpruceFixtureTest {
|
|
@@ -30,7 +30,12 @@ let ResettingLocalEventListeningBeforeSeedingTest = class ResettingLocalEventLis
|
|
|
30
30
|
yield login.getClient().on('create-organization::v2020_12_25', () => {
|
|
31
31
|
this.hitCount++;
|
|
32
32
|
return {
|
|
33
|
-
organization: {
|
|
33
|
+
organization: {
|
|
34
|
+
id: generateId(),
|
|
35
|
+
dateCreated: new Date().getTime(),
|
|
36
|
+
name: generateId(),
|
|
37
|
+
slug: generateId(),
|
|
38
|
+
},
|
|
34
39
|
};
|
|
35
40
|
});
|
|
36
41
|
});
|
|
@@ -23,8 +23,8 @@ export default class UsingDecoratorsTest extends AbstractSpruceFixtureTest {
|
|
|
23
23
|
protected static storeGetsVariablesPassed(): Promise<void>;
|
|
24
24
|
protected static storeGetsVariablesPassed2(): Promise<void>;
|
|
25
25
|
protected static canSeedPeople(baseCounts: Record<string, number>): Promise<void>;
|
|
26
|
-
private static assertExpectedSeededPeople;
|
|
27
26
|
protected static canSeedMorePeople(baseCounts: Record<string, number>): Promise<void>;
|
|
27
|
+
private static assertExpectedSeededPeople;
|
|
28
28
|
private static assertCountOrgs;
|
|
29
29
|
private static assertCountLocations;
|
|
30
30
|
private static assertCountGoods;
|
|
@@ -60,7 +60,6 @@ let UsingDecoratorsTest = class UsingDecoratorsTest extends AbstractSpruceFixtur
|
|
|
60
60
|
yield _super.afterAll.call(this);
|
|
61
61
|
const client = MercuryFixture.getDefaultClient();
|
|
62
62
|
assert.isFalsy(client);
|
|
63
|
-
assert.isFalse(this.lastClient.isConnected());
|
|
64
63
|
});
|
|
65
64
|
}
|
|
66
65
|
static loginSetsDefaultClient() {
|
|
@@ -163,6 +162,11 @@ let UsingDecoratorsTest = class UsingDecoratorsTest extends AbstractSpruceFixtur
|
|
|
163
162
|
yield this.assertExpectedSeededPeople(baseCounts);
|
|
164
163
|
});
|
|
165
164
|
}
|
|
165
|
+
static canSeedMorePeople(baseCounts) {
|
|
166
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
167
|
+
yield this.assertExpectedSeededPeople(baseCounts);
|
|
168
|
+
});
|
|
169
|
+
}
|
|
166
170
|
static assertExpectedSeededPeople(baseCounts) {
|
|
167
171
|
return __awaiter(this, void 0, void 0, function* () {
|
|
168
172
|
const bases = Object.keys(baseCounts);
|
|
@@ -172,11 +176,6 @@ let UsingDecoratorsTest = class UsingDecoratorsTest extends AbstractSpruceFixtur
|
|
|
172
176
|
}
|
|
173
177
|
});
|
|
174
178
|
}
|
|
175
|
-
static canSeedMorePeople(baseCounts) {
|
|
176
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
177
|
-
yield this.assertExpectedSeededPeople(baseCounts);
|
|
178
|
-
});
|
|
179
|
-
}
|
|
180
179
|
static assertCountOrgs(expected) {
|
|
181
180
|
return __awaiter(this, void 0, void 0, function* () {
|
|
182
181
|
const organizations = yield this.organizations.listOrganizations();
|
|
@@ -39,9 +39,9 @@ export default function login(phone) {
|
|
|
39
39
|
Class.afterAll = () => __awaiter(this, void 0, void 0, function* () {
|
|
40
40
|
const client = MercuryFixture.getDefaultClient();
|
|
41
41
|
yield emitWillLogout(client);
|
|
42
|
-
yield (client === null || client === void 0 ? void 0 : client.disconnect());
|
|
43
42
|
MercuryFixture.clearDefaultClient();
|
|
44
43
|
yield afterAll();
|
|
44
|
+
yield (client === null || client === void 0 ? void 0 : client.disconnect());
|
|
45
45
|
});
|
|
46
46
|
};
|
|
47
47
|
}
|
|
@@ -14,17 +14,24 @@ import login from './login.js';
|
|
|
14
14
|
export default function seed(storeName, totalToSeed, ...params) {
|
|
15
15
|
return function (Class, key, descriptor) {
|
|
16
16
|
var _a, _b;
|
|
17
|
-
if (storeName === 'organizations' || storeName === 'locations')
|
|
17
|
+
if ((storeName === 'organizations' || storeName === 'locations') &&
|
|
18
|
+
!Class.beforeAll.__patched) {
|
|
18
19
|
const beforeAll = Class.beforeAll.bind(Class);
|
|
20
|
+
Class.__shouldResetAccount = false;
|
|
19
21
|
Class.beforeAll = () => __awaiter(this, void 0, void 0, function* () {
|
|
20
22
|
yield beforeAll();
|
|
21
23
|
yield login.on('did-login', () => __awaiter(this, void 0, void 0, function* () {
|
|
22
24
|
yield forceResetAccount(Class);
|
|
23
25
|
}));
|
|
24
26
|
yield login.on('will-logout', () => __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
|
|
27
|
+
// await forceResetAccount(Class)
|
|
28
|
+
// if (shouldResetTestClientOnWillLogout) {
|
|
29
|
+
//
|
|
30
|
+
// MercuryTestClient.reset()
|
|
31
|
+
// }
|
|
26
32
|
}));
|
|
27
33
|
});
|
|
34
|
+
Class.beforeAll.__patched = true;
|
|
28
35
|
}
|
|
29
36
|
StoreFixture.setShouldAutomaticallyResetDatabase(false);
|
|
30
37
|
StoreFixture.resetDbConnectionSettings();
|
|
@@ -73,8 +80,8 @@ function attachCleanup(Class) {
|
|
|
73
80
|
const afterEach = Class.afterEach.bind(Class);
|
|
74
81
|
const beforeEach = Class.beforeEach.bind(Class);
|
|
75
82
|
Class.afterEach = () => __awaiter(this, void 0, void 0, function* () {
|
|
76
|
-
shouldResetTestClient && MercuryTestClient.reset();
|
|
77
83
|
yield (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
|
|
84
|
+
shouldResetTestClient && MercuryTestClient.reset();
|
|
78
85
|
delete Class.__lastReset;
|
|
79
86
|
});
|
|
80
87
|
Class.beforeEach = () => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -32,9 +32,9 @@ function login(phone) {
|
|
|
32
32
|
Class.afterAll = async () => {
|
|
33
33
|
const client = __1.MercuryFixture.getDefaultClient();
|
|
34
34
|
await emitWillLogout(client);
|
|
35
|
-
await (client === null || client === void 0 ? void 0 : client.disconnect());
|
|
36
35
|
__1.MercuryFixture.clearDefaultClient();
|
|
37
36
|
await afterAll();
|
|
37
|
+
await (client === null || client === void 0 ? void 0 : client.disconnect());
|
|
38
38
|
};
|
|
39
39
|
};
|
|
40
40
|
}
|
|
@@ -10,17 +10,24 @@ const login_1 = __importDefault(require("./login"));
|
|
|
10
10
|
function seed(storeName, totalToSeed, ...params) {
|
|
11
11
|
return function (Class, key, descriptor) {
|
|
12
12
|
var _a, _b;
|
|
13
|
-
if (storeName === 'organizations' || storeName === 'locations')
|
|
13
|
+
if ((storeName === 'organizations' || storeName === 'locations') &&
|
|
14
|
+
!Class.beforeAll.__patched) {
|
|
14
15
|
const beforeAll = Class.beforeAll.bind(Class);
|
|
16
|
+
Class.__shouldResetAccount = false;
|
|
15
17
|
Class.beforeAll = async () => {
|
|
16
18
|
await beforeAll();
|
|
17
19
|
await login_1.default.on('did-login', async () => {
|
|
18
20
|
await forceResetAccount(Class);
|
|
19
21
|
});
|
|
20
22
|
await login_1.default.on('will-logout', async () => {
|
|
21
|
-
await forceResetAccount(Class)
|
|
23
|
+
// await forceResetAccount(Class)
|
|
24
|
+
// if (shouldResetTestClientOnWillLogout) {
|
|
25
|
+
//
|
|
26
|
+
// MercuryTestClient.reset()
|
|
27
|
+
// }
|
|
22
28
|
});
|
|
23
29
|
};
|
|
30
|
+
Class.beforeAll.__patched = true;
|
|
24
31
|
}
|
|
25
32
|
StoreFixture_1.default.setShouldAutomaticallyResetDatabase(false);
|
|
26
33
|
StoreFixture_1.default.resetDbConnectionSettings();
|
|
@@ -64,8 +71,8 @@ function attachCleanup(Class) {
|
|
|
64
71
|
const afterEach = Class.afterEach.bind(Class);
|
|
65
72
|
const beforeEach = Class.beforeEach.bind(Class);
|
|
66
73
|
Class.afterEach = async () => {
|
|
67
|
-
shouldResetTestClient && mercury_client_1.MercuryTestClient.reset();
|
|
68
74
|
await (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
|
|
75
|
+
shouldResetTestClient && mercury_client_1.MercuryTestClient.reset();
|
|
69
76
|
delete Class.__lastReset;
|
|
70
77
|
};
|
|
71
78
|
Class.beforeEach = async () => {
|
package/package.json
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"@sprucelabs/spruce-test-fixtures"
|
|
14
14
|
]
|
|
15
15
|
},
|
|
16
|
-
"version": "58.0.
|
|
16
|
+
"version": "58.0.14",
|
|
17
17
|
"files": [
|
|
18
18
|
"build/**/*",
|
|
19
19
|
"!build/__tests__",
|
|
@@ -62,27 +62,27 @@
|
|
|
62
62
|
"lint.tsc": "tsc -p . --noEmit"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@sprucelabs/data-stores": "^24.0.
|
|
65
|
+
"@sprucelabs/data-stores": "^24.0.6",
|
|
66
66
|
"@sprucelabs/error": "^5.1.2",
|
|
67
|
-
"@sprucelabs/heartwood-view-controllers": "^103.
|
|
68
|
-
"@sprucelabs/mercury-client": "^40.1.
|
|
69
|
-
"@sprucelabs/mercury-core-events": "^21.1.
|
|
70
|
-
"@sprucelabs/mercury-event-emitter": "^40.1.
|
|
71
|
-
"@sprucelabs/schema": "^28.6.
|
|
72
|
-
"@sprucelabs/spruce-core-schemas": "^38.1.
|
|
73
|
-
"@sprucelabs/spruce-event-utils": "^37.0.
|
|
74
|
-
"@sprucelabs/spruce-permission-utils": "^5.0.
|
|
75
|
-
"@sprucelabs/spruce-skill-booter": "^58.0.
|
|
76
|
-
"@sprucelabs/spruce-skill-utils": "^29.0.
|
|
77
|
-
"@sprucelabs/test-utils": "^3.4.
|
|
67
|
+
"@sprucelabs/heartwood-view-controllers": "^103.6.2",
|
|
68
|
+
"@sprucelabs/mercury-client": "^40.1.13",
|
|
69
|
+
"@sprucelabs/mercury-core-events": "^21.1.7",
|
|
70
|
+
"@sprucelabs/mercury-event-emitter": "^40.1.13",
|
|
71
|
+
"@sprucelabs/schema": "^28.6.25",
|
|
72
|
+
"@sprucelabs/spruce-core-schemas": "^38.1.11",
|
|
73
|
+
"@sprucelabs/spruce-event-utils": "^37.0.11",
|
|
74
|
+
"@sprucelabs/spruce-permission-utils": "^5.0.20",
|
|
75
|
+
"@sprucelabs/spruce-skill-booter": "^58.0.14",
|
|
76
|
+
"@sprucelabs/spruce-skill-utils": "^29.0.8",
|
|
77
|
+
"@sprucelabs/test-utils": "^3.4.54",
|
|
78
78
|
"dotenv": "^16.0.3",
|
|
79
79
|
"unique-names-generator": "^4.7.1"
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
|
-
"@sprucelabs/esm-postbuild": "^5.0.
|
|
83
|
-
"@sprucelabs/jest-json-reporter": "^7.0.
|
|
84
|
-
"@sprucelabs/jest-sheets-reporter": "^3.0.
|
|
85
|
-
"@sprucelabs/mercury-types": "^45.0.
|
|
82
|
+
"@sprucelabs/esm-postbuild": "^5.0.6",
|
|
83
|
+
"@sprucelabs/jest-json-reporter": "^7.0.40",
|
|
84
|
+
"@sprucelabs/jest-sheets-reporter": "^3.0.18",
|
|
85
|
+
"@sprucelabs/mercury-types": "^45.0.10",
|
|
86
86
|
"@sprucelabs/resolve-path-aliases": "^1.1.219",
|
|
87
87
|
"@sprucelabs/semantic-release": "^4.0.8",
|
|
88
88
|
"@sprucelabs/test": "^7.7.447",
|
|
@@ -132,5 +132,5 @@
|
|
|
132
132
|
]
|
|
133
133
|
]
|
|
134
134
|
},
|
|
135
|
-
"gitHead": "
|
|
135
|
+
"gitHead": "5f17d75a8340f73de305b3cf16a88430e355e4c7"
|
|
136
136
|
}
|