Skip to content

Commit a2e459d

Browse files
JamieMasonJamieMason
committed
refactor(test): rename TestBuilder method
1 parent 791bbd6 commit a2e459d

6 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎src/test/builder.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl TestBuilder {
108108
Context::create(config, packages, registry_client)
109109
}
110110

111-
pub fn build_and_visit(self) -> Context {
111+
pub fn build_and_visit_packages(self) -> Context {
112112
let ctx = self.build();
113113
visit_packages(ctx)
114114
}
@@ -166,7 +166,7 @@ mod tests {
166166
"name": "package-a",
167167
"version": "1.0.0"
168168
}))
169-
.build_and_visit();
169+
.build_and_visit_packages();
170170

171171
expect(&ctx).to_have_instances(vec![ExpectedInstance {
172172
state: InstanceState::valid(IsLocalAndValid),
@@ -190,7 +190,7 @@ mod tests {
190190
"dependencies": ["foo"],
191191
"pinVersion": "2.0.0"
192192
}))
193-
.build_and_visit();
193+
.build_and_visit_packages();
194194

195195
// The test should show that foo gets pinned to 2.0.0
196196
assert!(ctx.instances.len() > 1);
@@ -203,7 +203,7 @@ mod tests {
203203
json!({"name": "package-a", "version": "1.0.0"}),
204204
json!({"name": "package-b", "version": "2.0.0"}),
205205
])
206-
.build_and_visit();
206+
.build_and_visit_packages();
207207

208208
assert_eq!(ctx.instances.len(), 2);
209209
}
@@ -217,7 +217,7 @@ mod tests {
217217
"dependencies": {"package-a": "workspace:*"}
218218
}))
219219
.with_strict(true)
220-
.build_and_visit();
220+
.build_and_visit_packages();
221221

222222
// In strict mode, workspace protocol should be invalid when differs from local
223223
assert!(ctx.instances.iter().any(|i| i.state.borrow().is_invalid()));

‎src/visit_packages/banned_test.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn refuses_to_ban_local_version() {
2626
"dependencies": ["package-a"],
2727
"isBanned": true
2828
}))
29-
.build_and_visit();
29+
.build_and_visit_packages();
3030
expect(&ctx).to_have_instances(vec![
3131
ExpectedInstance {
3232
state: InstanceState::suspect(InvalidLocalVersion),
@@ -78,7 +78,7 @@ fn removes_instance_with_name_and_version_props_strategy() {
7878
"dependencyTypes": ["customPackage"],
7979
"isBanned": true
8080
}))
81-
.build_and_visit();
81+
.build_and_visit_packages();
8282

8383
expect(&ctx).to_have_instances(vec![
8484
ExpectedInstance {
@@ -121,7 +121,7 @@ fn removes_instance_with_named_version_string_strategy() {
121121
"dependencyTypes": ["packageManager"],
122122
"isBanned": true
123123
}))
124-
.build_and_visit();
124+
.build_and_visit_packages();
125125

126126
expect(&ctx).to_have_instances(vec![
127127
ExpectedInstance {
@@ -166,7 +166,7 @@ fn removes_instance_with_unnamed_version_string_strategy() {
166166
"dependencyTypes": ["nodeVersion"],
167167
"isBanned": true
168168
}))
169-
.build_and_visit();
169+
.build_and_visit_packages();
170170

171171
expect(&ctx).to_have_instances(vec![
172172
ExpectedInstance {
@@ -203,7 +203,7 @@ fn removes_instance_with_versions_by_name_strategy() {
203203
"dependencies": ["react"],
204204
"isBanned": true
205205
}))
206-
.build_and_visit();
206+
.build_and_visit_packages();
207207

208208
expect(&ctx).to_have_instances(vec![
209209
ExpectedInstance {
@@ -259,7 +259,7 @@ fn removes_nested_property_with_unnamed_version_string_strategy() {
259259
"dependencyTypes": ["customConfig"],
260260
"isBanned": true
261261
}))
262-
.build_and_visit();
262+
.build_and_visit_packages();
263263

264264
expect(&ctx).to_have_instances(vec![
265265
ExpectedInstance {

‎src/visit_packages/ignored_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn all_instances_are_ignored() {
2727
.with_version_group(json!({
2828
"isIgnored": true
2929
}))
30-
.build_and_visit();
30+
.build_and_visit_packages();
3131
expect(&ctx).to_have_instances(vec![
3232
ExpectedInstance {
3333
state: InstanceState::valid(IsIgnored),

‎src/visit_packages/pinned_test.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mod local {
3131
"dependencies": ["package-a"],
3232
"pinVersion": "1.2.0"
3333
}))
34-
.build_and_visit();
34+
.build_and_visit_packages();
3535
expect(&ctx).to_have_instances(vec![
3636
ExpectedInstance {
3737
state: InstanceState::suspect(InvalidLocalVersion),
@@ -78,7 +78,7 @@ mod normal {
7878
"dependencies": ["foo"],
7979
"pinVersion": "1.2.0"
8080
}))
81-
.build_and_visit();
81+
.build_and_visit_packages();
8282
expect(&ctx).to_have_instances(vec![
8383
ExpectedInstance {
8484
state: InstanceState::valid(IsLocalAndValid),
@@ -117,7 +117,7 @@ mod normal {
117117
"dependencies": ["foo"],
118118
"pinVersion": "1.0.0"
119119
}))
120-
.build_and_visit();
120+
.build_and_visit_packages();
121121
expect(&ctx).to_have_instances(vec![
122122
ExpectedInstance {
123123
state: InstanceState::fixable(PinOverridesSemverRange),
@@ -156,7 +156,7 @@ mod normal {
156156
"dependencies": ["foo"],
157157
"pinVersion": "1.0.0"
158158
}))
159-
.build_and_visit();
159+
.build_and_visit_packages();
160160
expect(&ctx).to_have_instances(vec![
161161
ExpectedInstance {
162162
state: InstanceState::fixable(PinOverridesSemverRangeMismatch),
@@ -191,7 +191,7 @@ mod normal {
191191
"dependencies": ["foo"],
192192
"pinVersion": "1.0.0"
193193
}))
194-
.build_and_visit();
194+
.build_and_visit_packages();
195195
expect(&ctx).to_have_instances(vec![
196196
ExpectedInstance {
197197
state: InstanceState::valid(IsLocalAndValid),
@@ -226,7 +226,7 @@ mod normal {
226226
"dependencies": ["foo"],
227227
"pinVersion": "1.2.0"
228228
}))
229-
.build_and_visit();
229+
.build_and_visit_packages();
230230
expect(&ctx).to_have_instances(vec![
231231
ExpectedInstance {
232232
state: InstanceState::valid(IsLocalAndValid),
@@ -262,7 +262,7 @@ mod normal {
262262
"dependencyTypes": ["dev"],
263263
"pinVersion": "workspace:*"
264264
}))
265-
.build_and_visit();
265+
.build_and_visit_packages();
266266
expect(&ctx).to_have_instances(vec![
267267
ExpectedInstance {
268268
state: InstanceState::valid(IsLocalAndValid),

‎src/visit_packages/preferred_semver_test.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod local {
3030
}
3131
}),
3232
])
33-
.build_and_visit();
33+
.build_and_visit_packages();
3434
expect(&ctx).to_have_instances(vec![
3535
ExpectedInstance {
3636
state: InstanceState::suspect(InvalidLocalVersion),
@@ -74,7 +74,7 @@ mod local {
7474
}
7575
}),
7676
])
77-
.build_and_visit();
77+
.build_and_visit_packages();
7878
expect(&ctx).to_have_instances(vec![
7979
ExpectedInstance {
8080
state: InstanceState::suspect(InvalidLocalVersion),
@@ -118,7 +118,7 @@ mod local {
118118
}
119119
}),
120120
])
121-
.build_and_visit();
121+
.build_and_visit_packages();
122122
expect(&ctx).to_have_instances(vec![
123123
ExpectedInstance {
124124
state: InstanceState::suspect(InvalidLocalVersion),
@@ -162,7 +162,7 @@ mod local {
162162
}
163163
}),
164164
])
165-
.build_and_visit();
165+
.build_and_visit_packages();
166166
expect(&ctx).to_have_instances(vec![
167167
ExpectedInstance {
168168
state: InstanceState::suspect(InvalidLocalVersion),
@@ -206,7 +206,7 @@ mod local {
206206
}
207207
}),
208208
])
209-
.build_and_visit();
209+
.build_and_visit_packages();
210210
expect(&ctx).to_have_instances(vec![
211211
ExpectedInstance {
212212
state: InstanceState::suspect(InvalidLocalVersion),
@@ -250,7 +250,7 @@ mod local {
250250
}
251251
}),
252252
])
253-
.build_and_visit();
253+
.build_and_visit_packages();
254254
expect(&ctx).to_have_instances(vec![
255255
ExpectedInstance {
256256
state: InstanceState::suspect(InvalidLocalVersion),
@@ -297,7 +297,7 @@ mod local {
297297
.with_semver_group(json!({
298298
"range": "^"
299299
}))
300-
.build_and_visit();
300+
.build_and_visit_packages();
301301
expect(&ctx).to_have_instances(vec![
302302
ExpectedInstance {
303303
state: InstanceState::suspect(InvalidLocalVersion),
@@ -344,7 +344,7 @@ mod local {
344344
.with_semver_group(json!({
345345
"range": "^"
346346
}))
347-
.build_and_visit();
347+
.build_and_visit_packages();
348348
expect(&ctx).to_have_instances(vec![
349349
ExpectedInstance {
350350
state: InstanceState::suspect(InvalidLocalVersion),
@@ -391,7 +391,7 @@ mod local {
391391
.with_semver_group(json!({
392392
"range": "<"
393393
}))
394-
.build_and_visit();
394+
.build_and_visit_packages();
395395
expect(&ctx).to_have_instances(vec![
396396
ExpectedInstance {
397397
state: InstanceState::suspect(InvalidLocalVersion),
@@ -438,7 +438,7 @@ mod local {
438438
.with_semver_group(json!({
439439
"range": ">"
440440
}))
441-
.build_and_visit();
441+
.build_and_visit_packages();
442442
expect(&ctx).to_have_instances(vec![
443443
ExpectedInstance {
444444
state: InstanceState::suspect(InvalidLocalVersion),
@@ -483,7 +483,7 @@ mod highest_or_lowest {
483483
"wat": "2.0.0"
484484
}
485485
}))
486-
.build_and_visit();
486+
.build_and_visit_packages();
487487
expect(&ctx).to_have_instances(vec![
488488
ExpectedInstance {
489489
state: InstanceState::suspect(InvalidLocalVersion),
@@ -527,7 +527,7 @@ mod highest_or_lowest {
527527
"wat": "0.2.0"
528528
}
529529
}))
530-
.build_and_visit();
530+
.build_and_visit_packages();
531531
expect(&ctx).to_have_instances(vec![
532532
ExpectedInstance {
533533
state: InstanceState::suspect(InvalidLocalVersion),
@@ -581,7 +581,7 @@ mod highest_or_lowest {
581581
}
582582
}),
583583
])
584-
.build_and_visit();
584+
.build_and_visit_packages();
585585
expect(&ctx).to_have_instances(vec![
586586
ExpectedInstance {
587587
state: InstanceState::suspect(InvalidLocalVersion),
@@ -636,7 +636,7 @@ mod highest_or_lowest {
636636
}),
637637
])
638638
.with_version_groups(vec![json!({"packages": ["package-a"]}), json!({"packages": ["package-b"]})])
639-
.build_and_visit();
639+
.build_and_visit_packages();
640640
expect(&ctx).to_have_instances(vec![
641641
ExpectedInstance {
642642
state: InstanceState::suspect(InvalidLocalVersion),
@@ -698,7 +698,7 @@ mod highest_or_lowest {
698698
}
699699
}),
700700
])
701-
.build_and_visit();
701+
.build_and_visit_packages();
702702
expect(&ctx).to_have_instances(vec![
703703
ExpectedInstance {
704704
state: InstanceState::valid(IsLocalAndValid),
@@ -768,7 +768,7 @@ mod highest_or_lowest {
768768
}
769769
}),
770770
])
771-
.build_and_visit();
771+
.build_and_visit_packages();
772772
expect(&ctx).to_have_instances(vec![
773773
ExpectedInstance {
774774
state: InstanceState::suspect(InvalidLocalVersion),

‎src/visit_packages/same_range_test.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn instance_in_a_same_range_group_satisfies_every_other_and_there_are_no_semver_
3636
"policy": "sameRange"
3737
}),
3838
])
39-
.build_and_visit();
39+
.build_and_visit_packages();
4040
expect(&ctx).to_have_instances(vec![
4141
ExpectedInstance {
4242
state: InstanceState::valid(IsIgnored),
@@ -104,7 +104,7 @@ fn instance_in_a_same_range_group_satisfies_every_other_and_matches_its_semver_g
104104
"policy": "sameRange"
105105
}),
106106
])
107-
.build_and_visit();
107+
.build_and_visit_packages();
108108
expect(&ctx).to_have_instances(vec![
109109
ExpectedInstance {
110110
state: InstanceState::valid(IsIgnored),
@@ -172,7 +172,7 @@ fn instance_in_a_same_range_group_satisfies_every_other_but_mismatches_its_semve
172172
"policy": "sameRange"
173173
}),
174174
])
175-
.build_and_visit();
175+
.build_and_visit_packages();
176176
expect(&ctx).to_have_instances(vec![
177177
ExpectedInstance {
178178
state: InstanceState::valid(IsIgnored),
@@ -236,7 +236,7 @@ fn instance_in_a_same_range_group_does_not_satisfy_another() {
236236
"policy": "sameRange"
237237
}),
238238
])
239-
.build_and_visit();
239+
.build_and_visit_packages();
240240
expect(&ctx).to_have_instances(vec![
241241
ExpectedInstance {
242242
state: InstanceState::valid(IsIgnored),

0 commit comments

Comments
 (0)