diff options
| author | Luke Kanies <luke@madstop.com> | 2008-07-16 22:00:38 -0500 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-07-17 13:08:33 +1000 |
| commit | 7fa7251e30dfefc95dda6ef82181d4346f36880d (patch) | |
| tree | 38850331af675c3ab7cde7c19e2e226471311f60 /spec/integration | |
| parent | bdbd992a6f5ff9628682179639923214d09a780c (diff) | |
The mongrel-related tests now run without mongrel.
Here were the main changes necessary:
* Fixed the class loader so it only loads mongrel if it's available.
* Fixed the test runner to skip example groups contained in non-runnable
example groups.
* Fixed the Mongrel tests to use quoted class names instead of constants,
since the constants themselves would be absent.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec/integration')
| -rwxr-xr-x | spec/integration/indirector/rest.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/indirector/rest.rb b/spec/integration/indirector/rest.rb index 7edd0b865..9efcdcbd3 100755 --- a/spec/integration/indirector/rest.rb +++ b/spec/integration/indirector/rest.rb @@ -118,7 +118,7 @@ describe Puppet::Indirector::REST do end it 'should return the instance of the model class associated with the provided lookup key' do - Puppet::TestIndirectedFoo.search('bar').collect(&:value).should == @model_instances.collect(&:value) + Puppet::TestIndirectedFoo.search('bar').collect { |i| i.value }.should == @model_instances.collect { |i| i.value } end it 'should set a version timestamp on model instances' do @@ -334,7 +334,7 @@ describe Puppet::Indirector::REST do end it 'should return the instance of the model class associated with the provided lookup key' do - Puppet::TestIndirectedFoo.search('bar').collect(&:value).should == @model_instances.collect(&:value) + Puppet::TestIndirectedFoo.search('bar').collect { |i| i.value }.should == @model_instances.collect { |i| i.value } end it 'should set an expiration on model instances' do |
