aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r--activerecord/test/fixtures/comments.yml4
-rw-r--r--activerecord/test/fixtures/companies.yml10
-rw-r--r--activerecord/test/fixtures/items.yml1
-rw-r--r--activerecord/test/fixtures/memberships.yml2
-rw-r--r--activerecord/test/fixtures/mixins.yml2
-rw-r--r--activerecord/test/fixtures/taggings.yml2
-rw-r--r--activerecord/test/fixtures/tags.yml2
7 files changed, 11 insertions, 12 deletions
diff --git a/activerecord/test/fixtures/comments.yml b/activerecord/test/fixtures/comments.yml
index 236bdb2e36..97d77f8b9a 100644
--- a/activerecord/test/fixtures/comments.yml
+++ b/activerecord/test/fixtures/comments.yml
@@ -9,7 +9,7 @@ more_greetings:
post_id: 1
body: Thank you again for the welcome
type: Comment
-
+
does_it_hurt:
id: 3
post_id: 2
@@ -37,7 +37,7 @@ eager_sti_on_associations_s_comment2:
eager_sti_on_associations_comment:
id: 8
post_id: 4
- body: Normal type
+ body: Normal type
type: Comment
check_eager_sti_on_associations:
diff --git a/activerecord/test/fixtures/companies.yml b/activerecord/test/fixtures/companies.yml
index 9ad68fbe11..ffaa097686 100644
--- a/activerecord/test/fixtures/companies.yml
+++ b/activerecord/test/fixtures/companies.yml
@@ -44,17 +44,17 @@ a_third_client:
ruby_type: Client
rails_core:
- id: 6
+ id: 6
name: RailsCore
type: DependentFirm
-
+
leetsoft:
- id: 7
+ id: 7
name: Leetsoft
client_of: 6
-
+
jadedpixel:
- id: 8
+ id: 8
name: Jadedpixel
client_of: 6
diff --git a/activerecord/test/fixtures/items.yml b/activerecord/test/fixtures/items.yml
index 31fd657df9..94e3821445 100644
--- a/activerecord/test/fixtures/items.yml
+++ b/activerecord/test/fixtures/items.yml
@@ -1,4 +1,3 @@
dvd:
id: 1
name: Godfather
- \ No newline at end of file
diff --git a/activerecord/test/fixtures/memberships.yml b/activerecord/test/fixtures/memberships.yml
index 99fbe46d9b..b9722dbc8a 100644
--- a/activerecord/test/fixtures/memberships.yml
+++ b/activerecord/test/fixtures/memberships.yml
@@ -4,7 +4,7 @@ membership_of_boring_club:
member: groucho
favourite: false
type: CurrentMembership
-
+
membership_of_favourite_club:
joined_on: <%= 3.weeks.ago.to_s(:db) %>
club: moustache_club
diff --git a/activerecord/test/fixtures/mixins.yml b/activerecord/test/fixtures/mixins.yml
index 0f60e92c2f..f0009cc5f0 100644
--- a/activerecord/test/fixtures/mixins.yml
+++ b/activerecord/test/fixtures/mixins.yml
@@ -1,6 +1,6 @@
# Nested set mixins
-<% (1..10).each do |counter| %>
+<% (1..10).each do |counter| %>
set_<%= counter %>:
id: <%= counter+3000 %>
<% end %>
diff --git a/activerecord/test/fixtures/taggings.yml b/activerecord/test/fixtures/taggings.yml
index 1e3d5965b8..3db6a4c079 100644
--- a/activerecord/test/fixtures/taggings.yml
+++ b/activerecord/test/fixtures/taggings.yml
@@ -11,7 +11,7 @@ thinking_general:
taggable_id: 2
taggable_type: Post
-fake:
+fake:
id: 3
tag_id: 1
taggable_id: 1
diff --git a/activerecord/test/fixtures/tags.yml b/activerecord/test/fixtures/tags.yml
index 471b96f362..7610fd38b9 100644
--- a/activerecord/test/fixtures/tags.yml
+++ b/activerecord/test/fixtures/tags.yml
@@ -1,7 +1,7 @@
general:
id: 1
name: General
-
+
misc:
id: 2
name: Misc \ No newline at end of file