aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/happy_path/render_action/hello_world.erb1
-rw-r--r--actionpack/test/fixtures/layout_tests/views/goodbye.rhtml1
-rw-r--r--actionpack/test/fixtures/layouts/default_html.html.erb1
-rw-r--r--actionpack/test/fixtures/test/backup_files/item.html.erb1
-rw-r--r--actionpack/test/fixtures/test/backup_files/item.html.erb.orig1
-rw-r--r--actionpack/test/fixtures/test/basic.html.erb1
-rw-r--r--actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb1
7 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/test/fixtures/happy_path/render_action/hello_world.erb b/actionpack/test/fixtures/happy_path/render_action/hello_world.erb
new file mode 100644
index 0000000000..6769dd60bd
--- /dev/null
+++ b/actionpack/test/fixtures/happy_path/render_action/hello_world.erb
@@ -0,0 +1 @@
+Hello world! \ No newline at end of file
diff --git a/actionpack/test/fixtures/layout_tests/views/goodbye.rhtml b/actionpack/test/fixtures/layout_tests/views/goodbye.rhtml
new file mode 100644
index 0000000000..bbccf0913e
--- /dev/null
+++ b/actionpack/test/fixtures/layout_tests/views/goodbye.rhtml
@@ -0,0 +1 @@
+hello.rhtml \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/default_html.html.erb b/actionpack/test/fixtures/layouts/default_html.html.erb
deleted file mode 100644
index edd719111c..0000000000
--- a/actionpack/test/fixtures/layouts/default_html.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<html><%= @content_for_layout %></html>
diff --git a/actionpack/test/fixtures/test/backup_files/item.html.erb b/actionpack/test/fixtures/test/backup_files/item.html.erb
deleted file mode 100644
index aaac0a2160..0000000000
--- a/actionpack/test/fixtures/test/backup_files/item.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-The correct item.erb was loaded.
diff --git a/actionpack/test/fixtures/test/backup_files/item.html.erb.orig b/actionpack/test/fixtures/test/backup_files/item.html.erb.orig
deleted file mode 100644
index a2b153e5a2..0000000000
--- a/actionpack/test/fixtures/test/backup_files/item.html.erb.orig
+++ /dev/null
@@ -1 +0,0 @@
-This is an editor backup file and should never be loaded!
diff --git a/actionpack/test/fixtures/test/basic.html.erb b/actionpack/test/fixtures/test/basic.html.erb
new file mode 100644
index 0000000000..ea696d7e01
--- /dev/null
+++ b/actionpack/test/fixtures/test/basic.html.erb
@@ -0,0 +1 @@
+Hello from basic.html.erb \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb b/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
deleted file mode 100644
index d5b94af505..0000000000
--- a/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-alert('hello');