Changeset 1102

Timestamp:

12/13/07 23:23:33 (1 year ago)

Author:

has.s..@gmail.com

Message:

Adds spec helper methods with_route and dispatch_to

Files:

• trunk/lib/merb/test/helper.rb (modified) (1 diff)
• trunk/spec/merb/controller_spec.rb (modified) (5 diffs)
• trunk/spec/merb/router_spec.rb (modified) (1 diff)

trunk/lib/merb/test/helper.rb

@@ -45 +45 @@
-        end
-      end
+      
+      # Checks that a route is made to the correct controller etc
+      # 
+      # === Example
+      # with_route("/pages/1", "PUT") do |params|
+      #   params[:controller].should == "pages"
+      #   params[:action].should == "update"
+      #   params[:id].should == "1"
+      # end
+      def with_route(the_path, _method = "GET")
+        result = Merb::Router.match(fake_request(the_path, _method), {})
+        yield result[1] if block_given?
+        result
+      end 
+
+      def fixtures(*files)
+        files.each do |name|
+          klass = Kernel::const_get(Inflector.classify(Inflector.singularize(name)))
+          entries = YAML::load_file(File.dirname(__FILE__) + "/fixtures/#{name}.yaml")
+          entries.each do |name, entry|
+            klass::create(entry)
+          end
+        end
+      end
+
+
+      # Dispatches an action to a controller.  Defaults to index.  
+      # The opts hash, if provided will act as the params hash in the controller
+      # and the params method in the controller is infact the provided opts hash
+      # This controller is based on a fake_request and does not go through the router
+      # 
+      # === Simple Example
+      #  {{{
+      #    controller, result = dispatch_to(Pages, :show, :id => 1, :title => "blah")
+      #  }}}
+      #
+      # === Complex Example
+      # By providing a block to the dispatch_to method, the controller may be stubbed or mocked prior to the 
+      # actual dispatch action being called.
+      #   {{{
+      #     controller, result = dispatch_to(Pages, :show, :id => 1) do |controller|
+      #       controller.stub!(:render).and_return("rendered response")
+      #     end
+      #   }}}
+      def dispatch_to(controller, action = :index, opts = {})
+        klass = controller.class == Class ? controller : controller.class
+        klass.stub!(:find_by_title).and_return(@page)
+        the_controller = klass.build(fake_request)
+        the_controller.stub!(:params).and_return(opts.merge!(:controller => "#{klass.name.downcase}", :action => action.to_s))
+
+        yield the_controller if block_given?
+
+        [the_controller, the_controller.dispatch(action.to_sym)]
+      end
-    end
-  end

trunk/spec/merb/controller_spec.rb

@@ -14 +14 @@
-    c._layout.should == :application
-  end
+  
+  it "should have a spec helper to dispatch that skips the router" do
+    Merb::Router.should_not_receive(:match)
+    dispatch_to(Bar, :foo, :id => "1") do |controller|
+      controller.should_receive(:foo).with("1")
+    end
+  end
+  
-end
-
@@ -29 +37 @@
-    Merb::Controller.build(request, response)
-  end
-  
-  # before(:all) do
-  #   Merb::Router.prepare do |r|
-  #     @resource_routes = r.resources(:blogs)
-  #     r.resources(:gardens) do |gardens|
-  #       @nested_resource = gardens.resources :flowers
-  #     end
-  #     @test_route = r.match("/the/:place/:goes/here").to(:controller => "Test", :action => "show").name(:test)
-  #     @default_route = r.default_routes
-  #   end
-  # end
-  
-  # it "should generate a url from a route using a hash" do
-  #   c = new_url_controller(@test_route, :place => "1")
-  #   c.url_from_route(@test_route, :goes => "g").should == "/the/1/g/here"
-  # end
-
-  # it "should generate a url from a route using an object" do
-  #   c = new_url_controller(@test_route, :place => "2")
-  #   obj = OpenStruct.new(:goes => "elsewhere")
-  #   c.url_from_route(@test_route, obj).should == "/the/2/elsewhere/here"
-  # end
-
-  # it "should generate a url and tack extra params on as a query string" do
-  #   c = new_url_controller(@test_route, :place => "1")
-  #   c.url_from_route(@test_route, :goes => "g", :page => 2).should == "/the/1/g/here?page=2"
-  # end
-  
-  # it "should generate a url directly from a hash using the current route as a default" do
-  #   c = new_url_controller(@test_route, :goes => "swimmingly")
-  #   c.url(:place => "provo").should == "/the/provo/swimmingly/here"
-  # end
-  
-  # it "should generate a default route url with just :controller" do
-  #   c = new_url_controller(@default_route)
-  #   c.url(:controller => "welcome").should == "/welcome"
-  # end
-
-  it "should generate a default route url with just :action" do
@@ -76 +47 @@
-    c.url(:id => "23").should == "/foo/bar/23"
-  end
-
-  # it 'should generate urls from nested resources' do
-  #   c = new_url_controller(@nested_resource, :garden => 5)
-  #   c.url(:flower, :garden_id => 1, :id => 3).should == "/gardens/1/flowers/3"
-  # end
-
-  it "should generate a default route url with an extra param" do
@@ -109 +75 @@
-  end  
-  
-  # it "should generate a default route url with all options" do
-  #   c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
-  #   c.url(:controller => "foo", :action => "bar", :id => "baz", :format => :js, :monkey => "quux").should == "/foo/bar/baz.js?monkey=quux"
-  # end
-  # 
-  it "should handle nested nested and more nested hashes and arrays" do
-    c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
@@ -120 +81 @@
-    url.should match(%r{/foo/bar?.*user\[order\]\[\]=name})
-  end
-  
-  # it "should handle an object as the second arg" do
-  #   c = new_url_controller(@resource_routes, :controller => "blogs", :action => "show")
-  #   blog = mock("blog")
-  #   blog.should_receive(:id).once.and_return(7)
-  #   url = c.url(:blog, blog)
-  #   url.should == "/blogs/7"
-  # end
-
-  # it "should point to /blogs/:blog_id if @blog is not new_record" do
-  #   c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
-  #   blog = mock("blog")
-  #   blog.should_receive(:id).once.and_return(7)
-  #   blog.should_receive(:new_record?).once.and_return(false)
-  #   url = c.url(:blog, blog)
-  #   url.should == "/blogs/7"
-  # end
-
-  # it "should point to /blogs/ if @blog is new_record" do
-  #   c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
-  #   blog = mock("blog")
-  #   blog.should_receive(:new_record?).once.and_return(true)
-  #   url = c.url(:blog, blog)
-  #   url.should == "/blogs/"
-  # end
-end
-

trunk/spec/merb/router_spec.rb

@@ -72 +72 @@
-    Merb::Router.routes[0].should == r1
-    Merb::Router.routes[1].should == r2
+  end
+  
+  it "should have a spec helper to match routes" do
+    Merb::Router.prepare{ |r| r.default_routes }
+    with_route("/pages/show/1", "GET") do |params|
+      params[:controller].should == "pages"
+      params[:action].should == "show"
+      params[:id].should == "1"
+    end    
-  end
-