8 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/company.rb b/actionpack/test/fixtures/company.rb
index 0d1c29b906..cbbd0edb14 100644
--- a/actionpack/test/fixtures/company.rb
+++ b/actionpack/test/fixtures/company.rb
@@ -1,4 +1,5 @@
 class Company < ActiveRecord::Base
+  has_one :mascot
   attr_protected :rating
   set_sequence_name :companies_nonstd_seq
 
diff --git a/actionpack/test/fixtures/db_definitions/sqlite.sql b/actionpack/test/fixtures/db_definitions/sqlite.sql
index 358c2bbb04..8e1947d14a 100644
--- a/actionpack/test/fixtures/db_definitions/sqlite.sql
+++ b/actionpack/test/fixtures/db_definitions/sqlite.sql
@@ -41,3 +41,9 @@ CREATE TABLE 'developers_projects' (
   'joined_on' DATE DEFAULT NULL,
   'access_level' INTEGER DEFAULT 1
 );
+
+CREATE TABLE 'mascots' (
+  'id' INTEGER PRIMARY KEY NOT NULL, 
+  'company_id' INTEGER NOT NULL,
+  'name' TEXT DEFAULT NULL
+);
+\ No newline at end of file
diff --git a/actionpack/test/fixtures/mascot.rb b/actionpack/test/fixtures/mascot.rb
new file mode 100644
index 0000000000..f9f1448b8f
--- /dev/null
+++ b/actionpack/test/fixtures/mascot.rb
@@ -0,0 +1,3 @@
+class Mascot < ActiveRecord::Base
+  belongs_to :company
+end
+\ No newline at end of file
diff --git a/actionpack/test/fixtures/mascots.yml b/actionpack/test/fixtures/mascots.yml
new file mode 100644
index 0000000000..17b7dff454
--- /dev/null
+++ b/actionpack/test/fixtures/mascots.yml
@@ -0,0 +1,4 @@
+upload_bird:
+  id: 1
+  company_id: 1
+  name: The Upload Bird
+\ No newline at end of file
diff --git a/actionpack/test/fixtures/mascots/_mascot.html.erb b/actionpack/test/fixtures/mascots/_mascot.html.erb
new file mode 100644
index 0000000000..432773a1da
--- /dev/null
+++ b/actionpack/test/fixtures/mascots/_mascot.html.erb
@@ -0,0 +1 @@
+<%= mascot.name %>
+\ No newline at end of file
diff --git a/actionpack/test/fixtures/reply.rb b/actionpack/test/fixtures/reply.rb
index 588713de1e..04598437c2 100644
--- a/actionpack/test/fixtures/reply.rb
+++ b/actionpack/test/fixtures/reply.rb
@@ -1,4 +1,5 @@
 class Reply < ActiveRecord::Base
+  named_scope :base
   belongs_to :topic, :include => [:replies]
   belongs_to :developer
 
diff --git a/actionpack/test/fixtures/shared.html.erb b/actionpack/test/fixtures/shared.html.erb
new file mode 100644
index 0000000000..af262fc9f8
--- /dev/null
+++ b/actionpack/test/fixtures/shared.html.erb
@@ -0,0 +1 @@
+Elastica
+\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_raise.html.erb b/actionpack/test/fixtures/test/_raise.html.erb
new file mode 100644
index 0000000000..68b08181d3
--- /dev/null
+++ b/actionpack/test/fixtures/test/_raise.html.erb
@@ -0,0 +1 @@
+<%= doesnt_exist %>
+\ No newline at end of file