Skip to content

Commit 72cc33f

Browse files
committed
fix: force interactive
1 parent b26d6e6 commit 72cc33f

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

pkg/cmd/time-entry/defaults/set/set.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ func NewCmdSet(
5454
return err
5555
}
5656

57+
c, err := f.Client()
5758
if changed || d.Workspace != n.Workspace {
5859
if n.TaskID != "" && n.ProjectID == "" {
5960
return errors.New("can't set task without project")
6061
}
6162

62-
c, err := f.Client()
6363
if err != nil {
6464
return err
6565
}
@@ -71,19 +71,19 @@ func NewCmdSet(
7171
}
7272
}
7373

74-
if f.Config().IsInteractive() {
75-
if n, err = ask(n, f.Config(), c, f.UI()); err != nil {
76-
return err
77-
}
78-
}
79-
8074
if !f.Config().IsAllowNameForID() {
8175
if err = checkIDs(c, n); err != nil {
8276
return err
8377
}
8478
}
8579
}
8680

81+
if f.Config().IsInteractive() {
82+
if n, err = ask(n, f.Config(), c, f.UI()); err != nil {
83+
return err
84+
}
85+
}
86+
8787
if err = f.TimeEntryDefaults().Write(n); err != nil {
8888
return err
8989
}

pkg/cmd/time-entry/defaults/set/set_test.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,9 @@ func TestNewCmdSet_ShouldFail_WhenInvalidArgs(t *testing.T) {
515515

516516
f.EXPECT().GetWorkspaceID().Return("w", nil)
517517

518+
f.EXPECT().Client().
519+
Return(mocks.NewMockClient(t), nil)
520+
518521
return f
519522
},
520523
},
@@ -622,16 +625,21 @@ func TestNewCmdSet_ShouldUpdateDefaultsFile_OnlyByFlags(t *testing.T) {
622625
for i := range tts {
623626
tt := &tts[i]
624627
t.Run(tt.name, func(t *testing.T) {
628+
625629
f := mocks.NewMockFactory(t)
626630

631+
c := mocks.NewMockClient(t)
632+
f.EXPECT().Client().
633+
Return(c, nil)
634+
635+
f.EXPECT().Config().Return(&mocks.SimpleConfig{})
636+
627637
if len(tt.args) != 0 {
628638
f.EXPECT().Config().Return(&mocks.SimpleConfig{
629639
AllowNameForID: false,
630640
Interactive: false,
631641
})
632642

633-
c := mocks.NewMockClient(t)
634-
635643
tasks := make([]dto.Task, 0)
636644

637645
if tt.expected.TaskID != "" {
@@ -656,8 +664,6 @@ func TestNewCmdSet_ShouldUpdateDefaultsFile_OnlyByFlags(t *testing.T) {
656664

657665
c.On("GetTags", mock.Anything).Return(tags, nil)
658666
}
659-
660-
f.EXPECT().Client().Return(c, nil)
661667
}
662668

663669
f.EXPECT().GetWorkspaceID().Return(tt.expected.Workspace, nil)

0 commit comments

Comments
 (0)