5 files changed, 26 insertions, 3 deletions
diff --git a/lib/zero/renderer.rb b/lib/zero/renderer.rb
index 9f59fc0..b2b7c94 100644
--- a/lib/zero/renderer.rb
+++ b/lib/zero/renderer.rb
@@ -125,7 +125,8 @@ module Zero
         types.each do |type|
           template = templates[name][type]
           unless template.nil?
-            return template if template.kind_of?(Tilt::Template)
+            # TODO Will be implemented later
+            # return template if template.kind_of?(Tilt::Template)
             return Tilt.new(template)
           end
         end
diff --git a/spec/fixtures/templates/context.html.erb b/spec/fixtures/templates/context.html.erb
new file mode 100644
index 0000000..36f1f1b
--- /dev/null
+++ b/spec/fixtures/templates/context.html.erb
@@ -0,0 +1 @@
+<%= name %>
+\ No newline at end of file
diff --git a/spec/unit/renderer/read_template_path_spec.rb b/spec/unit/renderer/read_template_path_spec.rb
index e025bb1..8655777 100644
--- a/spec/unit/renderer/read_template_path_spec.rb
+++ b/spec/unit/renderer/read_template_path_spec.rb
@@ -6,7 +6,13 @@ describe Zero::Renderer, 'read_template_path!' do
   let(:file_list) { ['foo/welcome/index.html.erb'] }
 
   before :each do
-    subject.stub(:search_files).and_return(file_list)
+    Dir.stub(:[]) do |arg|
+      if arg == 'foo/**/*.*'
+        file_list 
+      else
+        []
+      end
+    end
   end
 
   shared_examples_for 'a template loader' do
@@ -50,4 +56,11 @@ describe Zero::Renderer, 'read_template_path!' do
 
     it_behaves_like 'a template loader'
   end
+
+  it 'creates an empty templates list without templates in path' do
+    subject = Zero::Renderer.new("bar", {})
+    subject.read_template_path!
+
+    subject.templates.should eq({})
+  end
 end
diff --git a/spec/unit/renderer/render_spec.rb b/spec/unit/renderer/render_spec.rb
index da5c333..30d2225 100644
--- a/spec/unit/renderer/render_spec.rb
+++ b/spec/unit/renderer/render_spec.rb
@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Zero::Renderer, '#render' do
   subject { Zero::Renderer.new(template_path, type_map) }
   let(:template_path) { 'spec/fixtures/templates' }
-  let(:file_list) { ['./foo/welcome/index.html.erb'] }
   let(:type_map) {{
     'html' => ['text/html', 'text/xml', '*/*'],
     'json' => ['application/json', 'plain/text']
@@ -47,4 +46,9 @@ describe Zero::Renderer, '#render' do
       "No template found for any of this types #{foo_types.join ', '}!"
     )
   end
+
+  it 'uses the context' do
+    subject.render('context', html_types, binding).should match('foo')
+
+  end
 end
diff --git a/spec/unit/renderer/type_map_spec.rb b/spec/unit/renderer/type_map_spec.rb
index f0b86ad..290e579 100644
--- a/spec/unit/renderer/type_map_spec.rb
+++ b/spec/unit/renderer/type_map_spec.rb
@@ -6,4 +6,8 @@ describe Zero::Renderer, '#type_map' do
   let(:type_map) { {'html' => ['text/html']} }
 
   its(:type_map) { should be(type_map) }
+
+  it 'returns an empty Hash, if type_map is not set while initialization' do
+    Zero::Renderer.new(template_path).type_map.should eq({})
+  end
 end