merb-core 0.9.7 → 0.9.8

data/spec/public/test/controllers/controller_assertion_mock.rb

@@ -1,7 +0,0 @@
-class Merb::Test::ControllerAssertionMock
-  
-  def self.called(action)
-    return action
-  end
-  
-end

data/spec/public/test/controllers/dispatch_controller.rb

@@ -1,11 +0,0 @@
-class Merb::Test::DispatchController < Merb::Controller
-  
-  def index
-    Merb::Test::ControllerAssertionMock.called(:index)
-  end
-  
-  def show
-    Merb::Test::ControllerAssertionMock.called(:show)
-  end
-  
-end

data/spec/public/test/controllers/spec_helper_controller.rb

@@ -1,39 +0,0 @@
-class SpecHelperController < Merb::Controller
-  
-  def index
-    Merb::Test::ControllerAssertionMock.called(:index)
-  end
-  
-  def show
-    Merb::Test::ControllerAssertionMock.called(:show)
-  end
-  
-  def edit
-    Merb::Test::ControllerAssertionMock.called(:edit)
-  end
-  
-  def new
-    Merb::Test::ControllerAssertionMock.called(:new)
-  end
-  
-  def create
-    Merb::Test::ControllerAssertionMock.called(:create)
-  end
-  
-  def update
-    Merb::Test::ControllerAssertionMock.called(:update)
-  end
-  
-  def destroy
-    Merb::Test::ControllerAssertionMock.called(:destroy)
-  end  
-end
-
-module Namespaced
-  class SpecHelperController < Merb::Controller
-    def index
-      Merb::Test::ControllerAssertionMock.called(:index)
-    end
-  end
-end  
-        

data/spec/public/test/multipart_request_helper_spec.rb

@@ -1,159 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-
-Merb.start :environment => 'test', :log_level => :fatal
-
-Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f|
-  require f
-end
-
-describe Merb::Test::MultipartRequestHelper do
-
-  describe "#dispatch_multipart_to" do
-
-    before(:all) do 
-      @controller_klass = Merb::Test::DispatchController
-    end
-
-    it "should dispatch to the given controller and action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-
-      dispatch_multipart_to(@controller_klass, :index)    
-    end
-
-    it "should dispatch to the given controller and action with params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-
-      controller = dispatch_multipart_to(@controller_klass, :show, :name => "Fred")
-      controller.params[:name].should == "Fred"
-    end
-
-    it "should handle a file object when used as a param" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-      file_name = File.join(File.dirname(__FILE__), "multipart_upload_text_file.txt")
-      File.open( file_name ) do |file|
-        controller = dispatch_multipart_to(@controller_klass, :show, :my_file => file)
-        file_params = controller.params[:my_file]
-        file_params[:content_type].should == "text/plain"
-        file_params[:size].should == File.size(file_name)
-        file_params[:tempfile].should be_a_kind_of(File)
-        file_params[:filename].should == "multipart_upload_text_file.txt"
-      end
-    end
-  end
-
-  describe "#multipart_post" do
-    before(:each) do
-      Merb::Router.prepare do |r|
-        r.resources :spec_helper_controller
-      end
-    end
-  
-    it "should post to the create action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create)
-      multipart_post("/spec_helper_controller")
-    end
-  
-    it "should post to the create action with params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create)
-      controller = multipart_post("/spec_helper_controller", :name => "Harry")
-      controller.params[:name].should == "Harry"
-    end
-  
-    it "should upload a file to the action using multipart" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create)
-      file_name = File.join(File.dirname(__FILE__), "multipart_upload_text_file.txt")
-      File.open( file_name ) do |file|
-        controller = multipart_post("/spec_helper_controller", :my_file => file)
-        file_params = controller.params[:my_file]
-        file_params[:content_type].should == "text/plain"
-        file_params[:size].should == File.size(file_name)
-        file_params[:tempfile].should be_a_kind_of(File)
-        file_params[:filename].should == "multipart_upload_text_file.txt"
-      end
-    end
-  
-  end
-
-  describe "#multipart_put" do
-    before(:each) do
-      Merb::Router.prepare do |r|
-        r.resources :spec_helper_controller
-      end
-    end
-    it "should put to the update action multipart" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update)
-      multipart_put("/spec_helper_controller/1")
-    end
-  
-    it "should put to the update action with multipart params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update)
-      controller = multipart_put("/spec_helper_controller/my_id", :name => "Harry")
-      controller.params[:name].should == "Harry"
-      controller.params[:id].should   == "my_id"
-    end
-  
-    it "should upload a file to the action using multipart" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update)
-      file_name = File.join(File.dirname(__FILE__), "multipart_upload_text_file.txt")
-      File.open( file_name ) do |file|
-        controller = multipart_put("/spec_helper_controller/my_id", :my_file => file)
-        controller.params[:id].should == "my_id"
-        file_params = controller.params[:my_file]
-        file_params[:content_type].should == "text/plain"
-        file_params[:size].should == File.size(file_name)
-        file_params[:tempfile].should be_a_kind_of(File)
-        file_params[:filename].should == "multipart_upload_text_file.txt"
-      end
-    end
-  end
-end
-
-module Merb::Test::MultipartRequestHelper
-  describe Param, '#to_multipart' do
-    it "should represent the key and value correctly" do
-      param = Param.new('foo', 'bar')
-      param.to_multipart.should == %(Content-Disposition: form-data; name="foo"\r\n\r\nbar\r\n)
-    end
-  end
-
-  describe FileParam, '#to_multipart' do
-    it "should represent the key, filename and content correctly" do
-      param = FileParam.new('foo', '/bar.txt', 'baz')
-      param.to_multipart.should == %(Content-Disposition: form-data; name="foo"; filename="/bar.txt"\r\nContent-Type: text/plain\r\n\r\nbaz\r\n)
-    end
-  end
-
-  describe Post, '#push_params(params) param parsing' do
-    before(:each) do
-      @fake_return_param = mock('fake return_param')
-    end
-
-    it "should create Param from params when param doesn't respond to read" do
-      params = { 'normal' => 'normal_param' }
-      Param.should_receive(:new).with('normal', 'normal_param').and_return(@fake_return_param)
-      Post.new.push_params(params)
-    end
-  
-    it "should create FileParam from params when param does response to read" do
-      file_param = mock('file param')
-      file_param.should_receive(:read).and_return('file contents')
-      file_param.should_receive(:path).and_return('file.txt')
-      params = { 'file' => file_param }
-      FileParam.should_receive(:new).with('file', 'file.txt', 'file contents').and_return(@fake_return_param)
-      Post.new.push_params(params)
-    end
-  end
-  
-  describe Post, '#to_multipart' do
-    it "should create a multipart request from the params" do
-      file_param = mock('file param')
-      file_param.should_receive(:read).and_return('file contents')
-      file_param.should_receive(:path).and_return('file.txt')
-      params = { 'file' => file_param, 'normal' => 'normal_param' }
-      multipart = Post.new(params)
-      query, content_type = multipart.to_multipart
-      content_type.should == "multipart/form-data, boundary=----------0xKhTmLbOuNdArY"
-      query.should == "------------0xKhTmLbOuNdArY\r\nContent-Disposition: form-data; name=\"file\"; filename=\"file.txt\"\r\nContent-Type: text/plain\r\n\r\nfile contents\r\n------------0xKhTmLbOuNdArY\r\nContent-Disposition: form-data; name=\"normal\"\r\n\r\nnormal_param\r\n------------0xKhTmLbOuNdArY--"
-    end
-  end
-end

data/spec/public/test/multipart_upload_text_file.txt

@@ -1 +0,0 @@
-File With Some Text In It For Testing Multipart Uploads

data/spec/public/test/request_helper_spec.rb

@@ -1,269 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-
-Merb.start :environment => 'test', :log_level => :fatal
-
-Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f|
-  require f
-end
-
-describe Merb::Test::RequestHelper do
-  
-  describe Merb::Test::RequestHelper::CookieJar do
-    
-    it "should update its values from a request object" do
-      cookie_jar = Merb::Test::RequestHelper::CookieJar.new
-      cookie_jar.should be_empty
-      request = fake_request
-      request.cookies[:foo] = "bar+baz" # escaped by default
-      cookie_jar.update_from_request request
-      cookie_jar[:foo].should == 'bar baz'
-    end
-    
-  end  
-  
-  describe "#dispatch_to" do
-
-    before(:all) do
-      @controller_klass = Merb::Test::DispatchController
-    end
-
-    it "should dispatch to the given controller and action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-
-      dispatch_to(@controller_klass, :index)
-    end
-
-    it "should dispatch to the given controller and action with params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-
-      controller = dispatch_to(@controller_klass, :show, :name => "Fred")
-      controller.params[:name].should == "Fred"
-    end
-
-    it "should dispatch to the given controller and action with the query string merged into the params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-      controller = dispatch_to(@controller_klass, :show, {:name => "Fred"}, {'QUERY_STRING' => "last_name=Jones&age=42"} )
-      
-      controller.params[:name].should == "Fred"
-      controller.params[:last_name].should == "Jones"
-      controller.params[:age].should == "42"   
-    end
-
-    it "should not hit the router to match its route" do
-      Merb::Router.should_not_receive(:match)
-      dispatch_to(@controller_klass, :index)
-    end
-    
-    it "merges :controller into params" do
-      controller = dispatch_to(@controller_klass, :show, :name => "Fred")
-      
-      controller.params[:controller].should == @controller_klass.name.to_const_path
-    end
-    
-    it "merges :action into params" do
-      controller = dispatch_to(@controller_klass, :show, :name => "Fred")
-      
-      controller.params[:action].should == "show"
-    end
-
-    it "should support setting request.raw_post" do
-      controller = dispatch_to(@controller_klass, :show, {}, {:post_body => 'some XML'})
-      controller.request.raw_post.should == 'some XML'
-    end
-  end
-  
-  describe "#dispatch_with_basic_authentication_to" do
-
-    before(:all) do
-      @controller_klass = Merb::Test::DispatchController
-    end
-
-    it "should dispatch to the given controller and action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-
-      dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret")
-    end
-
-    it "should dispatch to the given controller and action with authentication token" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-
-      controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret")
-
-      controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}"
-    end
-    
-    it "should dispatch to the given controller and action with authentication token and params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-
-      controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret", :name => "Fred")
-
-      controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}"
-      controller.params[:name].should == "Fred"
-    end
-
-    it "should not hit the router to match its route" do
-      Merb::Router.should_not_receive(:match)
-      dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret")
-    end
-  end
-
-  describe "#get" do
-    before(:each) do 
-      Merb::Router.prepare do |r| 
-        r.resources :spec_helper_controller
-        r.match("/:controller/:action/:custom").to(:controller => ":controller") 
-      end
-    end
-
-    it "should perform the index action when used with a get" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-      get("/spec_helper_controller")  
-    end
-
-    it "should perform the index action and have params available" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-      controller = get("/spec_helper_controller", :name => "Harry")
-      controller.params[:name].should == "Harry"    
-    end
-    
-    it "should perform the index action and have params available from the query string" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-      controller = get("/spec_helper_controller?last_name=Oswald&age=25", :name => "Harry")
-      controller.params[:name].should == "Harry"
-      controller.params[:last_name].should == "Oswald"
-      controller.params[:age].should == "25"
-    end
-
-    it "should evaluate in the context of the controller in the block" do
-      get("/spec_helper_controller") do |controller|
-        controller.class.should == SpecHelperController
-      end    
-    end
-
-    it "should allow for custom router params" do
-      controller = get("/spec_helper_controller/index/my_custom_stuff")
-      controller.params[:custom].should == "my_custom_stuff"    
-    end   
-
-    it "should get the show action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
-      controller = get("/spec_helper_controller/my_id")
-      controller.params[:id].should == "my_id"    
-    end
-  end
-
-  describe "#post" do
-    before(:each) do
-      Merb::Router.prepare do |r|
-        r.resources :spec_helper_controller
-      end
-    end
-
-    it "should post to the create action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create)
-      post("/spec_helper_controller")
-    end
-
-    it "should post to the create action with params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:create)
-      controller = post("/spec_helper_controller", :name => "Harry")
-      controller.params[:name].should == "Harry"
-    end
-  end
-
-  describe "#put" do
-    before(:each) do
-      Merb::Router.prepare do |r|
-        r.resources :spec_helper_controller
-      end
-    end
-    it "should put to the update action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update)
-      put("/spec_helper_controller/1")
-    end
-
-    it "should put to the update action with params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:update)
-      controller = put("/spec_helper_controller/my_id", :name => "Harry")
-      controller.params[:name].should == "Harry"
-      controller.params[:id].should   == "my_id"
-    end
-  end
-
-  describe "#delete" do
-    before(:each) do
-      Merb::Router.prepare do |r|
-        r.resources :spec_helper_controller
-      end
-    end
-    it "should put to the update action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:destroy)
-      delete("/spec_helper_controller/1")
-    end
-
-    it "should put to the update action with params" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:destroy)
-      controller = delete("/spec_helper_controller/my_id", :name => "Harry")
-      controller.params[:name].should == "Harry"
-      controller.params[:id].should   == "my_id"
-    end
-  end
-  
-  describe "#request" do
-    before(:each) do 
-      Merb::Router.prepare do |r| 
-        r.namespace :namespaced do |namespaced|
-          namespaced.resources :spec_helper_controller
-        end
-      end
-    end
-    
-    it "should support setting request.raw_post" do
-      controller = request("/namespaced/spec_helper_controller", {}, {:post_body => 'some XML'})
-      controller.request.raw_post.should == 'some XML'
-    end
-
-    it "should get namespaced index action" do
-      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
-      controller = request("/namespaced/spec_helper_controller")
-      controller.class.should == Namespaced::SpecHelperController
-    end
-
-    it "should make the post body available in the request on deferred routing" do
-      Merb::Router.prepare do |r|
-        r.match('/xmlrpc').defer_to do |request, params|
-          request.raw_post.should == 'XMLRPC request body'
-          {:controller => 'spec_helper_controller', :action => :index}
-        end
-      end
-
-      request('/xmlrpc', {}, {:post_body => 'XMLRPC request body'})
-    end
-  end
-  
-end
-
-module Merb::Test::RequestHelper
-  describe FakeRequest, ".new(env = {}, req = StringIO.new)" do
-    it "should create request with default enviroment, minus rack.input" do
-      @mock = FakeRequest.new
-      @mock.env.except('rack.input').should == FakeRequest::DEFAULT_ENV
-    end
-
-    it "should override default env values passed in HTTP format" do
-      @mock = FakeRequest.new('HTTP_ACCEPT' => 'nothing')
-      @mock.env['HTTP_ACCEPT'].should == 'nothing'
-    end
-
-    it "should override default env values passed in symbol format" do
-      @mock = FakeRequest.new(:http_accept => 'nothing')
-      @mock.env['HTTP_ACCEPT'].should == 'nothing'
-    end
-
-    it "should set rack input to an empty StringIO" do
-      @mock = FakeRequest.new
-      @mock.env['rack.input'].should be_kind_of(StringIO)
-      @mock.env['rack.input'].read.should == ''
-    end
-  end
-end