test/unit/sinatra_runner_tests.rb in deas-0.29.0 vs test/unit/sinatra_runner_tests.rb in deas-0.30.0

@@ -1,10 +1,9 @@
 require 'assert'
 require 'deas/sinatra_runner'
 
 require 'deas/deas_runner'
-require 'deas/template'
 require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
 
 class Deas::SinatraRunner
 
@@ -63,93 +62,16 @@
         'other'    => 'other'
       }
       assert_equal [exp_headers], subject.headers(exp_headers)
     end
 
-    should "render the template with :view/:logger locals and the handler layouts" do
-      exp_handler = DeasRunnerViewHandler.new(subject)
-      exp_layouts = DeasRunnerViewHandler.layouts
-      exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
-        :locals => {
-          :view => exp_handler,
-          :logger => @runner.logger
-        },
-        :layout => exp_layouts
-      }).render
-      assert_equal exp_result, subject.render('index')
-
-      exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
-        :locals => {
-          :view => 'a-view',
-          :some => 'thing',
-          :logger => @runner.logger
-        },
-        :layout => false
-      }).render
-      assert_equal exp_result, subject.render('index', {
-        :layout => false,
-        :locals => {
-          :view => 'a-view',
-          :some => 'thing'
-        }
-      })
-    end
-
-    should "render partials with locals" do
-      exp_result = Deas::Template::Partial.new(@fake_sinatra_call, 'info', {
-        :some => 'locals'
-      }).render
-
-      assert_equal exp_result, subject.partial('info', :some => 'locals')
-    end
-
     should "call the sinatra_call's send_file to set the send files" do
       block_called = false
       args = subject.send_file('a/file', {:some => 'opts'}, &proc{ block_called = true })
       assert_equal 'a/file', args.file_path
       assert_equal({:some => 'opts'}, args.options)
       assert_true block_called
     end
 
-  end
-
-  class InitWithEngineTests < UnitTests
-    desc "when init with a template source and matching engine"
-    setup do
-      @fake_sinatra_call = FakeSinatraCall.new
-      @runner = @runner_class.new(DeasRunnerViewHandler, {
-        :sinatra_call => @fake_sinatra_call,
-        :template_source => FakeTemplateSource.new
-      })
-    end
-    subject{ @runner }
-
-    should "render templates using the source" do
-      exp_handler = DeasRunnerViewHandler.new(subject)
-      exp_locals = {
-        :view => exp_handler,
-        :logger => @runner.logger,
-        :some => 'locals'
-      }
-      exp = ['render', 'info', @runner.handler, exp_locals]
-      assert_equal exp, subject.render('info', :locals => {
-        :some => 'locals'
-      })
-    end
-
-    should "render partials using the source" do
-      exp = ['partial', 'info', { :some => 'locals' }]
-      assert_equal exp, subject.partial('info', { :some => 'locals' })
-    end
-
-  end
-
-  class FakeTemplateSource
-    def engine_for?(template_name)
-      true
-    end
-
-    def render(*args);  ['render',  *args]; end
-    def partial(*args); ['partial', *args]; end
   end
 
 end