Permalink
Browse files

Fix build on travis

  • Loading branch information...
1 parent e248bf8 commit f9783fbef2ed9205ba157bc450e51f42b6a27262 @durran durran committed Jan 21, 2013
Showing with 12 additions and 8 deletions.
  1. +2 −0 .travis.yml
  2. +3 −1 CHANGELOG.md
  3. +1 −1 lib/mongoid/version.rb
  4. +2 −2 spec/app/models/server.rb
  5. +4 −4 spec/functional/mongoid/nested_attributes_spec.rb
View
@@ -5,3 +5,5 @@ rvm:
- jruby
- rbx-18mode
- ree
+services:
+ - mongodb
View
@@ -3,7 +3,9 @@
For instructions on upgrading to newer versions, visit
[mongoid.org](http://mongoid.org/docs/upgrading.html).
-## 2.5.2 (branch: 2.5.0-stable)
+## 2.5.2
+
+### Resolved Issues
* \#2502 Fixed cache key to properly handle when the document does not
include `Mongoid::Timestamps::Updated`. (Arthur Nogueira Neves)
View
@@ -1,4 +1,4 @@
# encoding: utf-8
module Mongoid #:nodoc
- VERSION = "2.5.1"
+ VERSION = "2.5.2"
end
@@ -1,6 +1,6 @@
class Server
include Mongoid::Document
- field :name, type: String
+ field :name, :type => String
belongs_to :node
- validates :name, presence: { allow_blank: false }
+ validates :name, :presence => { :allow_blank => false }
end
@@ -4358,8 +4358,8 @@
end
let(:params) do
- { posts_attributes:
- { "0" => { title: "Testing" }}
+ { :posts_attributes =>
+ { "0" => { :title => "Testing" }}
}
end
@@ -4383,7 +4383,7 @@
end
let!(:server) do
- node.servers.create(name: "test")
+ node.servers.create(:name => "test")
end
before do
@@ -4394,7 +4394,7 @@
let!(:update) do
node.update_attributes({
- servers_attributes: { "0" => { "_id" => server.id, "name" => "" }}
+ :servers_attributes => { "0" => { "_id" => server.id, "name" => "" }}
})
end

0 comments on commit f9783fb

Please sign in to comment.