diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-06-23 15:51:08 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 9958c805dd90acadbb56ed3095e665d8afa990cd (patch) | |
| tree | 3f37b3b2a8fd7e72c7ee41abb6808a135e264f77 | |
| parent | af8bd77a9ff68552490745ec1d479820b6b58d87 (diff) | |
| download | puppet-9958c805dd90acadbb56ed3095e665d8afa990cd.tar.gz puppet-9958c805dd90acadbb56ed3095e665d8afa990cd.tar.xz puppet-9958c805dd90acadbb56ed3095e665d8afa990cd.zip | |
[#4064] Modify the Rails spec to use the block form of confine
This prevents the lookup of the ActiveRecord constant from being
performed until after we know that the Rails feature is available (from
checking the confine of the parent describe block).
| -rwxr-xr-x | spec/unit/rails.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb index ecf48b6d4..dd8d7def4 100755 --- a/spec/unit/rails.rb +++ b/spec/unit/rails.rb @@ -48,7 +48,7 @@ describe Puppet::Rails, "when initializing any connection" do end describe "on ActiveRecord 2.1.x" do - confine "ActiveRecord 2.1.x" => (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1) + confine("ActiveRecord 2.1.x") { ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1 } it "should set ActiveRecord::Base.allow_concurrency" do ActiveRecord::Base.expects(:allow_concurrency=).with(true) |
