diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2016-02-25 01:30:00 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2016-02-25 01:30:00 -0800 |
| commit | 6b3176170a35cbd20c8599c31fc5cbe46e02562c (patch) | |
| tree | fea0aef0ff258a93c93aa9d39c6ca16ce410d5a7 /actionpack/test/fixtures | |
| parent | 50e4433b051829350984f0c5eb1271243f6d229d (diff) | |
| parent | 73b1efc58f4e04b4af7ed93685352ebe9108cd7e (diff) | |
| download | rails-6b3176170a35cbd20c8599c31fc5cbe46e02562c.tar.gz rails-6b3176170a35cbd20c8599c31fc5cbe46e02562c.tar.bz2 rails-6b3176170a35cbd20c8599c31fc5cbe46e02562c.zip | |
Merge pull request #23827 from rails/new_implicit_render
Lock down new `ImplicitRender` behavior for 5.0 RC
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/implicit_render_test/empty_action_with_mobile_variant.html+mobile.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/implicit_render_test/empty_action_with_template.html.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/variant_with_implicit_template_rendering.html+mobile.erb (renamed from actionpack/test/fixtures/respond_to/variant_with_implicit_rendering.html+mobile.erb) | 0 |
4 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/implicit_render_test/empty_action_with_mobile_variant.html+mobile.erb b/actionpack/test/fixtures/implicit_render_test/empty_action_with_mobile_variant.html+mobile.erb new file mode 100644 index 0000000000..ded99ba52d --- /dev/null +++ b/actionpack/test/fixtures/implicit_render_test/empty_action_with_mobile_variant.html+mobile.erb @@ -0,0 +1 @@ +mobile diff --git a/actionpack/test/fixtures/implicit_render_test/empty_action_with_template.html.erb b/actionpack/test/fixtures/implicit_render_test/empty_action_with_template.html.erb new file mode 100644 index 0000000000..dd294f8cf6 --- /dev/null +++ b/actionpack/test/fixtures/implicit_render_test/empty_action_with_template.html.erb @@ -0,0 +1 @@ +<h1>Empty action rendered this implicitly.</h1> diff --git a/actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb b/actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb new file mode 100644 index 0000000000..7d8187321c --- /dev/null +++ b/actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb @@ -0,0 +1 @@ +zomg diff --git a/actionpack/test/fixtures/respond_to/variant_with_implicit_rendering.html+mobile.erb b/actionpack/test/fixtures/respond_to/variant_with_implicit_template_rendering.html+mobile.erb index 317801ad30..317801ad30 100644 --- a/actionpack/test/fixtures/respond_to/variant_with_implicit_rendering.html+mobile.erb +++ b/actionpack/test/fixtures/respond_to/variant_with_implicit_template_rendering.html+mobile.erb |