Merge branch 'master' of github.com:lifo/docrails

18 files changed, 0 insertions, 21 deletions

diff --git a/actionpack/test/fixtures/customers/_customer.html.erb b/actionpack/test/fixtures/customers/_customer.html.erb
deleted file mode 100644
index 483571e22a..0000000000
--- a/actionpack/test/fixtures/customers/_customer.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= greeting %>: <%= customer.name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/fun/games/_form.erb b/actionpack/test/fixtures/fun/games/_form.erb
deleted file mode 100644
index 01107f1cb2..0000000000
--- a/actionpack/test/fixtures/fun/games/_form.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= form.label :title %>
diff --git a/actionpack/test/fixtures/fun/games/hello_world.erb b/actionpack/test/fixtures/fun/games/hello_world.erb
deleted file mode 100644
index 1ebfbe2539..0000000000
--- a/actionpack/test/fixtures/fun/games/hello_world.erb
+++ /dev/null
@@ -1 +0,0 @@
-Living in a nested world
\ No newline at end of file
diff --git a/actionpack/test/fixtures/good_customers/_good_customer.html.erb b/actionpack/test/fixtures/good_customers/_good_customer.html.erb
deleted file mode 100644
index a2d97ebc6d..0000000000
--- a/actionpack/test/fixtures/good_customers/_good_customer.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= greeting %> good customer: <%= good_customer.name %><%= good_customer_counter %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/hello.html b/actionpack/test/fixtures/hello.html
deleted file mode 100644
index 6769dd60bd..0000000000
--- a/actionpack/test/fixtures/hello.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/helpers_missing/invalid_require_helper.rb b/actionpack/test/fixtures/helpers_missing/invalid_require_helper.rb
deleted file mode 100644
index d8801e54d5..0000000000
--- a/actionpack/test/fixtures/helpers_missing/invalid_require_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'very_invalid_file_name'
-
-module InvalidRequireHelper
-end
-
diff --git a/actionpack/test/fixtures/layout_tests/alt/layouts/alt.erb b/actionpack/test/fixtures/layout_tests/alt/layouts/alt.erb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/layout_tests/alt/layouts/alt.erb
+++ /dev/null
diff --git a/actionpack/test/fixtures/layout_tests/layouts/controller_name_space/nested.erb b/actionpack/test/fixtures/layout_tests/layouts/controller_name_space/nested.erb
deleted file mode 100644
index 121bc079a1..0000000000
--- a/actionpack/test/fixtures/layout_tests/layouts/controller_name_space/nested.erb
+++ /dev/null
@@ -1 +0,0 @@
-controller_name_space/nested.erb <%= yield %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/layouts/item.erb b/actionpack/test/fixtures/layout_tests/layouts/item.erb
deleted file mode 100644
index 60f04d77d5..0000000000
--- a/actionpack/test/fixtures/layout_tests/layouts/item.erb
+++ /dev/null
@@ -1 +0,0 @@
-item.erb <%= yield %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/layouts/layout_test.erb b/actionpack/test/fixtures/layout_tests/layouts/layout_test.erb
deleted file mode 100644
index b74ac0840d..0000000000
--- a/actionpack/test/fixtures/layout_tests/layouts/layout_test.erb
+++ /dev/null
@@ -1 +0,0 @@
-layout_test.erb <%= yield %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb b/actionpack/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb
deleted file mode 100644
index 3b65e54f9c..0000000000
--- a/actionpack/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-multiple_extensions.html.erb <%= yield %>
diff --git a/actionpack/test/fixtures/layout_tests/layouts/symlinked b/actionpack/test/fixtures/layout_tests/layouts/symlinked
deleted file mode 120000
index 0ddc1154ab..0000000000
--- a/actionpack/test/fixtures/layout_tests/layouts/symlinked
+++ /dev/null
@@ -1 +0,0 @@
-../../symlink_parent
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/layouts/third_party_template_library.mab b/actionpack/test/fixtures/layout_tests/layouts/third_party_template_library.mab
deleted file mode 100644
index fcee620d82..0000000000
--- a/actionpack/test/fixtures/layout_tests/layouts/third_party_template_library.mab
+++ /dev/null
@@ -1 +0,0 @@
-layouts/third_party_template_library.mab
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/views/goodbye.erb b/actionpack/test/fixtures/layout_tests/views/goodbye.erb
deleted file mode 100644
index 4ee911188e..0000000000
--- a/actionpack/test/fixtures/layout_tests/views/goodbye.erb
+++ /dev/null
@@ -1 +0,0 @@
-hello.erb
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/views/hello.erb b/actionpack/test/fixtures/layout_tests/views/hello.erb
deleted file mode 100644
index 4ee911188e..0000000000
--- a/actionpack/test/fixtures/layout_tests/views/hello.erb
+++ /dev/null
@@ -1 +0,0 @@
-hello.erb
\ No newline at end of file
diff --git a/actionpack/test/fixtures/override/test/hello_world.erb b/actionpack/test/fixtures/override/test/hello_world.erb
deleted file mode 100644
index 3e308d3d86..0000000000
--- a/actionpack/test/fixtures/override/test/hello_world.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello overridden world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/override2/layouts/test/sub.erb b/actionpack/test/fixtures/override2/layouts/test/sub.erb
deleted file mode 100644
index 3863d5a8ef..0000000000
--- a/actionpack/test/fixtures/override2/layouts/test/sub.erb
+++ /dev/null
@@ -1 +0,0 @@
-layout: <%= yield %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/quiz/questions/_question.html.erb b/actionpack/test/fixtures/quiz/questions/_question.html.erb
deleted file mode 100644
index fb4dcfee64..0000000000
--- a/actionpack/test/fixtures/quiz/questions/_question.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= question.name %>
\ No newline at end of file