diff --git a/spec/app.rb b/spec/app.rb index 55ba426..e7de365 100644 --- a/spec/app.rb +++ b/spec/app.rb @@ -1,5 +1,5 @@ class InheritViewsTestController < ActionController::Base - self.view_paths = [File.dirname(__FILE__) + '/fixtures/views'] + self.view_paths = [File.join(File.dirname(__FILE__), 'views_for_specs')] end # :a controller is a normal controller with inherit_views @@ -8,7 +8,7 @@ class AController < InheritViewsTestController inherit_views def render_non_existent_template - render :action => 'non_exitsent' + render :action => 'non_existent' end end diff --git a/spec/views_for_specs/.DS_Store b/spec/views_for_specs/.DS_Store new file mode 100644 index 0000000..db68c08 Binary files /dev/null and b/spec/views_for_specs/.DS_Store differ diff --git a/spec/fixtures/views/a/_partial_render_parent.html.erb b/spec/views_for_specs/a/_partial_render_parent.html.erb similarity index 100% rename from spec/fixtures/views/a/_partial_render_parent.html.erb rename to spec/views_for_specs/a/_partial_render_parent.html.erb diff --git a/spec/fixtures/views/a/in_a.html.erb b/spec/views_for_specs/a/in_a.html.erb similarity index 100% rename from spec/fixtures/views/a/in_a.html.erb rename to spec/views_for_specs/a/in_a.html.erb diff --git a/spec/fixtures/views/a/in_ab.html.erb b/spec/views_for_specs/a/in_ab.html.erb similarity index 100% rename from spec/fixtures/views/a/in_ab.html.erb rename to spec/views_for_specs/a/in_ab.html.erb diff --git a/spec/fixtures/views/a/in_abc.html.erb b/spec/views_for_specs/a/in_abc.html.erb similarity index 100% rename from spec/fixtures/views/a/in_abc.html.erb rename to spec/views_for_specs/a/in_abc.html.erb diff --git a/spec/fixtures/views/a/render_non_existent_partial.html.erb b/spec/views_for_specs/a/render_non_existent_partial.html.erb similarity index 100% rename from spec/fixtures/views/a/render_non_existent_partial.html.erb rename to spec/views_for_specs/a/render_non_existent_partial.html.erb diff --git a/spec/fixtures/views/b/_partial_in_b.html.erb b/spec/views_for_specs/b/_partial_in_b.html.erb similarity index 100% rename from spec/fixtures/views/b/_partial_in_b.html.erb rename to spec/views_for_specs/b/_partial_in_b.html.erb diff --git a/spec/fixtures/views/b/_partial_in_bc.html.erb b/spec/views_for_specs/b/_partial_in_bc.html.erb similarity index 100% rename from spec/fixtures/views/b/_partial_in_bc.html.erb rename to spec/views_for_specs/b/_partial_in_bc.html.erb diff --git a/spec/fixtures/views/b/_partial_render_parent.html.erb b/spec/views_for_specs/b/_partial_render_parent.html.erb similarity index 100% rename from spec/fixtures/views/b/_partial_render_parent.html.erb rename to spec/views_for_specs/b/_partial_render_parent.html.erb diff --git a/spec/fixtures/views/b/bad_render_parent.html.erb b/spec/views_for_specs/b/bad_render_parent.html.erb similarity index 100% rename from spec/fixtures/views/b/bad_render_parent.html.erb rename to spec/views_for_specs/b/bad_render_parent.html.erb diff --git a/spec/fixtures/views/b/collection_in_bc.html.erb b/spec/views_for_specs/b/collection_in_bc.html.erb similarity index 100% rename from spec/fixtures/views/b/collection_in_bc.html.erb rename to spec/views_for_specs/b/collection_in_bc.html.erb diff --git a/spec/fixtures/views/b/in_ab.html.erb b/spec/views_for_specs/b/in_ab.html.erb similarity index 100% rename from spec/fixtures/views/b/in_ab.html.erb rename to spec/views_for_specs/b/in_ab.html.erb diff --git a/spec/fixtures/views/b/in_abc.html.erb b/spec/views_for_specs/b/in_abc.html.erb similarity index 100% rename from spec/fixtures/views/b/in_abc.html.erb rename to spec/views_for_specs/b/in_abc.html.erb diff --git a/spec/fixtures/views/b/in_b.html.erb b/spec/views_for_specs/b/in_b.html.erb similarity index 100% rename from spec/fixtures/views/b/in_b.html.erb rename to spec/views_for_specs/b/in_b.html.erb diff --git a/spec/fixtures/views/b/partial_in_b.html.erb b/spec/views_for_specs/b/partial_in_b.html.erb similarity index 100% rename from spec/fixtures/views/b/partial_in_b.html.erb rename to spec/views_for_specs/b/partial_in_b.html.erb diff --git a/spec/fixtures/views/b/partial_in_bc.html.erb b/spec/views_for_specs/b/partial_in_bc.html.erb similarity index 100% rename from spec/fixtures/views/b/partial_in_bc.html.erb rename to spec/views_for_specs/b/partial_in_bc.html.erb diff --git a/spec/fixtures/views/b/partial_render_parent.html.erb b/spec/views_for_specs/b/partial_render_parent.html.erb similarity index 100% rename from spec/fixtures/views/b/partial_render_parent.html.erb rename to spec/views_for_specs/b/partial_render_parent.html.erb diff --git a/spec/fixtures/views/b/render_parent.html.erb b/spec/views_for_specs/b/render_parent.html.erb similarity index 100% rename from spec/fixtures/views/b/render_parent.html.erb rename to spec/views_for_specs/b/render_parent.html.erb diff --git a/spec/fixtures/views/c/_partial_in_bc.html.erb b/spec/views_for_specs/c/_partial_in_bc.html.erb similarity index 100% rename from spec/fixtures/views/c/_partial_in_bc.html.erb rename to spec/views_for_specs/c/_partial_in_bc.html.erb diff --git a/spec/fixtures/views/c/_partial_render_parent.html.erb b/spec/views_for_specs/c/_partial_render_parent.html.erb similarity index 100% rename from spec/fixtures/views/c/_partial_render_parent.html.erb rename to spec/views_for_specs/c/_partial_render_parent.html.erb diff --git a/spec/fixtures/views/c/in_abc.html.erb b/spec/views_for_specs/c/in_abc.html.erb similarity index 100% rename from spec/fixtures/views/c/in_abc.html.erb rename to spec/views_for_specs/c/in_abc.html.erb diff --git a/spec/fixtures/views/c/in_c.html.erb b/spec/views_for_specs/c/in_c.html.erb similarity index 100% rename from spec/fixtures/views/c/in_c.html.erb rename to spec/views_for_specs/c/in_c.html.erb diff --git a/spec/fixtures/views/c/render_parent.html.erb b/spec/views_for_specs/c/render_parent.html.erb similarity index 100% rename from spec/fixtures/views/c/render_parent.html.erb rename to spec/views_for_specs/c/render_parent.html.erb diff --git a/spec/fixtures/views/normal/partial_from_c.html.erb b/spec/views_for_specs/normal/partial_from_c.html.erb similarity index 100% rename from spec/fixtures/views/normal/partial_from_c.html.erb rename to spec/views_for_specs/normal/partial_from_c.html.erb