-
Notifications
You must be signed in to change notification settings - Fork 3
/
herd.feature
1300 lines (1166 loc) · 53.1 KB
/
herd.feature
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
@herd
Feature: clowder herd
# TODO: Add parallel tests
@help @cats
Scenario: herd help in empty directory
Given test directory is empty
When I run 'clowder herd -h' and 'clowder herd --help'
Then the commands succeed
@help @cats
Scenario: herd help with invalid clowder.yaml
Given cats example is initialized
And has invalid clowder.yml
When I run 'clowder herd -h' and 'clowder herd --help'
Then the commands succeed
@help @cats
Scenario: herd help with valid clowder.yaml
Given cats example is initialized
When I run 'clowder herd -h' and 'clowder herd --help'
Then the commands succeed
@cats @fail
Scenario: herd missing clowder.yml
Given test directory is empty
When I run 'clowder herd'
Then the command fails
And test directory is empty
@cats
Scenario Outline: herd default
Given cats example is initialized
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> has tracking <branch>
And project at <directory> is on <branch>
And project at <directory> is clean
And project at <directory> has <remote> with <url>
Examples:
| directory | branch | remote | url |
| mu | knead | origin | https://github.com/JrGoodle/mu.git |
| duke | purr | origin | https://github.com/JrGoodle/duke.git |
| black-cats/kishka | master | origin | https://github.com/JrGoodle/kishka.git |
| black-cats/kit | master | origin | https://github.com/JrGoodle/kit.git |
| black-cats/sasha | master | origin | https://github.com/JrGoodle/sasha.git |
| black-cats/june | master | origin | https://github.com/JrGoodle/june.git |
@cats @subdirectory
Scenario Outline: herd subdirectory
Given cats example is initialized and herded
And project at <directory> created local <test_branch>
And project at <directory> checked out <test_branch>
And project at <directory> is on <test_branch>
When I change to directory black-cats
And I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <end_branch>
Examples:
| directory | test_branch | end_branch |
| mu | sub | knead |
| duke | sub | purr |
| black-cats/kishka | sub | master |
| black-cats/kit | sub | master |
| black-cats/sasha | sub | master |
| black-cats/june | sub | master |
@cats
Scenario Outline: herd commits
Given cats example is initialized
And <directory> doesn't exist
And linked static-refs clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <commit>
And project at <directory> has detached HEAD
And project at <directory> is clean
Examples:
| directory | commit |
| mu | cddce39214a1ae20266d9ee36966de67438625d1 |
| duke | 7083e8840e1bb972b7664cfa20bbd7a25f004018 |
| black-cats/kit | da5c3d32ec2c00aba4a9f7d822cce2c727f7f5dd |
| black-cats/kishka | d185e3bff9eaaf6e146d4e09165276cd5c9f31c8 |
| black-cats/june | b6e1316cc62cb2ba18fa982fc3d67ef4408c8bfd |
| black-cats/sasha | 775979e0b1a7f753131bf16a4794c851c67108d8 |
@cats
Scenario Outline: herd tags
Given cats example is initialized
And <directory> doesn't exist
And linked tags clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <tag>
And project at <directory> has detached HEAD
And project at <directory> is clean
Examples:
| directory | tag |
| mu | test-clowder-yaml-tag |
| duke | purr |
| black-cats/kishka | v0.01 |
| black-cats/kit | v0.01 |
| black-cats/sasha | v0.01 |
| black-cats/june | v0.01 |
@fail @cats
Scenario Outline: clowder herd untracked file
Given cats example is initialized and herded
And created <filename> in <directory>
And project at <directory> has untracked file <filename>
And project at <directory> is on <branch>
When I run 'clowder herd'
Then the command fails
And project at <directory> has untracked file <filename>
And project at <directory> is on <branch>
Examples:
| directory | branch | filename |
| mu | knead | something.txt |
| duke | purr | something.txt |
| black-cats/kishka | master | something.txt |
| black-cats/kit | master | something.txt |
| black-cats/sasha | master | something.txt |
| black-cats/june | master | something.txt |
@fail @cats
Scenario Outline: Test clowder herd staged file
Given cats example is initialized and herded
And created <filename> in <directory>
And project at <directory> staged <filename>
And project at <directory> is dirty
And project at <directory> is on <branch>
When I run 'clowder herd'
Then the command fails
And project at <directory> is dirty
And project at <directory> has staged <filename>
And project at <directory> is on <branch>
Examples:
| directory | branch | filename |
| mu | knead | something.txt |
| duke | purr | something.txt |
| black-cats/kishka | master | something.txt |
| black-cats/kit | master | something.txt |
| black-cats/sasha | master | something.txt |
| black-cats/june | master | something.txt |
@cats
Scenario Outline: herd from detached HEAD
Given cats example is initialized and herded
And project at <directory> checked out detached HEAD behind <branch>
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
# FIXME: Implement this
# @fail @cats
# Scenario: Test clowder herd rebase in progress
# Given cats example is initialized and herded
# And created file something.txt in directory mu
# And project at mu staged file something.txt
# When I run 'clowder herd'
# Then the command fails
## And project at mu has staged file something.txt
# And project at mu is dirty
# TODO: Probably should come up with a better test for this (i.e. save a new version and its commit hashes
# and then herd and check them in the Then section
@cats
Scenario Outline: herd previously saved version
Given cats example is initialized
And <directory> doesn't exist
And linked v0.1 clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <commit>
And project at <directory> has detached HEAD
And project at <directory> is clean
Examples:
| directory | commit |
| mu | cddce39214a1ae20266d9ee36966de67438625d1 |
| duke | 7083e8840e1bb972b7664cfa20bbd7a25f004018 |
| black-cats/kit | f2e20031ddce5cb097105f4d8ccbc77f4ac20709 |
| black-cats/kishka | d185e3bff9eaaf6e146d4e09165276cd5c9f31c8 |
| black-cats/june | b6e1316cc62cb2ba18fa982fc3d67ef4408c8bfd |
| black-cats/sasha | 775979e0b1a7f753131bf16a4794c851c67108d8 |
@submodules @cats
Scenario Outline: herd submodules recursive enabled directories
Given cats example is initialized
And <directory> doesn't exist
And linked submodules clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
Examples:
| directory |
| mu |
| mu/ash |
| mu/ash/duffy |
| duke |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@submodules @cats
Scenario Outline: herd submodules recursive enabled git projects
Given cats example is initialized
And <directory> doesn't exist
And linked submodules clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
And project at <directory> is a git repository
And project at <directory> is clean
Examples:
| directory |
| mu |
| duke |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@submodules @cats
Scenario Outline: herd submodules recursive enabled check submodules
Given cats example is initialized
And <directory> doesn't exist
And linked submodules clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
And project at <directory> is clean
And project at <directory> has submodule at <submodule_path>
And submodule in <directory> at <submodule_path> is initialized
# TODO: Check submodule url
Examples:
| directory | submodule_path |
| mu | ash |
@submodules @cats
Scenario Outline: herd submodules recursive enabled check recursive submodules
Given cats example is initialized
And <directory> doesn't exist
And linked submodules clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
And project at <directory> is clean
And project at <directory> has submodule at <submodule_path>
And submodule in <directory> at <submodule_path> is initialized
# TODO: Check submodule url
Examples:
| directory | submodule_path |
| mu | ash/duffy |
@submodules @cats
Scenario Outline: herd submodules disabled check non-submodules exist
Given cats example is initialized
And <directory> doesn't exist
And linked submodules-no-recurse clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
And project at <directory> is a git repository
And project at <directory> is clean
Examples:
| directory |
| mu |
| duke |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@submodules @cats
Scenario Outline: herd submodules disabled check submodules don't exist
Given cats example is initialized
And <directory> doesn't exist
And linked submodules-no-recurse clowder version
When I run 'clowder herd'
Then the command succeeds
And project at <directory> has submodule at <submodule_path>
# TODO: Check submodule url
And submodule in <directory> at <submodule_path> is not initialized
Examples:
| directory | submodule_path |
| mu | ash |
# TODO: Add tests for groups/projects
@misc @upstream @ssh
Scenario Outline: herd upstream remote urls ssh defaults
Given misc example is initialized
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> has <remote> with <url>
Examples:
| directory | branch | remote | url |
| djinni | master | origin | git@github.com:JrGoodle/djinni.git |
| djinni | master | upstream | git@github.com:dropbox/djinni.git |
| gyp | fork-branch | origin | git@github.com:JrGoodle/gyp.git |
| gyp | fork-branch | upstream | https://chromium.googlesource.com/external/gyp.git |
| sox | master | origin | git@github.com:JrGoodle/sox.git |
| sox | master | upstream | https://git.code.sf.net/p/sox/code.git |
# TODO: Add tests for groups/projects
@misc @upstream
Scenario Outline: herd upstream remote urls https defaults
Given misc example is initialized
And linked https clowder version
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> exists
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> has <remote> with <url>
Examples:
| directory | branch | remote | url |
| djinni | master | origin | https://github.com/JrGoodle/djinni.git |
| djinni | master | upstream | https://github.com/dropbox/djinni.git |
| gyp | fork-branch | origin | https://github.com/JrGoodle/gyp.git |
| gyp | fork-branch | upstream | https://chromium.googlesource.com/external/gyp.git |
| sox | master | origin | https://github.com/JrGoodle/sox.git |
| sox | master | upstream | https://git.code.sf.net/p/sox/code.git |
# TODO: Add tests for groups/projects
@misc @upstream @ssh
Scenario Outline: herd upstream remote urls override ssh command line
Given misc example is initialized
And linked https clowder version
And <directory> doesn't exist
When I run 'clowder herd -p ssh'
Then the command succeeds
And project at <directory> exists
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> has <remote> with <url>
Examples:
| directory | branch | remote | url |
| djinni | master | origin | git@github.com:JrGoodle/djinni.git |
| djinni | master | upstream | git@github.com:dropbox/djinni.git |
| gyp | fork-branch | origin | git@github.com:JrGoodle/gyp.git |
| gyp | fork-branch | upstream | https://chromium.googlesource.com/external/gyp.git |
| sox | master | origin | git@github.com:JrGoodle/sox.git |
| sox | master | upstream | https://git.code.sf.net/p/sox/code.git |
# TODO: Add tests for groups/projects
@misc @upstream
Scenario Outline: herd upstream remote urls override https command line
Given misc example is initialized
And <directory> doesn't exist
When I run 'clowder herd -p https'
Then the command succeeds
And project at <directory> exists
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> has <remote> with <url>
Examples:
| directory | branch | remote | url |
| djinni | master | origin | https://github.com/JrGoodle/djinni.git |
| djinni | master | upstream | https://github.com/dropbox/djinni.git |
| gyp | fork-branch | origin | https://github.com/JrGoodle/gyp.git |
| gyp | fork-branch | upstream | https://chromium.googlesource.com/external/gyp.git |
| sox | master | origin | https://github.com/JrGoodle/sox.git |
| sox | master | upstream | https://git.code.sf.net/p/sox/code.git |
# TODO: Add tests for logic renaming remotes
@misc @upstream
Scenario: herd project with branch behind upstream
Given misc example is initialized and herded with https
And project at gyp is on branch fork-branch
And project at gyp is on commit bd11dd1c51ef17592384df927c47023071639f96
When I change to directory gyp
And I run 'git pull upstream master'
Then the command succeeds
And project at gyp is not on commit bd11dd1c51ef17592384df927c47023071639f96
And project at gyp is on branch fork-branch
@cats
Scenario Outline: herd non-symlink yaml file
Given cats example non-symlink yaml file exists
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
@cats
Scenario Outline: herd groups default included
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu-cat | knead |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
@cats
Scenario Outline: herd groups default excluded
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And <directory> doesn't exist
Examples:
| directory |
| mu |
| duke |
@cats
Scenario Outline: herd group black-cats included
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd black-cats'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
@cats
Scenario Outline: herd group black-cats excluded
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd black-cats'
Then the command succeeds
And <directory> doesn't exist
Examples:
| directory |
| mu |
| duke |
| mu-cat |
@cats
Scenario Outline: herd group cats included
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd cats'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| mu-cat | knead |
@cats
Scenario Outline: herd group cats excluded
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd cats'
Then the command succeeds
And <directory> doesn't exist
Examples:
| directory |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@cats
Scenario Outline: herd groups "cats black-cats"
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd cats black-cats'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| mu-cat | knead |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
@cats
Scenario Outline: herd project name JrGoodle/mu included
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd JrGoodle/mu'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| mu-cat | knead |
@cats
Scenario Outline: herd project name JrGoodle/mu excluded
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd JrGoodle/mu'
Then the command succeeds
And <directory> doesn't exist
Examples:
| directory |
| duke |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@cats
Scenario Outline: herd project path mu included
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd mu'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
@cats
Scenario Outline: herd project path mu excluded
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd mu'
Then the command succeeds
And <directory> doesn't exist
Examples:
| directory |
| mu-cat |
| duke |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@cats
Scenario Outline: herd groups "all notdefault"
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd all notdefault'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| mu-cat | knead |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
@cats
Scenario Outline: herd groups "notdefault" included
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd notdefault'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
@cats
Scenario Outline: herd groups "notdefault" excluded
Given cats example is initialized
And linked groups clowder version
And <directory> doesn't exist
When I run 'clowder herd notdefault'
Then the command succeeds
And <directory> doesn't exist
Examples:
| directory |
| mu-cat |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@fail @cats @offline
Scenario Outline: herd default offline
Given cats example is initialized
And <directory> doesn't exist
When the network connection is disabled
And I run 'clowder herd'
And the network connection is enabled
Then the command fails
And <directory> doesn't exist
Examples:
| directory |
| mu |
| duke |
| black-cats/kishka |
| black-cats/kit |
| black-cats/sasha |
| black-cats/june |
@cats @internet @write @ssh
Scenario Outline: herd rebase with conflict
Given cats example is initialized and herded with ssh
And linked test-branch-ssh clowder version
And cats example projects have tracking branch <test_branch>
And project at <directory> checked out <test_branch>
And project at <directory> is behind upstream <test_branch> by <number_behind> and ahead by <number_ahead> with conflict
When I run 'clowder herd -r'
Then the command fails
And project at <directory> has rebase in progress
Examples:
| directory | test_branch | number_behind | number_ahead |
| mu | pytest | 1 | 3 |
| duke | pytest | 2 | 3 |
| black-cats/kishka | pytest | 1 | 3 |
| black-cats/kit | pytest | 2 | 3 |
| black-cats/sasha | pytest | 1 | 3 |
| black-cats/june | pytest | 2 | 3 |
@cats
Scenario Outline: herd saved version after init
Given cats example is initialized
And linked v0.1 clowder version
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <commit>
And project at <directory> has detached HEAD
And project at <directory> is clean
Examples:
| directory | commit |
| mu | cddce39214a1ae20266d9ee36966de67438625d1 |
| duke | 7083e8840e1bb972b7664cfa20bbd7a25f004018 |
| black-cats/kit | f2e20031ddce5cb097105f4d8ccbc77f4ac20709 |
| black-cats/kishka | d185e3bff9eaaf6e146d4e09165276cd5c9f31c8 |
| black-cats/june | b6e1316cc62cb2ba18fa982fc3d67ef4408c8bfd |
| black-cats/sasha | 775979e0b1a7f753131bf16a4794c851c67108d8 |
@cats
Scenario Outline: herd with missing default branch
Given cats example is initialized and herded
And project at <directory> checked out detached HEAD behind <branch>
And project at <directory> deleted local <branch>
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| black-cats/kit | master |
| black-cats/kishka | master |
| black-cats/june | master |
| black-cats/sasha | master |
@cats @fail
Scenario Outline: herd yaml configured with non-existent remote branch
Given cats example is initialized
And linked non-existent-branch clowder version
And <directory> doesn't exist
When I run 'clowder herd'
Then the command fails
And <directory> doesn't exist
Examples:
| directory |
| mu |
| duke |
| black-cats/kit |
| black-cats/kishka |
| black-cats/june |
| black-cats/sasha |
# # FIXME: Need to fetch before anything else to update remote branches that don't exist anymore
# @cats @write @ssh
# Scenario Outline: herd yaml configured with non-existent remote branch, but local branch exists
# Given cats example is initialized and herded with ssh
# And cats example projects have no remote branch <test_branch>
# And cats example projects have local branch <test_branch>
# And linked test-branch-ssh clowder version
# And project at <directory> is on <start_branch>
# When I run 'clowder herd'
# Then the command succeeds
# And project at <directory> is on <test_branch>
# And project at <directory> has no remote <test_branch>
#
# Examples:
# | directory | start_branch | test_branch |
# | mu | knead | pytest |
# | duke | purr | pytest |
# | black-cats/kit | master | pytest |
# | black-cats/kishka | master | pytest |
# | black-cats/june | master | pytest |
# | black-cats/sasha | master | pytest |
@cats @write @ssh
Scenario Outline: herd local exists, remote exists, no tracking, same commit
Given cats example is initialized and herded with ssh
And linked test-branch-ssh clowder version
And cats example projects have remote branch <test_branch>
And cats example projects have local branch <test_branch>
And project at <directory> has no tracking <test_branch>
And project at <directory> is on <start_branch>
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <test_branch>
And project at <directory> has tracking <test_branch>
Examples:
| directory | start_branch | test_branch |
| mu | knead | pytest |
| duke | purr | pytest |
| black-cats/kit | master | pytest |
| black-cats/kishka | master | pytest |
| black-cats/june | master | pytest |
| black-cats/sasha | master | pytest |
# FIXME: Needs correct implementation
# @cats @fail @write @ssh
# Scenario Outline: herd local exists, remote exists, no tracking, different commits
# Given cats example is initialized and herded with ssh
# And linked test-branch-ssh clowder version
# And cats example projects have remote branch <test_branch>
# And cats example projects have local branch <test_branch>
# And project at <directory> has no tracking <test_branch>
# And project at <directory> is on <start_branch>
# When I run 'clowder herd'
# Then the command succeeds
# And project at <directory> is on <test_branch>
# And project at <directory> has tracking <test_branch>
#
# Examples:
# | directory | start_branch | test_branch |
# | mu | knead | pytest |
# | duke | purr | pytest |
# | black-cats/kit | master | pytest |
# | black-cats/kishka | master | pytest |
# | black-cats/june | master | pytest |
# | black-cats/sasha | master | pytest |
@cats
Scenario Outline: herd after clean herd
Given cats example is initialized and herded
And project at <directory> is on <branch>
And project at <directory> is clean
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch |
| mu | knead |
| duke | purr |
| black-cats/kishka | master |
| black-cats/kit | master |
| black-cats/sasha | master |
| black-cats/june | master |
@cats
Scenario Outline: herd with rebase - check commit messages before and after
Given cats example is initialized and herded
And project at <directory> is on <branch>
And project at <directory> is behind upstream <branch> by <number_behind> and ahead by <number_ahead>
When I run 'clowder herd -r'
Then the command succeeds
And project at <directory> has rebased commits in <branch> in the correct order
And project at <directory> is on <branch>
And project at <directory> is clean
Examples:
| directory | branch | number_behind | number_ahead |
| mu | knead | 2 | 1 |
| duke | purr | 1 | 2 |
| black-cats/kishka | master | 2 | 1 |
| black-cats/kit | master | 1 | 2 |
| black-cats/sasha | master | 2 | 1 |
| black-cats/june | master | 1 | 2 |
@cats @lfs
Scenario Outline: herd lfs initial
Given cats example is initialized
And linked lfs clowder version
And lfs is not installed
And <directory> doesn't exist
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is a git repository
And project at <directory> is on <branch>
And project at <directory> is clean
And project at <directory> has lfs installed
And <filename> exists in <directory>
And <filename> in <directory> is not an lfs pointer
Examples:
| directory | branch | filename |
| mu | lfs | jrgoodle.png |
@cats @lfs
Scenario Outline: herd lfs different branch
Given cats example is initialized and herded
And linked lfs clowder version
And project at <directory> doesn't have lfs installed
And project at <directory> is on <start_branch>
And <filename> doesn't exist in <directory>
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <end_branch>
And project at <directory> is clean
And project at <directory> has lfs installed
And <filename> exists in <directory>
And <filename> in <directory> is not an lfs pointer
Examples:
| directory | start_branch | end_branch | filename |
| mu | knead | lfs | jrgoodle.png |
@cats @lfs
Scenario Outline: herd lfs same branch
Given cats example is initialized and herded
And linked lfs clowder version
And project at <directory> doesn't have lfs installed
And project at <directory> checked out <branch>
And <filename> in <directory> is an lfs pointer
When I run 'clowder herd'
Then the command succeeds
And project at <directory> is on <branch>
And project at <directory> is clean
And project at <directory> has lfs installed
And <filename> exists in <directory>
And <filename> in <directory> is not an lfs pointer
Examples:
| directory | branch | filename |
| mu | lfs | jrgoodle.png |
@cats
Scenario Outline: herd install custom git config alias
Given cats example is initialized and herded
And linked git-config clowder version
And project at <directory> is on <branch>
And project at <directory> is clean
And <filename> doesn't exist in <directory>
When I run 'clowder herd'
And I change to <directory>
And I run 'git something'
Then the commands succeed
And project at <directory> is on <branch>
And project at <directory> is clean
And project at <directory> has untracked files
And <filename> exists in <directory>
Examples:
| directory | branch | filename |
| mu | knead | something |
# TODO: Check that 'git herd' only herds a single repo
@cats
Scenario Outline: herd with git herd alias
Given cats example is initialized and herded
And project at <directory> is on <branch>
And linked static-refs clowder version
When I change to <directory>
And I run 'git herd'
Then the command succeeds
And project at <directory> is on <commit>
And project at <directory> has detached HEAD
And project at <directory> is clean
Examples:
| directory | branch | commit |
| mu | knead | cddce39214a1ae20266d9ee36966de67438625d1 |
| duke | purr | 7083e8840e1bb972b7664cfa20bbd7a25f004018 |
| black-cats/kit | master | da5c3d32ec2c00aba4a9f7d822cce2c727f7f5dd |
| black-cats/kishka | master | d185e3bff9eaaf6e146d4e09165276cd5c9f31c8 |
| black-cats/june | master | b6e1316cc62cb2ba18fa982fc3d67ef4408c8bfd |
| black-cats/sasha | master | 775979e0b1a7f753131bf16a4794c851c67108d8 |
@cats
Scenario Outline: herd with git herd alias only applies to one repo - included - mu
Given cats example is initialized and herded
And project at <directory> is on <branch>
And linked static-refs clowder version
When I change to directory mu
And I run 'git herd'
Then the command succeeds
And project at <directory> is on <commit>
And project at <directory> has detached HEAD
And project at <directory> is clean
Examples:
| directory | branch | commit |
| mu | knead | cddce39214a1ae20266d9ee36966de67438625d1 |
@cats
Scenario Outline: herd with git herd alias only applies to one repo - excluded - mu
Given cats example is initialized and herded
And project at <directory> is on <branch>
And linked static-refs clowder version
When I change to directory mu
And I run 'git herd'