Merge pull request #73 from johnbintz/symbols-for-group-names

Allow symbols for group names
This commit is contained in:
Rémy Coutable 2011-06-01 12:07:12 -07:00
commit 53adfc9e94
2 changed files with 13 additions and 3 deletions

View File

@ -90,7 +90,7 @@ module Guard
end
def group(name, &guard_definition)
guard_definition.call if guard_definition && (@@options[:group].empty? || @@options[:group].include?(name))
guard_definition.call if guard_definition && (@@options[:group].empty? || @@options[:group].include?(name.to_s))
end
def guard(name, options = {}, &watch_definition)

View File

@ -186,7 +186,11 @@ describe Guard::Dsl do
end
describe "#group" do
it "should evaluates only the specified group" do
it "should evaluates only the specified string group" do
::Guard.should_receive(:add_guard).with('test', anything, {})
lambda { subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => ['w']) }.should_not raise_error
end
it "should evaluates only the specified symbol group" do
::Guard.should_receive(:add_guard).with('test', anything, {})
lambda { subject.evaluate_guardfile(:guardfile_contents => valid_guardfile_string, :group => ['x']) }.should_not raise_error
end
@ -251,7 +255,13 @@ private
end
def valid_guardfile_string
"group 'x' do
"group 'w' do
guard 'test' do
watch('c')
end
end
group :x do
guard 'test' do
watch('c')
end