padrino-gen 0.12.0 → 0.12.1

data/test/test_generator.rb

@@ -1,9 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Generator" do
-
-  context "the generator" do
-    should "have default generators" do
+  describe "the generator" do
+    it 'should have default generators' do
       %w{controller mailer migration model app plugin component task}.each do |gen|
         assert Padrino::Generators.mappings.has_key?(gen.to_sym)
         assert_equal "Padrino::Generators::#{gen.camelize}", Padrino::Generators.mappings[gen.to_sym].name

data/test/test_mailer_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "MailerGenerator" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -10,14 +10,14 @@ describe "MailerGenerator" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the mailer generator' do
-    should "fail outside app root" do
+  describe 'the mailer generator' do
+    it 'should fail outside app root' do
       out, err = capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)
       assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb')
     end
 
-    should "generate mailer in specified app" do
+    it 'should generate mailer in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:mailer, 'demo', '-a=/subby', "-r=#{@apptmp}/sample_project") }
@@ -25,7 +25,7 @@ describe "MailerGenerator" do
       assert_dir_exists("#{@apptmp}/sample_project/subby/views/mailers/demo")
     end
 
-    should "generate mailer in specified app with actions" do
+    it 'should generate mailer in specified app with actions' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:mailer, 'demo', 'action1', 'action2', '-a=/subby', "-r=#{@apptmp}/sample_project") }
@@ -35,21 +35,21 @@ describe "MailerGenerator" do
       assert_dir_exists("#{@apptmp}/sample_project/subby/views/mailers/demo")
     end
 
-    should "support generating a new mailer extended from base" do
+    it 'should support generating a new mailer extended from base' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/demo")
     end
 
-    should "support generating a new mailer extended from base with long name" do
+    it 'should support generating a new mailer extended from base with long name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'UserNotice', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.mailer :user_notice/m, "#{@apptmp}/sample_project/app/mailers/user_notice.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/user_notice")
     end
 
-    should "support generating a new mailer extended from base with capitalized name" do
+    it 'should support generating a new mailer extended from base with capitalized name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'DEMO', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
@@ -57,8 +57,8 @@ describe "MailerGenerator" do
     end
   end
 
-  context "the mailer destroy option" do
-    should "destroy mailer file" do
+  describe "the mailer destroy option" do
+    it 'should destroy mailer file' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project",'-d') }

data/test/test_migration_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "MigrationGenerator" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -10,33 +10,33 @@ describe "MigrationGenerator" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the migration generator' do
-    should "fail outside app root" do
+  describe 'the migration generator' do
+    it 'should fail outside app root' do
       out, err = capture_io { generate(:migration, 'add_email_to_users', '-r=/tmp') }
       assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/db/migrate")
     end
 
-    should "fail if we don't use an adapter" do
+    it 'should fail if we do not use an adapter' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       assert_raises(SystemExit) { capture_io { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") } }
     end
 
-    should "generate migration inside app root" do
+    it 'should generate migration inside app root' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       response_success = capture_io { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUser/m, migration_file_path)
     end
 
-    should "generate migration inside app root with lowercase migration argument" do
+    it 'should generate migration inside app root with lowercase migration argument' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       response_success = capture_io { generate(:migration, 'add_email_to_users', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
     end
 
-    should "generate migration inside app root with singular table" do
+    it 'should generate migration inside app root with singular table' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:migration, 'add_email_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_user.rb"
@@ -45,8 +45,8 @@ describe "MigrationGenerator" do
       assert_match_in_file(/t.remove :email/, migration_file_path)
     end
 
-    context "the default migration numbering" do
-      should "properly calculate version number" do
+    describe "the default migration numbering" do
+      it 'should properly calculate version number' do
         capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
         capture_io { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
         capture_io { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
@@ -57,8 +57,8 @@ describe "MigrationGenerator" do
       end
     end
 
-    context "the timestamped migration numbering" do
-      should "properly calculate version number" do
+    describe "the timestamped migration numbering" do
+      it 'should properly calculate version number' do
         capture_io { generate(:project, 'sample_project', "--migration_format=timestamp", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
 
         time = stop_time_for_test.utc.strftime("%Y%m%d%H%M%S")
@@ -67,10 +67,25 @@ describe "MigrationGenerator" do
         assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/#{time}_add_gender_to_person.rb")
       end
     end
+
+    describe 'the migration argument' do
+      it 'should properly extract a table name from argument' do
+        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+        capture_io { generate(:migration, 'AddAuthenticityTokenFieldsToUsers', 'authentity_token:string', "-r=#{@apptmp}/sample_project") }
+        capture_io { generate(:migration, 'AddEmailToTokyo', 'email:string', "-r=#{@apptmp}/sample_project") }
+        capture_io { generate(:migration, 'AddLocationTofoo', 'location:string', "-r=#{@apptmp}/sample_project") }
+        migration_file_path1 = "#{@apptmp}/sample_project/db/migrate/001_add_authenticity_token_fields_to_users.rb"
+        migration_file_path2 = "#{@apptmp}/sample_project/db/migrate/002_add_email_to_tokyo.rb"
+        migration_file_path3 = "#{@apptmp}/sample_project/db/migrate/003_add_location_tofoo.rb"
+        assert_match_in_file(/change_table :users/, migration_file_path1)
+        assert_match_in_file(/change_table :tokyo/, migration_file_path2)
+        assert_match_in_file(/change_table :foos/,   migration_file_path3)
+      end
+    end
   end
 
-  context 'the migration generator for activerecord' do
-    should "generate migration for generic needs" do
+  describe 'the migration generator for activerecord' do
+    it 'should generate migration for generic needs' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
@@ -79,7 +94,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/def self\.down\s+end/m, migration_file_path)
     end
 
-    should "generate migration for adding columns" do
+    it 'should generate migration for adding columns' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
@@ -91,7 +106,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/t\.remove :age/m, migration_file_path)
     end
 
-    should "generate migration for removing columns" do
+    it 'should generate migration for removing columns' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
@@ -104,8 +119,8 @@ describe "MigrationGenerator" do
     end
   end
 
-  context 'the migration generator for datamapper' do
-    should "generate migration for generic needs" do
+  describe 'the migration generator for datamapper' do
+    it 'should generate migration for generic needs' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
@@ -114,7 +129,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/down\sdo\s+end/m, migration_file_path)
     end
 
-    should "generate migration for adding columns" do
+    it 'should generate migration for adding columns' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
@@ -126,7 +141,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/drop_column :age/m, migration_file_path)
     end
 
-    should "generate migration for removing columns" do
+    it 'should generate migration for removing columns' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
@@ -138,7 +153,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
     end
 
-    should "properly version migration files" do
+    it 'should properly version migration files' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       response_success = capture_io { generate(:migration, 'ModifyUserFields2', "-r=#{@apptmp}/sample_project") }
@@ -149,8 +164,8 @@ describe "MigrationGenerator" do
     end
   end
 
-  context 'the migration generator for sequel' do
-    should "generate migration for generic needs" do
+  describe 'the migration generator for sequel' do
+    it 'should generate migration for generic needs' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
@@ -159,7 +174,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/down do\s+end/m, migration_file_path)
     end
 
-    should "generate migration for adding columns" do
+    it 'should generate migration for adding columns' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
@@ -171,7 +186,7 @@ describe "MigrationGenerator" do
       assert_match_in_file(/drop_column :age/m, migration_file_path)
     end
 
-    should "generate migration for removing columns" do
+    it 'should generate migration for removing columns' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
@@ -184,9 +199,9 @@ describe "MigrationGenerator" do
     end
   end
 
-  context "the migration destroy option" do
+  describe "the migration destroy option" do
 
-    should "destroy the migration files" do
+    it 'should destroy the migration files' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       capture_io { generate(:migration, *migration_params) }
@@ -194,7 +209,7 @@ describe "MigrationGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb")
     end
 
-    should "destroy the migration file regardless of number" do
+    it 'should destroy the migration file regardless of number' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       migration_param2 = ['AddEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]

data/test/test_model_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "ModelGenerator" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -10,44 +10,44 @@ describe "ModelGenerator" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the model generator' do
-    should "fail outside app root" do
+  describe 'the model generator' do
+    it 'should fail outside app root' do
       out, err = capture_io { generate(:model, 'user', "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)
       assert_no_file_exists('/tmp/models/user.rb')
     end
 
-    should "generate filename properly" do
+    it 'should generate filename properly' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       capture_io { generate(:model, 'DemoItem', "name:string", "age", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project/models/demo_item.rb")
     end
 
-    should "fail if field name is not acceptable" do
+    it 'should fail if field name is not acceptable' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       out, err = capture_io { generate(:model, 'DemoItem', "re@l$ly:string","display-name:string", "age&year:datetime", "email_two:string", "-r=#{@apptmp}/sample_project") }
       assert_match(/Invalid field name:/, out)
       assert_match(/display-name:string/, out)
       assert_match(/age&year:datetime/, out)
       assert_match(/re@l\$ly:string/, out)
-      assert_no_match(/email_two:string/, out)
-      assert_no_match(/apply/, out)
+      refute_match(/email_two:string/, out)
+      refute_match(/apply/, out)
       assert_no_file_exists("#{@apptmp}/sample_project/models/demo_item.rb")
     end
 
-    should "fail if we don't use an adapter" do
+    it 'should fail if we do not use an adapter' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       assert_raises(SystemExit) { capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") } }
     end
 
-    should "not fail if we don't have test component" do
+    it 'should not fail if we do not have test component' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none', '-d=activerecord') }
       response_success = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/test")
     end
 
-    should "generate model in specified app" do
+    it 'should generate model in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'Post', "body:string", '-a=/subby', "-r=#{@apptmp}/sample_project") }
@@ -57,7 +57,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/DataMapper.finalize/m,"#{@apptmp}/sample_project/config/boot.rb")
     end
 
-    should "generate only generate model once" do
+    it 'should generate only generate model once' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       response_success = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       out, err = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
@@ -66,7 +66,7 @@ describe "ModelGenerator" do
       assert_match(/identical\e\[0m  test\/models\/user_test\.rb/, out)
     end
 
-    should "generate migration file versions properly" do
+    it 'should generate migration file versions properly' do
       capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'account', "-r=#{@apptmp}/sample_project") }
@@ -76,7 +76,7 @@ describe "ModelGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/003_create_banks.rb")
     end
 
-    should "generate migration file versions properly when timestamped" do
+    it 'should generate migration file versions properly when timestamped' do
       capture_io { generate(:project, 'sample_project', "--migration_format=timestamp", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
 
       time = stop_time_for_test.utc.strftime("%Y%m%d%H%M%S")
@@ -85,7 +85,7 @@ describe "ModelGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/#{time}_create_users.rb")
     end
 
-    should "generate a default type value for fields" do
+    it 'should generate a default type value for fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'person', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") }
@@ -98,7 +98,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/    drop_table :people/m, migration_file_path)
     end
 
-    should "abort if model name already exists" do
+    it 'should abort if model name already exists' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "-d=activerecord") }
       out, err = capture_io { generate(:model, 'kernel', "--root=#{@apptmp}/sample_project") }
       assert_match(/Kernel already exists/, out)
@@ -106,7 +106,7 @@ describe "ModelGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/models/kernel.rb")
     end
 
-    should "abort if model name already exists in root" do
+    it 'should abort if model name already exists in root' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "-d=activerecord") }
       capture_io { generate(:app, 'user', "--root=#{@apptmp}/sample_project") }
       out, err = capture_io { generate_with_parts(:model, 'user', "--root=#{@apptmp}/sample_project", :apps => "user") }
@@ -117,26 +117,26 @@ describe "ModelGenerator" do
   end
 
   # ACTIVERECORD
-  context "model generator using activerecord" do
-    should "add activerecord middleware" do
+  describe "model generator using activerecord" do
+    it 'should add activerecord middleware' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=activerecord') }
       assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/app/app.rb")
     end
 
-    should "generate model file" do
+    it 'should generate model file' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
-    should "generate model file with camelized name" do
+    it 'should generate model file with camelized name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
       assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
     end
 
-    should "generate migration file with no fields" do
+    it 'should generate migration file with no fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
@@ -146,7 +146,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/    drop_table :users/m, migration_file_path)
     end
 
-    should "generate migration file with given fields" do
+    it 'should generate migration file with given fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
@@ -161,8 +161,8 @@ describe "ModelGenerator" do
   end
 
   # MINIRECORD
-  context "model generator using minirecord" do
-    should "generate hooks for auto upgrade" do
+  describe "model generator using minirecord" do
+    it 'should generate hooks for auto upgrade' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=minirecord') }
       assert_match_in_file(
         "Padrino.after_load do\n  ActiveRecord::Base.auto_upgrade!",
@@ -170,12 +170,12 @@ describe "ModelGenerator" do
       )
     end
 
-    should "add activerecord middleware" do
+    it 'should add activerecord middleware' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=activerecord') }
       assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/app/app.rb")
     end
 
-    should "generate model file" do
+    it 'should generate model file' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=minirecord') }
       capture_io { generate(:model, 'user', 'name:string', 'surname:string', 'age:integer', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
@@ -184,7 +184,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/field :age, :as => :integer/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
-    should "generate model file with camelized name" do
+    it 'should generate model file with camelized name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=minirecord') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
@@ -193,15 +193,15 @@ describe "ModelGenerator" do
   end
 
   # COUCHREST
-  context "model generator using couchrest" do
-    should "generate model file with no properties" do
+  describe "model generator using couchrest" do
+    it 'should generate model file with no properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/models/user.rb")
       assert_match_in_file(/# property <name>[\s\n]+?end/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
-    should "generate model file with given fields" do
+    it 'should generate model file with given fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       capture_io { generate(:model, 'person', "name:string", "age", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/models/person.rb")
@@ -212,15 +212,15 @@ describe "ModelGenerator" do
   end
 
   # DATAMAPPER
-  context "model generator using datamapper" do
-    should "generate model file with camelized name" do
+  describe "model generator using datamapper" do
+    it 'should generate model file with camelized name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class ChunkyBacon\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
       assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
     end
 
-    should "generate model file with fields" do
+    it 'should generate model file with fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/user.rb")
@@ -229,7 +229,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/property :created_at, DateTime/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
-    should "properly generate version numbers" do
+    it 'should properly generate version numbers' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'person', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
@@ -242,7 +242,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/migration 3, :create_accounts do/m, "#{@apptmp}/sample_project/db/migrate/003_create_accounts.rb")
     end
 
-    should "generate migration with given fields" do
+    it 'should generate migration with given fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       capture_io { generate(:model, 'person', "name:string", "created_at:date_time", "email:string", "-r=#{@apptmp}/sample_project") }
@@ -258,21 +258,21 @@ describe "ModelGenerator" do
   end
 
   # SEQUEL
-  context "model generator using sequel" do
-    should "generate model file with given properties" do
+  describe "model generator using sequel" do
+    it 'should generate model file with given properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < Sequel::Model/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
-    should "generate model file with camelized name" do
+    it 'should generate model file with camelized name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class ChunkyBacon < Sequel::Model/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
       assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
     end
 
-    should "generate migration file with given properties" do
+    it 'should generate migration file with given properties' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') }
       capture_io { generate(:model, 'person', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
@@ -288,8 +288,8 @@ describe "ModelGenerator" do
   end
 
   # MONGODB
-  context "model generator using mongomapper" do
-    should "generate model file with no properties" do
+  describe "model generator using mongomapper" do
+    it 'should generate model file with no properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomapper') }
       capture_io { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person\n\s+include MongoMapper::Document/m, "#{@apptmp}/sample_project/models/person.rb")
@@ -297,7 +297,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/timestamps![\n\s]+end/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
-    should "generate model file with given fields" do
+    it 'should generate model file with given fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomapper') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User\n\s+include MongoMapper::Document/m, "#{@apptmp}/sample_project/models/user.rb")
@@ -308,15 +308,15 @@ describe "ModelGenerator" do
     end
   end
 
-  context "model generator using mongoid" do
-    should "generate model file with no properties" do
+  describe "model generator using mongoid" do
+    it 'should generate model file with no properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongoid') }
       capture_io { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person\n\s+include Mongoid::Document/m, "#{@apptmp}/sample_project/models/person.rb")
       assert_match_in_file(/# field <name>, :type => <type>, :default => <value>/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
-    should "generate model file with given fields" do
+    it 'should generate model file with given fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongoid') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User\n\s+include Mongoid::Document/m, "#{@apptmp}/sample_project/models/user.rb")
@@ -327,8 +327,8 @@ describe "ModelGenerator" do
   end
 
   # REDIS
-  context "model generator using ohm" do
-    should "generate model file with no properties" do
+  describe "model generator using ohm" do
+    it 'should generate model file with no properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ohm') }
       capture_io { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person < Ohm::Model/, "#{@apptmp}/sample_project/models/person.rb")
@@ -336,7 +336,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/# reference :venue, Venue/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
-    should "generate model file with given fields" do
+    it 'should generate model file with given fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ohm') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < Ohm::Model/, "#{@apptmp}/sample_project/models/user.rb")
@@ -347,15 +347,15 @@ describe "ModelGenerator" do
   end
 
   # MONGOMATIC
-  context "model generator using mongomatic" do
-    should "generate model file with no properties" do
+  describe "model generator using mongomatic" do
+    it 'should generate model file with no properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomatic') }
       capture_io { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person < Mongomatic::Base/, "#{@apptmp}/sample_project/models/person.rb")
       assert_match_in_file(/include Mongomatic::Expectations::Helper/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
-    should "generate model file with given fields" do
+    it 'should generate model file with given fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomatic') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < Mongomatic::Base/, "#{@apptmp}/sample_project/models/user.rb")
@@ -368,8 +368,8 @@ describe "ModelGenerator" do
   end
 
   # RIPPLE
-  context "model generator using ripple" do
-    should "generate model file with no properties" do
+  describe "model generator using ripple" do
+    it 'should generate model file with no properties' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ripple') }
       capture_io { generate(:model, 'person', "name:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person\n\s+include Ripple::Document/m, "#{@apptmp}/sample_project/models/person.rb")
@@ -378,7 +378,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/# one :account/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
-    should "generate model file with given fields" do
+    it 'should generate model file with given fields' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ripple') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User\n\s+include Ripple::Document/m, "#{@apptmp}/sample_project/models/user.rb")
@@ -388,9 +388,27 @@ describe "ModelGenerator" do
     end
   end
 
-  context "model generator testing files" do
+  # DYNAMOID
+  describe "model generator using dynamoid" do
+    it 'should generate model file with no properties' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=dynamoid') }
+      capture_io { generate(:model, 'person', "name:string", "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class Person\n\s+include Dynamoid::Document/m, "#{@apptmp}/sample_project/models/person.rb")
+    end
+
+    it 'should generate model file with given fields' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=dynamoid') }
+      capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class User\n\s+include Dynamoid::Document/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :name, :string/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :age, :integer/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :email, :string/m, "#{@apptmp}/sample_project/models/user.rb")
+    end
+  end
+
+  describe "model generator testing files" do
     # BACON
-    should "generate test file for bacon" do
+    it 'should generate test file for bacon' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
@@ -400,7 +418,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
     end
 
-    should "generate test file for bacon in specified app" do
+    it 'should generate test file for bacon in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -411,7 +429,7 @@ describe "ModelGenerator" do
     end
 
     # RIOT
-    should "generate test file for riot" do
+    it 'should generate test file for riot' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
@@ -421,7 +439,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
     end
 
-    should "generate test file for riot in specified app" do
+    it 'should generate test file for riot in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -432,7 +450,7 @@ describe "ModelGenerator" do
     end
 
     # MINITEST
-    should "generate test file for minitest" do
+    it 'should generate test file for minitest' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
@@ -440,7 +458,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/refute_nil @some_user/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
     end
 
-    should "generate test file for minitest in specified app" do
+    it 'should generate test file for minitest in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -449,7 +467,7 @@ describe "ModelGenerator" do
     end
 
     # RSPEC
-    should "generate test file for rspec" do
+    it 'should generate test file for rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
@@ -458,7 +476,7 @@ describe "ModelGenerator" do
       # assert_match_in_file(/some_user\.should_not be_nil/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
     end
 
-    should "generate test file for rspec in specified app" do
+    it 'should generate test file for rspec in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -468,7 +486,7 @@ describe "ModelGenerator" do
     end
 
     # SHOULDA
-    should "generate test file for shoulda" do
+    it 'should generate test file for shoulda' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomePerson', "-r=#{@apptmp}/sample_project") }
@@ -479,7 +497,7 @@ describe "ModelGenerator" do
       assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
     end
 
-    should "generate test file for shoulda in specified app" do
+    it 'should generate test file for shoulda in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomePerson', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -491,39 +509,42 @@ describe "ModelGenerator" do
     end
   end
 
-  context "the model destroy option" do
+  describe "the model destroy option" do
+    module ActiveRecord
+      Base = Class.new
+    end
 
-    should "destroy the model file" do
+    it 'should destroy the model file' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'User', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
+      capture_io { generate_with_parts(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/models/user.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/test/models/user_test.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_users.rb")
     end
 
-    should "destroy the model test file with rspec" do
+    it 'should destroy the model test file with rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       capture_io { generate(:model, 'User', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
+      capture_io { generate_with_parts(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/spec/models/user_spec.rb")
     end
 
-    should "destroy the model test file in a sub app" do
+    it 'should destroy the model test file in a sub app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'User', "-a=/subby","-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'User', "-a=/subby","-r=#{@apptmp}/sample_project", '-d') }
+      capture_io { generate_with_parts(:model, 'User', "-a=/subby","-r=#{@apptmp}/sample_project", '-d', :apps => "subby") }
       assert_no_file_exists("#{@apptmp}/sample_project/subby/models/user.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/test/subby/models/user_test.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_users.rb")
     end
 
-    should "destroy the right model migration" do
+    it 'should destroy the right model migration' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       capture_io { generate(:model, 'bar_foo', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'foo', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'foo', "-r=#{@apptmp}/sample_project", '-d') }
+      capture_io { generate_with_parts(:model, 'foo', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_create_foos.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_bar_foos.rb")
     end