@@ -32,10 +32,10 @@ class ControllerGenerator < Genosaurus rf.each do |line| if line.match("Mack::Routes.build") x = line.match(/\|(.+)\|/).captures - line << "\n # Added by rake generate:controller name=#{param(:name)} actions=#{param(:actions)}\n" - line << "\n r.with_options(:controller => :#{@name_plural}) do |map|\n" + line << "\n # Added by rake generate:controller name=#{param(:name)} actions=#{param(:actions)}" + line << "\n r.with_options(:controller => :#{@name_plural}) do |map|" @actions.each do |action| - line << "\n map.#{@name_plural}_#{action}_url \"/#{@name_plural}#{action == "index" ? "" : "/#{action}"}\", :action => :#{action}" + line << "\n map.#{@name_plural}_#{action} \"/#{@name_plural}#{action == "index" ? "" : "/#{action}"}\", :action => :#{action}" end line << "\n end # #{@name_plural}\n" end lib/mack/generators/controller_generator/controller_generator.rb @@ -4,7 +4,11 @@ describe <%= @name_plural_camel %>Controller do <% @actions.each do |action| %> describe "<%= action %>" do - it "should do something :)" + it "should get the <%= action %> action" do + get <%= @name_plural %>_<%= action %>_url + response.should be_successful + response.body.should match(/<%= @name_plural_camel %>Controller#<%= action %>/) + end end <% end %> lib/mack/generators/controller_generator/templates/test/controllers/rspec.rb.template @@ -7,7 +7,9 @@ class <%= @name_plural_camel %>ControllerTest < Test::Unit::TestCase end <% @actions.each do |action| %> def test_<%= action %> - assert true + get <%= @name_plural %>_<%= action %>_url + assert response.successful? + assert_match /<%= @name_plural_camel %>Controller#<%= action %>/, response.body end <% end %> end \ No newline at end of file lib/mack/generators/controller_generator/templates/test/controllers/test_case.rb.template @@ -4,13 +4,21 @@ describe ZoosController do describe "index" do - it "should do something :)" + it "should get the index action" do + get zoos_index_url + response.should be_successful + response.body.should match(/ZoosController#index/) + end end describe "show" do - it "should do something :)" + it "should get the show action" do + get zoos_show_url + response.should be_successful + response.body.should match(/ZoosController#show/) + end end test/fixtures/zoos_controller_spec_with_actions.rb.fixture @@ -7,11 +7,15 @@ class ZoosControllerTest < Test::Unit::TestCase end def test_index - assert true + get zoos_index_url + assert response.successful? + assert_match /ZoosController#index/, response.body end def test_show - assert true + get zoos_show_url + assert response.successful? + assert_match /ZoosController#show/, response.body end end test/fixtures/zoos_controller_test_with_actions.rb.fixture @@ -45,8 +45,8 @@ describe ControllerGenerator do ControllerGenerator.run("name" => "zoo", "actions" => "index,show") File.read(@route_file_loc).should match(/ # Added by rake generate:controller name=zoo actions=index,show/) File.read(@route_file_loc).should match(/ r.with_options\(:controller => :zoos\) do \|map\|/) - File.read(@route_file_loc).should match(/ map.zoos_index_url "\/zoos", :action => :index/) - File.read(@route_file_loc).should match(/ map.zoos_show_url "\/zoos\/show", :action => :show/) + File.read(@route_file_loc).should match(/ map.zoos_index "\/zoos", :action => :index/) + File.read(@route_file_loc).should match(/ map.zoos_show "\/zoos\/show", :action => :show/) File.read(@route_file_loc).should match(/ end # zoos/) end test/unit/generators/controller_generator_spec.rb 9502e60855e78a9c9319e45ce7a75162a92d7cb1 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/fc72954d683d67e43c90c66274ba4d2ef77de7dd fc72954d683d67e43c90c66274ba4d2ef77de7dd 2008-08-05T10:35:48-07:00 2008-08-05T10:35:48-07:00 ControllerGenerator now generates 'good' default tests. [#25] ea39bad5c28cfbcad8d88a17143c83aa90faedc3 Mark Bates mark@markbates.com