From cd6578f6a12e1b221a2d8a1e79e4c6f1209d874d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 16 Apr 2010 20:47:40 -0700 Subject: fixing invalid yaml [#4424 state:resolved] Signed-off-by: wycats --- activerecord/test/fixtures/binaries.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/test/fixtures/binaries.yml b/activerecord/test/fixtures/binaries.yml index d150c5708e..ec8f2facdc 100644 --- a/activerecord/test/fixtures/binaries.yml +++ b/activerecord/test/fixtures/binaries.yml @@ -1,6 +1,7 @@ flowers: id: 1 - data: !binary | /9j/4AAQSkZJRgABAQEASABIAAD/2wBDAA0JCQoKCg4LCw4UDQsNFBcRDg4R + data: !binary |- + /9j/4AAQSkZJRgABAQEASABIAAD/2wBDAA0JCQoKCg4LCw4UDQsNFBcRDg4R FxsVFRUVFRsbFRcXFxcVGxoeICEgHhonJyoqJyc1NTU1NTY2NjY2NjY2Njb/ 2wBDAQ4NDRERERcRERcXExQTFx0ZGhoZHSYdHR4dHSYsJCAgICAkLCgrJiYm KygvLywsLy82NjY2NjY2NjY2NjY2Njb/wAARCACvAIMDAREAAhEBAxEB/8QA -- cgit v1.2.3 From d92e3111fed2a5372d4bb8ac66c9d8542f730488 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 16 Apr 2010 21:35:10 -0700 Subject: making yaml tests less specific to emitter. [#4425 state:resolved] Signed-off-by: wycats --- activerecord/test/cases/base_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 591e04a077..2f4243a6aa 100755 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -2095,7 +2095,8 @@ class BasicsTest < ActiveRecord::TestCase assert_equal written_on_in_current_timezone, xml.elements["//written-on"].text assert_equal "datetime" , xml.elements["//written-on"].attributes['type'] - assert_equal "--- Have a nice day\n" , xml.elements["//content"].text + assert_match(/^--- Have a nice day\n/ , xml.elements["//content"].text) + assert_equal 'Have a nice day' , YAML.load(xml.elements["//content"].text) assert_equal "yaml" , xml.elements["//content"].attributes['type'] assert_equal "david@loudthinking.com", xml.elements["//author-email-address"].text -- cgit v1.2.3 From b7693dc028cea513724681a70dfd4f3e294bbc54 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 16 Apr 2010 21:49:52 -0700 Subject: working around syck defects by optionally matching a space [#4426 state:resolved] Signed-off-by: wycats --- activerecord/test/cases/xml_serialization_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb index 2849ff11b7..f5a18827d8 100644 --- a/activerecord/test/cases/xml_serialization_test.rb +++ b/activerecord/test/cases/xml_serialization_test.rb @@ -79,7 +79,7 @@ class DefaultXmlSerializationTest < ActiveRecord::TestCase end def test_should_serialize_yaml - assert_match %r{--- \n:gem: ruby\n}, @xml + assert_match %r{---\s?\n:gem: ruby\n}, @xml end end -- cgit v1.2.3 From c4846c99c51a33bd66933dd0fd5dacfac99fb9de Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 18 Apr 2010 00:12:08 -0300 Subject: Missing require added --- activerecord/test/cases/xml_serialization_test.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activerecord') diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb index f5a18827d8..b1c75ec8cd 100644 --- a/activerecord/test/cases/xml_serialization_test.rb +++ b/activerecord/test/cases/xml_serialization_test.rb @@ -4,6 +4,7 @@ require 'models/post' require 'models/author' require 'models/tagging' require 'models/comment' +require 'models/company_in_module' class XmlSerializationTest < ActiveRecord::TestCase def test_should_serialize_default_root -- cgit v1.2.3 From 64373937a393518a6e6a63255176ca297d3c009e Mon Sep 17 00:00:00 2001 From: Phil Smith Date: Thu, 15 Apr 2010 22:31:15 -0700 Subject: Make the migration generator handle pre-existing migrations with the same timestamp. In the event a migration already exists with that number, the new migration's timestamp will be incremented by 1. [#4412 state:resolved] Signed-off-by: Michael Koziarski --- activerecord/lib/rails/generators/active_record.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/rails/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb index 1ca838b4f2..d2b1e86857 100644 --- a/activerecord/lib/rails/generators/active_record.rb +++ b/activerecord/lib/rails/generators/active_record.rb @@ -19,10 +19,11 @@ module ActiveRecord # Implement the required interface for Rails::Generators::Migration. # def self.next_migration_number(dirname) #:nodoc: + next_migration_number = current_migration_number(dirname) + 1 if ActiveRecord::Base.timestamped_migrations - Time.now.utc.strftime("%Y%m%d%H%M%S") + [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max else - "%.3d" % (current_migration_number(dirname) + 1) + "%.3d" % next_migration_number end end end -- cgit v1.2.3