From 2c22376fe04b89e8f34620139720b85a85ce3428 Mon Sep 17 00:00:00 2001 From: Dmitry Vorotilin Date: Wed, 11 Jul 2012 12:18:52 +0400 Subject: Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer --- actionpack/test/fixtures/test/_changing_priority.html.erb | 1 + actionpack/test/fixtures/test/_changing_priority.json.erb | 1 + actionpack/test/fixtures/test/_first_json_partial.json.erb | 1 + actionpack/test/fixtures/test/_json_change_priority.json.erb | 0 actionpack/test/fixtures/test/_second_json_partial.json.erb | 1 + actionpack/test/fixtures/test/change_priorty.html.erb | 2 ++ actionpack/test/fixtures/test/html_template.html.erb | 1 + 7 files changed, 7 insertions(+) create mode 100644 actionpack/test/fixtures/test/_changing_priority.html.erb create mode 100644 actionpack/test/fixtures/test/_changing_priority.json.erb create mode 100644 actionpack/test/fixtures/test/_first_json_partial.json.erb create mode 100644 actionpack/test/fixtures/test/_json_change_priority.json.erb create mode 100644 actionpack/test/fixtures/test/_second_json_partial.json.erb create mode 100644 actionpack/test/fixtures/test/change_priorty.html.erb create mode 100644 actionpack/test/fixtures/test/html_template.html.erb (limited to 'actionpack/test/fixtures') diff --git a/actionpack/test/fixtures/test/_changing_priority.html.erb b/actionpack/test/fixtures/test/_changing_priority.html.erb new file mode 100644 index 0000000000..3225efc49a --- /dev/null +++ b/actionpack/test/fixtures/test/_changing_priority.html.erb @@ -0,0 +1 @@ +HTML \ No newline at end of file diff --git a/actionpack/test/fixtures/test/_changing_priority.json.erb b/actionpack/test/fixtures/test/_changing_priority.json.erb new file mode 100644 index 0000000000..7fa41dce66 --- /dev/null +++ b/actionpack/test/fixtures/test/_changing_priority.json.erb @@ -0,0 +1 @@ +JSON \ No newline at end of file diff --git a/actionpack/test/fixtures/test/_first_json_partial.json.erb b/actionpack/test/fixtures/test/_first_json_partial.json.erb new file mode 100644 index 0000000000..790ee896db --- /dev/null +++ b/actionpack/test/fixtures/test/_first_json_partial.json.erb @@ -0,0 +1 @@ +<%= render :partial => "test/second_json_partial" %> \ No newline at end of file diff --git a/actionpack/test/fixtures/test/_json_change_priority.json.erb b/actionpack/test/fixtures/test/_json_change_priority.json.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/actionpack/test/fixtures/test/_second_json_partial.json.erb b/actionpack/test/fixtures/test/_second_json_partial.json.erb new file mode 100644 index 0000000000..5ebb7f1afd --- /dev/null +++ b/actionpack/test/fixtures/test/_second_json_partial.json.erb @@ -0,0 +1 @@ +Third level \ No newline at end of file diff --git a/actionpack/test/fixtures/test/change_priorty.html.erb b/actionpack/test/fixtures/test/change_priorty.html.erb new file mode 100644 index 0000000000..5618977d05 --- /dev/null +++ b/actionpack/test/fixtures/test/change_priorty.html.erb @@ -0,0 +1,2 @@ +<%= render :partial => "test/json_change_priority", formats: :json %> +HTML Template, but <%= render :partial => "test/changing_priority" %> partial \ No newline at end of file diff --git a/actionpack/test/fixtures/test/html_template.html.erb b/actionpack/test/fixtures/test/html_template.html.erb new file mode 100644 index 0000000000..1bbc2b7f09 --- /dev/null +++ b/actionpack/test/fixtures/test/html_template.html.erb @@ -0,0 +1 @@ +<%= render :partial => "test/first_json_partial", formats: :json %> \ No newline at end of file -- cgit v1.2.3