Merge remote branch 'rails/master'

2 files changed, 30 insertions, 0 deletions

diff --git a/actionpack/test/template/testing/fixture_resolver_test.rb b/actionpack/test/template/testing/fixture_resolver_test.rb
new file mode 100644
index 0000000000..de83540468
--- /dev/null
+++ b/actionpack/test/template/testing/fixture_resolver_test.rb
@@ -0,0 +1,18 @@
+require 'abstract_unit'
+
+class FixtureResolverTest < ActiveSupport::TestCase
+  def test_should_return_empty_list_for_unknown_path
+    resolver = ActionView::FixtureResolver.new()
+    templates = resolver.find_all("path", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => []})
+    assert_equal [], templates, "expected an empty list of templates"
+  end
+
+  def test_should_return_template_for_declared_path
+    resolver = ActionView::FixtureResolver.new("arbitrary/path" => "this text")
+    templates = resolver.find_all("path", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => []})
+    assert_equal 1, templates.size, "expected one template"
+    assert_equal "this text",      templates.first.source
+    assert_equal "arbitrary/path", templates.first.virtual_path
+    assert_equal [:html],          templates.first.formats
+  end
+end
diff --git a/actionpack/test/template/testing/null_resolver_test.rb b/actionpack/test/template/testing/null_resolver_test.rb
new file mode 100644
index 0000000000..e142506e6a
--- /dev/null
+++ b/actionpack/test/template/testing/null_resolver_test.rb
@@ -0,0 +1,12 @@
+require 'abstract_unit'
+
+class NullResolverTest < ActiveSupport::TestCase
+  def test_should_return_template_for_any_path
+    resolver = ActionView::NullResolver.new()
+    templates = resolver.find_all("path", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => []})
+    assert_equal 1, templates.size, "expected one template"
+    assert_equal "Template generated by Null Resolver", templates.first.source
+    assert_equal "arbitrary/path", templates.first.virtual_path
+    assert_equal [:html],          templates.first.formats
+  end
+end