Skip to content

Commit

Permalink
fix: force interactive
Browse files Browse the repository at this point in the history
  • Loading branch information
lucassabreu committed Jun 16, 2024
1 parent b26d6e6 commit 72cc33f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
14 changes: 7 additions & 7 deletions pkg/cmd/time-entry/defaults/set/set.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ func NewCmdSet(
return err
}

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

c, err := f.Client()
if err != nil {
return err
}
Expand All @@ -71,19 +71,19 @@ func NewCmdSet(
}
}

if f.Config().IsInteractive() {
if n, err = ask(n, f.Config(), c, f.UI()); err != nil {
return err
}
}

if !f.Config().IsAllowNameForID() {
if err = checkIDs(c, n); err != nil {
return err
}
}
}

if f.Config().IsInteractive() {
if n, err = ask(n, f.Config(), c, f.UI()); err != nil {
return err
}
}

if err = f.TimeEntryDefaults().Write(n); err != nil {
return err
}
Expand Down
14 changes: 10 additions & 4 deletions pkg/cmd/time-entry/defaults/set/set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,9 @@ func TestNewCmdSet_ShouldFail_WhenInvalidArgs(t *testing.T) {

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

f.EXPECT().Client().
Return(mocks.NewMockClient(t), nil)

return f
},
},
Expand Down Expand Up @@ -622,16 +625,21 @@ func TestNewCmdSet_ShouldUpdateDefaultsFile_OnlyByFlags(t *testing.T) {
for i := range tts {
tt := &tts[i]
t.Run(tt.name, func(t *testing.T) {

f := mocks.NewMockFactory(t)

c := mocks.NewMockClient(t)
f.EXPECT().Client().
Return(c, nil)

f.EXPECT().Config().Return(&mocks.SimpleConfig{})

if len(tt.args) != 0 {
f.EXPECT().Config().Return(&mocks.SimpleConfig{
AllowNameForID: false,
Interactive: false,
})

c := mocks.NewMockClient(t)

tasks := make([]dto.Task, 0)

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

c.On("GetTags", mock.Anything).Return(tags, nil)
}

f.EXPECT().Client().Return(c, nil)
}

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

0 comments on commit 72cc33f

Please sign in to comment.