From 8f7fa55e8da2463136f2e28c0a5680783ae85fbc Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 8 Jan 2008 03:54:40 +0000 Subject: Fixtures: removed support for the ancient pre-YAML file format. Closes #10736. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8594 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../fixtures/bad_fixtures/attr_with_numeric_first_char | 1 - activerecord/test/fixtures/bad_fixtures/attr_with_spaces | 1 - activerecord/test/fixtures/bad_fixtures/blank_line | 3 --- .../test/fixtures/bad_fixtures/duplicate_attributes | 3 --- activerecord/test/fixtures/bad_fixtures/missing_value | 1 - .../fixtures/developers_projects/david_action_controller | 3 --- .../fixtures/developers_projects/david_active_record | 3 --- .../fixtures/developers_projects/jamis_active_record | 2 -- activerecord/test/fixtures/subscribers.yml | 7 +++++++ activerecord/test/fixtures/subscribers/first | 2 -- activerecord/test/fixtures/subscribers/second | 2 -- activerecord/test/fixtures_test.rb | 16 ---------------- 12 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 activerecord/test/fixtures/bad_fixtures/attr_with_numeric_first_char delete mode 100644 activerecord/test/fixtures/bad_fixtures/attr_with_spaces delete mode 100644 activerecord/test/fixtures/bad_fixtures/blank_line delete mode 100644 activerecord/test/fixtures/bad_fixtures/duplicate_attributes delete mode 100644 activerecord/test/fixtures/bad_fixtures/missing_value delete mode 100644 activerecord/test/fixtures/developers_projects/david_action_controller delete mode 100644 activerecord/test/fixtures/developers_projects/david_active_record delete mode 100644 activerecord/test/fixtures/developers_projects/jamis_active_record create mode 100644 activerecord/test/fixtures/subscribers.yml delete mode 100644 activerecord/test/fixtures/subscribers/first delete mode 100644 activerecord/test/fixtures/subscribers/second (limited to 'activerecord/test') diff --git a/activerecord/test/fixtures/bad_fixtures/attr_with_numeric_first_char b/activerecord/test/fixtures/bad_fixtures/attr_with_numeric_first_char deleted file mode 100644 index ef27947f27..0000000000 --- a/activerecord/test/fixtures/bad_fixtures/attr_with_numeric_first_char +++ /dev/null @@ -1 +0,0 @@ -1b => 1 diff --git a/activerecord/test/fixtures/bad_fixtures/attr_with_spaces b/activerecord/test/fixtures/bad_fixtures/attr_with_spaces deleted file mode 100644 index 46fd6f2fe9..0000000000 --- a/activerecord/test/fixtures/bad_fixtures/attr_with_spaces +++ /dev/null @@ -1 +0,0 @@ -a b => 1 diff --git a/activerecord/test/fixtures/bad_fixtures/blank_line b/activerecord/test/fixtures/bad_fixtures/blank_line deleted file mode 100644 index 3ea1f71743..0000000000 --- a/activerecord/test/fixtures/bad_fixtures/blank_line +++ /dev/null @@ -1,3 +0,0 @@ -a => 1 - -b => 2 diff --git a/activerecord/test/fixtures/bad_fixtures/duplicate_attributes b/activerecord/test/fixtures/bad_fixtures/duplicate_attributes deleted file mode 100644 index cc0236f26f..0000000000 --- a/activerecord/test/fixtures/bad_fixtures/duplicate_attributes +++ /dev/null @@ -1,3 +0,0 @@ -a => 1 -b => 2 -a => 3 diff --git a/activerecord/test/fixtures/bad_fixtures/missing_value b/activerecord/test/fixtures/bad_fixtures/missing_value deleted file mode 100644 index fb59ec33e8..0000000000 --- a/activerecord/test/fixtures/bad_fixtures/missing_value +++ /dev/null @@ -1 +0,0 @@ -a => diff --git a/activerecord/test/fixtures/developers_projects/david_action_controller b/activerecord/test/fixtures/developers_projects/david_action_controller deleted file mode 100644 index e6e9d0e59b..0000000000 --- a/activerecord/test/fixtures/developers_projects/david_action_controller +++ /dev/null @@ -1,3 +0,0 @@ -developer_id => 1 -project_id => 2 -joined_on => 2004-10-10 \ No newline at end of file diff --git a/activerecord/test/fixtures/developers_projects/david_active_record b/activerecord/test/fixtures/developers_projects/david_active_record deleted file mode 100644 index 2ef474c10d..0000000000 --- a/activerecord/test/fixtures/developers_projects/david_active_record +++ /dev/null @@ -1,3 +0,0 @@ -developer_id => 1 -project_id => 1 -joined_on => 2004-10-10 \ No newline at end of file diff --git a/activerecord/test/fixtures/developers_projects/jamis_active_record b/activerecord/test/fixtures/developers_projects/jamis_active_record deleted file mode 100644 index 91beb80797..0000000000 --- a/activerecord/test/fixtures/developers_projects/jamis_active_record +++ /dev/null @@ -1,2 +0,0 @@ -developer_id => 2 -project_id => 1 \ No newline at end of file diff --git a/activerecord/test/fixtures/subscribers.yml b/activerecord/test/fixtures/subscribers.yml new file mode 100644 index 0000000000..9ffb4a156f --- /dev/null +++ b/activerecord/test/fixtures/subscribers.yml @@ -0,0 +1,7 @@ +first: + nick: alterself + name: Luke Holden + +second: + nick: webster132 + name: David Heinemeier Hansson diff --git a/activerecord/test/fixtures/subscribers/first b/activerecord/test/fixtures/subscribers/first deleted file mode 100644 index 5287e26e4d..0000000000 --- a/activerecord/test/fixtures/subscribers/first +++ /dev/null @@ -1,2 +0,0 @@ -nick => alterself -name => Luke Holden diff --git a/activerecord/test/fixtures/subscribers/second b/activerecord/test/fixtures/subscribers/second deleted file mode 100644 index 2345e4475a..0000000000 --- a/activerecord/test/fixtures/subscribers/second +++ /dev/null @@ -1,2 +0,0 @@ -nick => webster132 -name => David Heinemeier Hansson diff --git a/activerecord/test/fixtures_test.rb b/activerecord/test/fixtures_test.rb index bbc3e1e5a4..d836e456a2 100755 --- a/activerecord/test/fixtures_test.rb +++ b/activerecord/test/fixtures_test.rb @@ -113,22 +113,6 @@ class FixturesTest < ActiveSupport::TestCase assert first end - def test_bad_format - path = File.join(File.dirname(__FILE__), 'fixtures', 'bad_fixtures') - Dir.entries(path).each do |file| - next unless File.file?(file) and file !~ Fixtures::DEFAULT_FILTER_RE - assert_raise(Fixture::FormatError) { - Fixture.new(bad_fixtures_path, file) - } - end - end - - def test_deprecated_yaml_extension - assert_raise(Fixture::FormatError) { - Fixtures.new(nil, 'bad_extension', 'BadExtension', File.join(File.dirname(__FILE__), 'fixtures')) - } - end - def test_logger_level_invariant level = ActiveRecord::Base.logger.level create_fixtures('topics') -- cgit v1.2.3