Skip to content

Commit 4fc5812

Browse files
Fix Switches.All and implement Switches.Active (#44)
1 parent 4048e77 commit 4fc5812

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

cmdutils/switches/switches.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,25 @@ func (s *Switches) Enabled(name string) bool {
121121
// All returns names of all items set in settings
122122
func (s *Switches) All() sets.String {
123123
names := sets.NewString()
124-
for k := range s.settings {
124+
for k := range s.defaults {
125125
names.Insert(k)
126126
}
127127

128128
return names
129129
}
130130

131+
// Active returns names of all active items
132+
func (s *Switches) Active() sets.String {
133+
names := sets.NewString()
134+
for k, enabled := range s.settings {
135+
if enabled {
136+
names.Insert(k)
137+
}
138+
}
139+
140+
return names
141+
}
142+
131143
// EnabledByDefault returns names of all enabled items
132144
func (s *Switches) EnabledByDefault() sets.String {
133145
names := sets.NewString()

cmdutils/switches/switches_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,19 @@ var _ = Describe("CMD Switches", func() {
3131
Expect(s.Enabled("runner-b")).To(BeFalse())
3232
})
3333
It("should return all items", func() {
34-
s := New("runner-a", "runner-b")
34+
s := New("runner-a", "runner-b", Disable("runner-c"))
3535
Expect(s.Set("*,-runner-b")).ToNot(HaveOccurred())
3636

37-
expected := sets.NewString("runner-a", "runner-b")
37+
expected := sets.NewString("runner-a", "runner-b", "runner-c")
3838
Expect(s.All()).To(Equal(expected))
3939
})
40+
It("should return only active items", func() {
41+
s := New("runner-a", "runner-b", Disable("runner-c"))
42+
Expect(s.Set("*,-runner-b")).ToNot(HaveOccurred())
43+
44+
expected := sets.NewString("runner-a")
45+
Expect(s.Active()).To(Equal(expected))
46+
})
4047
It("should return all enabled items", func() {
4148
s := New("runner-a", Disable("runner-b"))
4249

0 commit comments

Comments
 (0)