summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-09-14 20:10:25 +1000
committerMarkus Roberts <Markus@reality.com>2010-09-22 21:37:50 -0700
commit79d5fde2246cc20b0ace7ed3f273a5352931f6eb (patch)
tree3227f2c022e3e32bb6043aef2199803dbc01ccc2 /spec
parent4798df328526d08644ea40161dcd2c88799b57db (diff)
downloadpuppet-79d5fde2246cc20b0ace7ed3f273a5352931f6eb.tar.gz
puppet-79d5fde2246cc20b0ace7ed3f273a5352931f6eb.tar.xz
puppet-79d5fde2246cc20b0ace7ed3f273a5352931f6eb.zip
Fixed #4763 - Hardcoded ActiveRecord version
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/rails_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/rails_spec.rb b/spec/unit/rails_spec.rb
index eaa968099..13c5a8a25 100755
--- a/spec/unit/rails_spec.rb
+++ b/spec/unit/rails_spec.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, ::ActiveRecord::VERSION::MINOR].join('.').to_f) >= 2.1 }
it "should set ActiveRecord::Base.allow_concurrency" do
ActiveRecord::Base.expects(:allow_concurrency=).with(true)