@@ -19,7 +19,11 @@ fn team_create() {
19
19
let user = model. create_user ( "mark" ) ;
20
20
let user2 = model. create_user ( "jan" ) ;
21
21
let gh = model. gh_model ( ) ;
22
- model. create_team ( TeamData :: new ( "admins" ) . gh_team ( DEFAULT_ORG , "admins-gh" , & [ user, user2] ) ) ;
22
+ model. create_team ( TeamData :: new_builder ( "admins" ) . gh_team (
23
+ DEFAULT_ORG ,
24
+ "admins-gh" ,
25
+ & [ user, user2] ,
26
+ ) ) ;
23
27
let team_diff = model. diff_teams ( gh) ;
24
28
insta:: assert_debug_snapshot!( team_diff, @r###"
25
29
[
@@ -50,7 +54,7 @@ fn team_add_member() {
50
54
let mut model = DataModel :: default ( ) ;
51
55
let user = model. create_user ( "mark" ) ;
52
56
let user2 = model. create_user ( "jan" ) ;
53
- model. create_team ( TeamData :: new ( "admins" ) . gh_team ( DEFAULT_ORG , "admins-gh" , & [ user] ) ) ;
57
+ model. create_team ( TeamData :: new_builder ( "admins" ) . gh_team ( DEFAULT_ORG , "admins-gh" , & [ user] ) ) ;
54
58
let gh = model. gh_model ( ) ;
55
59
56
60
model. get_team ( "admins" ) . add_gh_member ( "admins-gh" , user2) ;
@@ -87,7 +91,7 @@ fn team_dont_add_member_if_invitation_is_pending() {
87
91
let mut model = DataModel :: default ( ) ;
88
92
let user = model. create_user ( "mark" ) ;
89
93
let user2 = model. create_user ( "jan" ) ;
90
- model. create_team ( TeamData :: new ( "admins" ) . gh_team ( DEFAULT_ORG , "admins-gh" , & [ user] ) ) ;
94
+ model. create_team ( TeamData :: new_builder ( "admins" ) . gh_team ( DEFAULT_ORG , "admins-gh" , & [ user] ) ) ;
91
95
let mut gh = model. gh_model ( ) ;
92
96
93
97
model. get_team ( "admins" ) . add_gh_member ( "admins-gh" , user2) ;
@@ -102,7 +106,11 @@ fn team_remove_member() {
102
106
let mut model = DataModel :: default ( ) ;
103
107
let user = model. create_user ( "mark" ) ;
104
108
let user2 = model. create_user ( "jan" ) ;
105
- model. create_team ( TeamData :: new ( "admins" ) . gh_team ( DEFAULT_ORG , "admins-gh" , & [ user, user2] ) ) ;
109
+ model. create_team ( TeamData :: new_builder ( "admins" ) . gh_team (
110
+ DEFAULT_ORG ,
111
+ "admins-gh" ,
112
+ & [ user, user2] ,
113
+ ) ) ;
106
114
let gh = model. gh_model ( ) ;
107
115
108
116
model
@@ -143,7 +151,7 @@ fn team_delete() {
143
151
// We need at least two github teams, otherwise the diff for removing the last GH team
144
152
// won't be generated, because no organization is known to scan for existing unmanaged teams.
145
153
model. create_team (
146
- TeamData :: new ( "admins" )
154
+ TeamData :: new_builder ( "admins" )
147
155
. gh_team ( DEFAULT_ORG , "admins-gh" , & [ user] )
148
156
. gh_team ( DEFAULT_ORG , "users-gh" , & [ user] ) ,
149
157
) ;
@@ -176,7 +184,7 @@ fn repo_noop() {
176
184
#[ test]
177
185
fn repo_change_description ( ) {
178
186
let mut model = DataModel :: default ( ) ;
179
- model. create_repo ( RepoData :: new ( "repo1" ) . description ( "foo" . to_string ( ) ) ) ;
187
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . description ( "foo" . to_string ( ) ) ) ;
180
188
let gh = model. gh_model ( ) ;
181
189
model. get_repo ( "repo1" ) . description = "bar" . to_string ( ) ;
182
190
@@ -213,7 +221,7 @@ fn repo_change_description() {
213
221
#[ test]
214
222
fn repo_change_homepage ( ) {
215
223
let mut model = DataModel :: default ( ) ;
216
- model. create_repo ( RepoData :: new ( "repo1" ) . homepage ( Some ( "https://foo.rs" . to_string ( ) ) ) ) ;
224
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . homepage ( Some ( "https://foo.rs" . to_string ( ) ) ) ) ;
217
225
let gh = model. gh_model ( ) ;
218
226
model. get_repo ( "repo1" ) . homepage = Some ( "https://bar.rs" . to_string ( ) ) ;
219
227
@@ -257,7 +265,7 @@ fn repo_create() {
257
265
let gh = model. gh_model ( ) ;
258
266
259
267
model. create_repo (
260
- RepoData :: new ( "repo1" )
268
+ RepoData :: new_builder ( "repo1" )
261
269
. description ( "foo" . to_string ( ) )
262
270
. member ( "user1" , RepoPermission :: Write )
263
271
. team ( "team1" , RepoPermission :: Triage )
@@ -322,7 +330,7 @@ fn repo_create() {
322
330
fn repo_add_member ( ) {
323
331
let mut model = DataModel :: default ( ) ;
324
332
model. create_repo (
325
- RepoData :: new ( "repo1" )
333
+ RepoData :: new_builder ( "repo1" )
326
334
. member ( "user1" , RepoPermission :: Write )
327
335
. team ( "team1" , RepoPermission :: Triage ) ,
328
336
) ;
@@ -374,7 +382,7 @@ fn repo_add_member() {
374
382
#[ test]
375
383
fn repo_change_member_permissions ( ) {
376
384
let mut model = DataModel :: default ( ) ;
377
- model. create_repo ( RepoData :: new ( "repo1" ) . member ( "user1" , RepoPermission :: Write ) ) ;
385
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . member ( "user1" , RepoPermission :: Write ) ) ;
378
386
379
387
let gh = model. gh_model ( ) ;
380
388
model
@@ -427,7 +435,7 @@ fn repo_change_member_permissions() {
427
435
#[ test]
428
436
fn repo_remove_member ( ) {
429
437
let mut model = DataModel :: default ( ) ;
430
- model. create_repo ( RepoData :: new ( "repo1" ) . member ( "user1" , RepoPermission :: Write ) ) ;
438
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . member ( "user1" , RepoPermission :: Write ) ) ;
431
439
432
440
let gh = model. gh_model ( ) ;
433
441
model. get_repo ( "repo1" ) . members . clear ( ) ;
@@ -474,7 +482,7 @@ fn repo_remove_member() {
474
482
#[ test]
475
483
fn repo_add_team ( ) {
476
484
let mut model = DataModel :: default ( ) ;
477
- model. create_repo ( RepoData :: new ( "repo1" ) . member ( "user1" , RepoPermission :: Write ) ) ;
485
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . member ( "user1" , RepoPermission :: Write ) ) ;
478
486
479
487
let gh = model. gh_model ( ) ;
480
488
model
@@ -523,7 +531,7 @@ fn repo_add_team() {
523
531
#[ test]
524
532
fn repo_change_team_permissions ( ) {
525
533
let mut model = DataModel :: default ( ) ;
526
- model. create_repo ( RepoData :: new ( "repo1" ) . team ( "team1" , RepoPermission :: Triage ) ) ;
534
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . team ( "team1" , RepoPermission :: Triage ) ) ;
527
535
528
536
let gh = model. gh_model ( ) ;
529
537
model. get_repo ( "repo1" ) . teams . last_mut ( ) . unwrap ( ) . permission = RepoPermission :: Admin ;
@@ -571,7 +579,7 @@ fn repo_change_team_permissions() {
571
579
#[ test]
572
580
fn repo_remove_team ( ) {
573
581
let mut model = DataModel :: default ( ) ;
574
- model. create_repo ( RepoData :: new ( "repo1" ) . team ( "team1" , RepoPermission :: Write ) ) ;
582
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . team ( "team1" , RepoPermission :: Write ) ) ;
575
583
576
584
let gh = model. gh_model ( ) ;
577
585
model. get_repo ( "repo1" ) . teams . clear ( ) ;
@@ -618,7 +626,7 @@ fn repo_remove_team() {
618
626
#[ test]
619
627
fn repo_archive_repo ( ) {
620
628
let mut model = DataModel :: default ( ) ;
621
- model. create_repo ( RepoData :: new ( "repo1" ) ) ;
629
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) ) ;
622
630
623
631
let gh = model. gh_model ( ) ;
624
632
model. get_repo ( "repo1" ) . archived = true ;
@@ -656,7 +664,7 @@ fn repo_archive_repo() {
656
664
#[ test]
657
665
fn repo_add_branch_protection ( ) {
658
666
let mut model = DataModel :: default ( ) ;
659
- model. create_repo ( RepoData :: new ( "repo1" ) . team ( "team1" , RepoPermission :: Write ) ) ;
667
+ model. create_repo ( RepoData :: new_builder ( "repo1" ) . team ( "team1" , RepoPermission :: Write ) ) ;
660
668
661
669
let gh = model. gh_model ( ) ;
662
670
model. get_repo ( "repo1" ) . branch_protections . extend ( [
@@ -730,7 +738,7 @@ fn repo_add_branch_protection() {
730
738
fn repo_update_branch_protection ( ) {
731
739
let mut model = DataModel :: default ( ) ;
732
740
model. create_repo (
733
- RepoData :: new ( "repo1" )
741
+ RepoData :: new_builder ( "repo1" )
734
742
. team ( "team1" , RepoPermission :: Write )
735
743
. branch_protections ( vec ! [
736
744
BranchProtectionBuilder :: pr_required( "master" , & [ "test" ] , 1 ) . build( ) ,
@@ -819,7 +827,7 @@ fn repo_update_branch_protection() {
819
827
fn repo_remove_branch_protection ( ) {
820
828
let mut model = DataModel :: default ( ) ;
821
829
model. create_repo (
822
- RepoData :: new ( "repo1" )
830
+ RepoData :: new_builder ( "repo1" )
823
831
. team ( "team1" , RepoPermission :: Write )
824
832
. branch_protections ( vec ! [
825
833
BranchProtectionBuilder :: pr_required( "main" , & [ "test" ] , 1 ) . build( ) ,
0 commit comments