view_mapper 0.2.0 → 0.3.0

data/test/has_many_view_test.rb

@@ -0,0 +1,405 @@
+require 'test_helper'
+
+class HasManyViewTest < Test::Unit::TestCase
+
+  attr_reader :singular_name
+  attr_reader :attributes
+  attr_reader :plural_name
+  attr_reader :child_models
+  attr_reader :child_model
+  attr_reader :class_name
+  attr_reader :migration_name
+  attr_reader :table_name
+  attr_reader :options
+
+  context "A view_for generator instantiated for a test model" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      setup_test_model_without_nested_attributes
+    end
+
+    should "detect the existing child models when no child model is specified" do
+      Rails::Generator::Base.logger.expects('warning').with('Model Parent does not accept nested attributes for model ThirdModel.')
+      gen = new_generator_for_test_model('view_for', ['--view', 'has_many'], 'parent')
+      child_models = gen.child_models
+      assert_equal 2, child_models.size
+      assert_equal 'SomeOtherModel', child_models[0].name
+      assert_equal 'Testy',          child_models[1].name
+      assert_equal [ 'name' ],                               child_models[0].columns
+      assert_equal [ 'first_name', 'last_name', 'address' ], child_models[1].columns
+    end
+
+    should "use find the specified valid child model if provided" do
+      gen = new_generator_for_test_model('view_for', ['--view', 'has_many:testies'], 'parent')
+      child_models = gen.child_models
+      assert_equal 'Testy', gen.child_models[0].name
+      assert_equal 1, gen.child_models.size
+    end
+
+    should "be able to parse two model names" do
+      gen = new_generator_for_test_model('view_for', ['--view', 'has_many:testies,some_other_models'], 'parent')
+      child_models = gen.child_models
+      assert_equal 2, gen.child_models.size
+      assert_equal 'Testy',          child_models[0].name
+      assert_equal 'SomeOtherModel', child_models[1].name
+      assert_equal [ 'first_name', 'last_name', 'address' ], child_models[0].columns
+      assert_equal [ 'name' ],                               child_models[1].columns
+    end
+
+    should "return an error message with a bad child model param" do
+      Rails::Generator::Base.logger.expects('error').with('Class \'blah\' does not exist or contains a syntax error and could not be loaded.')
+      gen = new_generator_for_test_model('view_for', ['--view', 'has_many:blah'], 'parent')
+      assert_equal [], gen.child_models
+    end
+  end
+
+  context "A scaffold_for_view generator instantiated for a test model" do
+    setup do
+      setup_test_model
+    end
+
+    should "return a warning when run with scaffold_for_view when no has_many is specified and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('error').with('No has_many association specified.')
+      @generator_script = Rails::Generator::Scripts::Generate.new
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many'], 'parent'))
+    end
+  end
+
+  context "A test model with no has many associations" do
+    setup do
+      setup_test_model
+    end
+
+    should "return a error when run with view_for and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('error').with('No has_many associations exist in class Testy.')
+      @generator_script = Rails::Generator::Scripts::Generate.new
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many']))
+    end
+
+    should "return a error when run with scaffold_for_view and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('error').with('No has_many association specified.')
+      @generator_script = Rails::Generator::Scripts::Generate.new
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many']))
+    end
+  end
+
+  context "A test model with a has_many association for a model for which it does not accept nested attributes" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      setup_test_model_without_nested_attributes
+    end
+
+    should "return a warning and stop when the problem model is specified" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('warning').with('Model Parent does not accept nested attributes for model ThirdModel.')
+      @generator_script = Rails::Generator::Scripts::Generate.new
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:third_models'], 'parent'))
+    end
+
+    should "return a warning and not include the problem model when run with view_for but continue to run for other models" do
+      stub_actions
+      Rails::Generator::Base.logger.expects('warning').with('Model Parent does not accept nested attributes for model ThirdModel.')
+      Rails::Generator::Commands::Create.any_instance.expects(:directory).with('app/controllers/')
+      @generator_script = Rails::Generator::Scripts::Generate.new
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many'], 'parent'))
+    end
+  end
+
+  context "A view_for generator instantiated for a test model with two has_many associations" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      @gen = new_generator_for_test_model('view_for', ['--view', 'has_many'], 'parent')
+    end
+
+    should "return the proper source root folder" do
+      assert_equal './test/../lib/view_mapper/has_many_templates', @gen.source_root
+    end
+
+    view_for_templates = %w{ new edit show index }
+    view_for_templates.each do | template |
+      should "render the #{template} template as expected" do
+        @attributes = @gen.attributes
+        @singular_name = @gen.singular_name
+        @plural_name = @gen.plural_name
+        @child_models = @gen.child_models
+        template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/view_#{template}.html.erb"))
+        result = ERB.new(template_file.read, nil, '-').result(binding)
+        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/#{template}.html.erb"))
+        assert_equal expected_file.read, result
+      end
+    end
+
+    should "render the form partial as expected" do
+      @attributes = @gen.attributes
+      @singular_name = @gen.singular_name
+      @plural_name = @gen.plural_name
+      @child_models = @gen.child_models
+      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/view_form.html.erb"))
+      result = ERB.new(template_file.read, nil, '-').result(binding)
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/_form.html.erb"))
+      assert_equal expected_file.read, result
+    end
+
+    should "render the person partial as expected" do
+      @child_model = @gen.child_models[1]
+      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/view_child_form.html.erb"))
+      result = ERB.new(template_file.read, nil, '-').result(binding)
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/_person.html.erb"))
+      assert_equal expected_file.read, result
+    end
+  end
+
+  context "A scaffold_for_view generator instantiated for a test model with two has_many associations" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      @gen = new_generator_for_test_model('scaffold_for_view', ['--view', 'has_many:some_other_models,testies'], 'parent')
+    end
+
+    should "render the model template as expected" do
+      @child_models = @gen.child_models
+      @class_name = @gen.class_name
+      @attributes = @gen.attributes
+      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/model.rb"))
+      result = ERB.new(template_file.read, nil, '-').result(binding)
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/parent.rb"))
+      assert_equal expected_file.read, result
+    end
+
+    should "render the migration template as expected" do
+      @class_name = @gen.class_name
+      @attributes = @gen.attributes
+      @migration_name = 'CreateParents'
+      @table_name = @gen.table_name
+      @options = {}
+      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/migration.rb"))
+      result = ERB.new(template_file.read, nil, '-').result(binding)
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/create_parents.rb"))
+      assert_equal expected_file.read, result
+    end
+  end
+
+  context "A Rails generator script" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      @generator_script = Rails::Generator::Scripts::Generate.new
+    end
+
+    should "return a warning when run with view_for on an invalid child model and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('error').with('Class \'blah\' does not exist or contains a syntax error and could not be loaded.')
+      @generator_script = Rails::Generator::Scripts::Generate.new
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:blah']))
+    end
+
+    should "create the correct manifest when the view_for generator is run with a valid child model" do
+
+      expect_no_warnings
+
+      directories = [
+        'app/controllers/',
+        'app/helpers/',
+        'app/views/parents',
+        'app/views/layouts/',
+        'test/functional/',
+        'test/unit/',
+        'test/unit/helpers/',
+        'public/stylesheets/'
+      ].each { |path| Rails::Generator::Commands::Create.any_instance.expects(:directory).with(path) }
+
+      templates = {
+        'view_index.html.erb'  => 'app/views/parents/index.html.erb',
+        'view_new.html.erb'    => 'app/views/parents/new.html.erb',
+        'view_edit.html.erb'   => 'app/views/parents/edit.html.erb',
+        'view_form.html.erb'   => 'app/views/parents/_form.html.erb',
+        'layout.html.erb'      => 'app/views/layouts/parents.html.erb',
+        'style.css'            => 'public/stylesheets/scaffold.css',
+        'controller.rb'        => 'app/controllers/parents_controller.rb',
+        'functional_test.rb'   => 'test/functional/parents_controller_test.rb',
+        'helper.rb'            => 'app/helpers/parents_helper.rb',
+        'helper_test.rb'       => 'test/unit/helpers/parents_helper_test.rb'
+      }.each { |template, target| Rails::Generator::Commands::Create.any_instance.expects(:template).with(template, target) }
+
+      testy_model_info = ViewMapper::ModelInfo.new('testy')
+      parent_model_info = ViewMapper::ModelInfo.new('parent')
+      ViewMapper::ModelInfo.stubs(:new).with('testy').returns(testy_model_info)
+      ViewMapper::ModelInfo.stubs(:new).with('parent').returns(parent_model_info)
+      Rails::Generator::Commands::Create.any_instance.expects(:template).with(
+        'view_show.html.erb',
+        'app/views/parents/show.html.erb',
+        { :assigns => { :child_models => [ testy_model_info ] } }
+      )
+      Rails::Generator::Commands::Create.any_instance.expects(:template).with(
+        'view_child_form.html.erb',
+        'app/views/parents/_testy.html.erb',
+        { :assigns => { :child_model => testy_model_info } }
+      )
+      Rails::Generator::Commands::Create.any_instance.expects(:file).with(
+        'nested_attributes.js', 'public/javascripts/nested_attributes.js'
+      )
+      Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('parents')
+      Rails::Generator::Commands::Create.any_instance.expects(:file).never
+      Rails::Generator::Commands::Create.any_instance.expects(:dependency).never
+
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:testies'], 'parent'))
+    end
+
+    should "create the correct manifest when the scaffold_for_view generator is run with a valid child model" do
+
+      expect_no_warnings
+
+      directories = [
+        'app/models/',
+        'app/controllers/',
+        'app/helpers/',
+        'app/views/parents',
+        'app/views/layouts/',
+        'test/functional/',
+        'test/unit/',
+        'test/unit/helpers/',
+        'test/fixtures/',
+        'public/stylesheets/'
+      ].each { |path| Rails::Generator::Commands::Create.any_instance.expects(:directory).with(path) }
+
+      templates = {
+        'view_index.html.erb'  => 'app/views/parents/index.html.erb',
+        'view_new.html.erb'    => 'app/views/parents/new.html.erb',
+        'view_edit.html.erb'   => 'app/views/parents/edit.html.erb',
+        'view_form.html.erb'   => 'app/views/parents/_form.html.erb',
+        'layout.html.erb'      => 'app/views/layouts/parents.html.erb',
+        'style.css'            => 'public/stylesheets/scaffold.css',
+        'controller.rb'        => 'app/controllers/parents_controller.rb',
+        'functional_test.rb'   => 'test/functional/parents_controller_test.rb',
+        'helper.rb'            => 'app/helpers/parents_helper.rb',
+        'helper_test.rb'       => 'test/unit/helpers/parents_helper_test.rb',
+        'model.rb'            => 'app/models/parent.rb',
+        'unit_test.rb'        => 'test/unit/parent_test.rb',
+        'fixtures.yml'        => 'test/fixtures/parents.yml'
+      }.each { |template, target| Rails::Generator::Commands::Create.any_instance.expects(:template).with(template, target) }
+
+      testy_model_info = ViewMapper::ModelInfo.new('testy')
+      parent_model_info = ViewMapper::ModelInfo.new('parent')
+      ViewMapper::ModelInfo.stubs(:new).with('testy').returns(testy_model_info)
+      ViewMapper::ModelInfo.stubs(:new).with('parent').returns(parent_model_info)
+      Rails::Generator::Commands::Create.any_instance.expects(:template).with(
+        'view_show.html.erb',
+        'app/views/parents/show.html.erb',
+        { :assigns => { :child_models => [ testy_model_info ] } }
+      )
+      Rails::Generator::Commands::Create.any_instance.expects(:template).with(
+        'view_child_form.html.erb',
+        'app/views/parents/_testy.html.erb',
+        { :assigns => { :child_model => testy_model_info } }
+      )
+      Rails::Generator::Commands::Create.any_instance.expects(:file).with(
+        'nested_attributes.js', 'public/javascripts/nested_attributes.js'
+      )
+      Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('parents')
+      Rails::Generator::Commands::Create.any_instance.expects(:file).never
+      Rails::Generator::Commands::Create.any_instance.expects(:dependency).never
+
+      Rails::Generator::Commands::Create.any_instance.expects(:migration_template).with(
+        'migration.rb',
+        'db/migrate',
+        :assigns => { :migration_name => "CreateParents" },
+        :migration_file_name => "create_parents"
+      )
+
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many:testies'], 'parent'))
+    end
+  end
+
+  context "A Rails generator script with a child model without a belongs_to association" do
+    setup do
+      setup_test_model
+      setup_parent_test_model(false, false)
+      @generator_script = Rails::Generator::Scripts::Generate.new
+    end
+
+    should "return a warning when run with view_for and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('warning').with('Model Testy does not contain a belongs_to association for Parent.')
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:testies'], 'parent'))
+    end
+
+    should "return a warning when run with scaffold_for_view and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('warning').with('Model Testy does not contain a belongs_to association for Parent.')
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many:testies'], 'parent'))
+    end
+  end
+
+  context "A Rails generator script with a child model missing a foreign key" do
+    setup do
+      setup_test_model
+      setup_parent_test_model(false)
+      @generator_script = Rails::Generator::Scripts::Generate.new
+    end
+
+    should "return a warning when run with view_for and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('warning').with('Model Testy does not contain a foreign key for Parent.')
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:testies'], 'parent'))
+    end
+
+    should "return a warning when run with scaffold_for_view and not run any actions" do
+      expect_no_actions
+      Rails::Generator::Base.logger.expects('warning').with('Model Testy does not contain a foreign key for Parent.')
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many:testies'], 'parent'))
+    end
+  end
+
+  context "A Rails generator script with a child model that has a habtm association" do
+    setup do
+      setup_test_model
+      setup_parent_test_model(false, false)
+      Testy.class_eval do
+        has_and_belongs_to_many :parents
+      end
+      @generator_script = Rails::Generator::Scripts::Generate.new
+    end
+
+    should "not return a warning when run with view_for" do
+      stub_actions
+      expect_no_warnings
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:testies'], 'parent'))
+    end
+
+    should "not return a warning when run with scaffold_for_view" do
+      stub_actions
+      expect_no_warnings
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many:testies'], 'parent'))
+    end
+  end
+
+  context "A Rails generator script with a child model that has_many (through) association" do
+    setup do
+      setup_test_model
+      setup_parent_test_model(false, false)
+      Testy.class_eval do
+        has_many :parents
+      end
+      @generator_script = Rails::Generator::Scripts::Generate.new
+    end
+
+    should "not return a warning when run with view_for" do
+      stub_actions
+      expect_no_warnings
+      @generator_script.run(generator_script_cmd_line('view_for', ['--view', 'has_many:testies'], 'parent'))
+    end
+
+    should "not return a warning when run with scaffold_for_view" do
+      stub_actions
+      expect_no_warnings
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'has_many:testies'], 'parent'))
+    end
+  end
+
+end

data/test/model_info_test.rb

@@ -0,0 +1,81 @@
+require 'test_helper'
+
+class ModelInfoTest < Test::Unit::TestCase
+
+  context "A model info object created for a test model" do
+    setup do
+      setup_test_model
+      @model_info = ViewMapper::ModelInfo.new('testy')
+    end
+
+    should "find the model" do
+      assert_equal Testy, @model_info.model
+    end
+
+    should "return the model's name" do
+      assert_equal 'Testy', @model_info.name
+    end
+
+    should "return the model's columns and not the primary key or time stamp columns" do
+      assert_equal [ 'first_name', 'last_name', 'address' ], @model_info.columns
+    end
+
+    should "return the model's Rails Generator attributes" do
+      attribs = @model_info.attributes
+      assert_kind_of Rails::Generator::GeneratedAttribute, attribs[0]
+      assert_kind_of Rails::Generator::GeneratedAttribute, attribs[1]
+      assert_kind_of Rails::Generator::GeneratedAttribute, attribs[2]
+      assert_equal 'first_name', attribs[0].name
+      assert_equal 'last_name',  attribs[1].name
+      assert_equal 'address',    attribs[2].name
+    end
+  end
+
+  context "Child and parent model info objects" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      @child_model = ViewMapper::ModelInfo.new('testy')
+      @parent_model = ViewMapper::ModelInfo.new('parent')
+    end
+
+    should "not include the parent foreign key column in the child model's columns" do
+      assert_equal [ 'first_name', 'last_name', 'address' ], @child_model.columns
+    end
+
+    should "determine that the child model belongs to the parent model" do
+      assert_equal true, @child_model.belongs_to?('parent')
+    end
+
+    should "determine that the parent model has many child models" do
+      assert_equal true, @parent_model.has_many?('testies')
+    end
+  end
+
+  context "Two model info objects for models that in a habtm association" do
+    setup do
+      setup_test_model
+      setup_parent_test_model
+      Testy.class_eval do
+        has_and_belongs_to_many :parents
+      end
+      @child_model = ViewMapper::ModelInfo.new('testy')
+      @parent_model = ViewMapper::ModelInfo.new('parent')
+    end
+
+    should "determine that a habtm association exists" do
+      assert_equal true, @child_model.has_and_belongs_to_many?('parents')
+    end
+  end
+
+  context "A model info object created for a test model that has Paperclip attachments" do
+    setup do
+      setup_test_model(true)
+      @model_info = ViewMapper::ModelInfo.new('testy')
+    end
+
+    should "not include the Paperclip columns in the model's columns" do
+      assert_equal [ 'first_name', 'last_name', 'address' ], @model_info.columns
+    end
+  end
+end

data/test/paperclip_view_test.rb

@@ -33,21 +33,14 @@ class PaperclipViewTest < Test::Unit::TestCase
     end
   end
 
-  context "A view_for generator instantiated for a test model" do
+  context "A view_for generator instantiated for a test model missing Paperclip columns" do
     setup do
       setup_test_model(false)
     end
 
-    context "with missing paperclip columns" do
-      setup do
-        Struct.new("FakeColumn", :name)
-        @fake_cols = [ Struct::FakeColumn.new("first_name"), Struct::FakeColumn.new("last_name"), Struct::FakeColumn.new("address") ]
-      end
-
-      should "return an error message with a bad paperclip param" do
-        Rails::Generator::Base.logger.expects('error').with('Column \'avatar_file_name\' does not exist. First run script/generate paperclip testy avatar.')
-        new_generator_for_test_model('view_for', ['--view', 'paperclip:avatar'])
-      end
+    should "return an error message with a bad paperclip param" do
+      Rails::Generator::Base.logger.expects('error').with('Column \'avatar_file_name\' does not exist. First run script/generate paperclip testy avatar.')
+      new_generator_for_test_model('view_for', ['--view', 'paperclip:avatar'])
     end
   end
 
@@ -140,22 +133,6 @@ class PaperclipViewTest < Test::Unit::TestCase
       assert_equal './test/../lib/view_mapper/paperclip_templates', @gen.source_root
     end
 
-    should "have the proper built in columns" do
-      assert_equal [ 'id',
-                     'created_at',
-                     'updated_at',
-                     'avatar_file_name',
-                     'avatar_content_type',
-                     'avatar_file_size',
-                     'avatar_updated_at',
-                     'avatar2_file_name',
-                     'avatar2_content_type',
-                     'avatar2_file_size',
-                     'avatar2_updated_at'
-                   ].sort,
-                   @gen.built_in_columns.sort
-    end
-
     view_for_templates = %w{ new edit index show }
     view_for_templates.each do | template |
       should "render the #{template} template as expected" do

data/test/test_helper.rb

@@ -44,8 +44,8 @@ def setup_test_table(paperclip_columns = false)
   end
 end
 
-def setup_test_model(missing_columns = false)
-  setup_test_table(missing_columns)
+def setup_test_model(paperclip_columns = false)
+  setup_test_table(paperclip_columns)
   Object.send(:remove_const, "Testy") rescue nil
   Object.const_set("Testy", Class.new(ActiveRecord::Base))
   Testy.class_eval do
@@ -57,6 +57,49 @@ def setup_test_model(missing_columns = false)
   Object.const_get("Testy")
 end
 
+def setup_parent_test_model(create_foreign_key = true, child_belongs_to_parent = true)
+  ActiveRecord::Base.connection.create_table :parents, :force => true do |table|
+    table.column :name, :string
+  end
+  ActiveRecord::Base.connection.create_table :some_other_models, :force => true do |table|
+    table.column :name,      :string
+    table.column :parent_id, :integer
+  end
+  ActiveRecord::Base.connection.add_column :testies, :parent_id, :integer unless !create_foreign_key
+  Object.send(:remove_const, "Parent") rescue nil
+  Object.const_set("Parent", Class.new(ActiveRecord::Base))
+  Object.send(:remove_const, "SomeOtherModel") rescue nil
+  Object.const_set("SomeOtherModel", Class.new(ActiveRecord::Base))
+  Parent.class_eval do
+    has_many :testies
+    has_many :some_other_model
+    def testies_attributes=
+      'fake'
+    end
+    def some_other_models_attributes=
+      'fake'
+    end
+  end
+  Testy.class_eval do
+    belongs_to :parent unless !child_belongs_to_parent
+  end
+  SomeOtherModel.class_eval do
+    belongs_to :parent
+  end
+  Object.const_get("Parent")
+end
+
+def setup_test_model_without_nested_attributes
+  ActiveRecord::Base.connection.create_table :third_models, :force => true do |table|
+    table.column :name, :string
+  end
+  Object.send(:remove_const, "ThirdModel") rescue nil
+  Object.const_set("ThirdModel", Class.new(ActiveRecord::Base))
+  Parent.class_eval do
+    has_many :third_model
+  end
+end
+
 module MockPaperclip
   class << self
     def included(base)
@@ -73,19 +116,49 @@ class Rails::Generator::NamedBase
   public :attributes
 end
 
-def generator_cmd_line(gen, args)
+def generator_cmd_line(gen, args, model)
   if gen == 'view_for'
-    cmd_line = ['testy']
+    cmd_line = [model]
   else
-    cmd_line = ['testy', 'first_name:string', 'last_name:string', 'address:string']
+    cmd_line = [model, 'first_name:string', 'last_name:string', 'address:string']
   end
   (cmd_line << args).flatten
 end
 
-def generator_script_cmd_line(gen, args)
-  ([gen] << generator_cmd_line(gen, args)).flatten
+def generator_script_cmd_line(gen, args, model = 'testy')
+  ([gen] << generator_cmd_line(gen, args, model)).flatten
+end
+
+def new_generator_for_test_model(gen, args, model = 'testy')
+  Rails::Generator::Base.instance(gen, generator_cmd_line(gen, args, model))
+end
+
+def expect_no_actions
+  Rails::Generator::Commands::Create.any_instance.expects(:directory).never
+  Rails::Generator::Commands::Create.any_instance.expects(:template).never
+  Rails::Generator::Commands::Create.any_instance.expects(:route_resources).never
+  Rails::Generator::Commands::Create.any_instance.expects(:file).never
+  Rails::Generator::Commands::Create.any_instance.expects(:route).never
+  Rails::Generator::Commands::Create.any_instance.expects(:dependency).never
+end
+
+def expect_no_warnings
+  Rails::Generator::Base.logger.expects(:error).never
+  Rails::Generator::Base.logger.expects(:warning).never
+  Rails::Generator::Base.logger.expects(:route).never
+end
+
+def stub_actions
+  Rails::Generator::Commands::Create.any_instance.stubs(:directory)
+  Rails::Generator::Commands::Create.any_instance.stubs(:template)
+  Rails::Generator::Commands::Create.any_instance.stubs(:route_resources)
+  Rails::Generator::Commands::Create.any_instance.stubs(:file)
+  Rails::Generator::Commands::Create.any_instance.stubs(:route)
+  Rails::Generator::Commands::Create.any_instance.stubs(:dependency)
 end
 
-def new_generator_for_test_model(gen, args)
-  Rails::Generator::Base.instance(gen, generator_cmd_line(gen, args))
+def stub_warnings
+  Rails::Generator::Base.logger.stubs(:error)
+  Rails::Generator::Base.logger.stubs(:warning)
+  Rails::Generator::Base.logger.stubs(:route)
 end

data/test/view_mapper_test.rb

@@ -4,7 +4,7 @@ class ViewMapperTest < Test::Unit::TestCase
 
   context "A rails generator script with a view option specified" do
     setup do
-      @gen = Rails::Generator::Base.instance('fake', ['testy', 'name:string', '--view', 'fake'])
+      @gen = new_generator_for_test_model('fake', ['testy', 'name:string', '--view', 'fake'])
     end
 
     should "use the specified view" do
@@ -18,7 +18,7 @@ class ViewMapperTest < Test::Unit::TestCase
 
   context "A rails generator script with a view option and parameter specified" do
     setup do
-      @gen = Rails::Generator::Base.instance('fake', ['testy', 'name:string', '--view', 'fake:value'])
+      @gen = new_generator_for_test_model('fake', ['testy', 'name:string', '--view', 'fake:value'])
     end
 
     should "pass the view parameter to the specified view" do