padrino-gen 0.16.0.pre4 → 0.16.0

data/test/test_controller_generator.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "ControllerGenerator" do
+describe 'ControllerGenerator' do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
@@ -17,14 +17,14 @@ describe "ControllerGenerator" do
 
   describe 'the controller generator' do
     it 'should fail outside app root' do
-      out, err = capture_io { generate(:controller, 'demo', "-r=#{@apptmp}") }
+      out, = capture_io { generate(:controller, 'demo', "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/app/controllers/demo.rb")
     end
 
     it 'should fail with NameError if given invalid namespace names' do
-      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
-      assert_raises(::NameError) { capture_io { generate(:controller, "wrong/name", "--root=#{@apptmp}/sample") } }
+      capture_io { generate(:project, 'sample', "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:controller, 'wrong/name', "--root=#{@apptmp}/sample") } }
     end
 
     it 'should generate controller within existing project' do
@@ -58,12 +58,12 @@ describe "ControllerGenerator" do
     it 'should generate controller 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(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/SampleProject::Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby'))
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/SampleProject::Subby.controllers :demo_items do/m, @controller_path.gsub('app', 'subby'))
       assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
       assert_dir_exists("#{@apptmp}/sample_project/subby/views/demo_items")
-      assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby'))
+      assert_match_in_file(%r{describe "/demo_items" do}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{get "/demo_items"}m, @controller_test_path.gsub('app', 'subby'))
     end
 
     it 'should generate controller with specified layout' do
@@ -81,9 +81,9 @@ describe "ControllerGenerator" do
     it 'should generate controller with specified parent' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-p=user') }
-      assert_match_in_file(/SampleProject::App.controllers :demo_items, :parent => :user do/m, @controller_path)
-      assert_match_in_file(/describe "\/user\/:user_id\/demo_items" do/, @controller_test_path)
-      assert_match_in_file(/get "\/user\/1\/demo_items"/, @controller_test_path)
+      assert_match_in_file(/SampleProject::App.controllers :demo_items, parent: :user do/m, @controller_path)
+      assert_match_in_file(%r{describe "/user/:user_id/demo_items" do}, @controller_test_path)
+      assert_match_in_file(%r{get "/user/1/demo_items"}, @controller_test_path)
     end
 
     it 'should generate controller without specified parent' do
@@ -95,7 +95,7 @@ describe "ControllerGenerator" do
     it 'should generate controller with specified providers' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-f=:html, :js') }
-      assert_match_in_file(/SampleProject::App.controllers :demo_items, :provides => \[:html, :js\] do/m, @controller_path)
+      assert_match_in_file(/SampleProject::App.controllers :demo_items, provides: \[:html, :js\] do/m, @controller_path)
     end
 
     it 'should generate controller without specified providers' do
@@ -116,76 +116,75 @@ describe "ControllerGenerator" do
     it 'should generate controller test for bacon' 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(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") }
-      assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/describe "\/user\/:user_id\/user_items"/, @controller_with_parent_test_path.gsub('app','subby'))
-      assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/get "\/user\/1\/user_items"/m, @controller_with_parent_test_path.gsub('app','subby'))
-      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby'))
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'UserItems', '-a=/subby', "-r=#{@apptmp}/sample_project", '-p=user') }
+      assert_match_in_file(%r{(/\.\.){2}}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{describe "/demo_items" do}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{describe "/user/:user_id/user_items"}, @controller_with_parent_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{get "/demo_items"}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{get "/user/1/user_items"}m, @controller_with_parent_test_path.gsub('app', 'subby'))
+      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app', 'subby'))
     end
 
     it 'should generate controller test for minitest' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") }
-      assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app', 'subby'))
-      assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app', 'subby'))
-      assert_match_in_file(/describe "\/user\/:user_id\/user_items"/, @controller_with_parent_test_path.gsub('app','subby'))
-      assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/get "\/user\/1\/user_items"/m, @controller_with_parent_test_path.gsub('app','subby'))
-      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby'))
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'UserItems', '-a=/subby', "-r=#{@apptmp}/sample_project", '-p=user') }
+      assert_match_in_file(%r{(/\.\.){2}}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{describe "/demo_items" do}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{describe "/user/:user_id/user_items"}, @controller_with_parent_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{get "/demo_items"}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{get "/user/1/user_items"}m, @controller_with_parent_test_path.gsub('app', 'subby'))
+      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app', 'subby'))
     end
 
     it 'should generate controller test for rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") }
-      assert_match_in_file(/describe "\/demo_items" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
-      assert_match_in_file(/describe "\/user\/:user_id\/user_items"/,"#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
-      assert_match_in_file(/get "\/demo_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
-      assert_match_in_file(/get "\/user\/1\/user_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'UserItems', '-a=/subby', "-r=#{@apptmp}/sample_project", '-p=user') }
+      assert_match_in_file(%r{describe "/demo_items" do}m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
+      assert_match_in_file(%r{describe "/user/:user_id/user_items"}, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
+      assert_match_in_file(%r{get "/demo_items"}m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
+      assert_match_in_file(%r{get "/user/1/user_items"}m, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
       assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb")
     end
 
     it 'should generate controller test for shoulda' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") }
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'UserItems', '-a=/subby', "-r=#{@apptmp}/sample_project", '-p=user') }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
       expected_pattern2 = /class UserItemsControllerTest < Test::Unit::TestCase/m
-      assert_match_in_file(expected_pattern, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(expected_pattern2, @controller_with_parent_test_path.gsub('app','subby'))
-      assert_match_in_file(/context "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby'))
-      assert_file_exists(@helper_test_path.gsub('app','subby'))
+      assert_match_in_file(expected_pattern, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(%r{(/\.\.){2}}m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(expected_pattern2, @controller_with_parent_test_path.gsub('app', 'subby'))
+      assert_match_in_file(/context "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app', 'subby'))
+      assert_file_exists(@helper_test_path.gsub('app', 'subby'))
       assert_file_exists("#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
     end
 
     it 'should generate controller test for cucumber' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") }
-      assert_match_in_file(/describe "\/demo_items" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
-      assert_match_in_file(/describe "\/user\/:user_id\/user_items"/, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
-      assert_match_in_file(/get "\/demo_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
-      assert_match_in_file(/get "\/user\/1\/user_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'UserItems', '-a=/subby', "-r=#{@apptmp}/sample_project", '-p=user') }
+      assert_match_in_file(%r{describe "/demo_items" do}m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
+      assert_match_in_file(%r{describe "/user/:user_id/user_items"}, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
+      assert_match_in_file(%r{get "/demo_items"}m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
+      assert_match_in_file(%r{get "/user/1/user_items"}m, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb")
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
-    it "should generate controller test for testunit" do
+    it 'should generate controller test for testunit' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testunit') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class DemoItemsControllerTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
     end
 
-
     it 'should correctly generate file names' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
@@ -199,7 +198,7 @@ describe "ControllerGenerator" do
     # Controller action generation
     it 'should generate actions for get:test post:yada' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
-      capture_io { generate(:controller, 'demo_items', "get:test", "post:yada","-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items', 'get:test', 'post:yada', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/get :test do\n\n  end\n/m, @controller_path)
       assert_match_in_file(/post :yada do\n\n  end\n/m, @controller_path)
     end
@@ -217,11 +216,11 @@ describe "ControllerGenerator" do
     end
   end
 
-  describe "the controller destroy option" do
+  describe 'the controller destroy option' do
     it 'should destroy controller files' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists(@controller_test_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
@@ -229,8 +228,8 @@ describe "ControllerGenerator" do
 
     it 'should destroy controller files with rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
@@ -238,8 +237,8 @@ describe "ControllerGenerator" do
 
     it 'should destroy helper files with rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/spec/app/helpers/demo_items_helper_spec.rb")
@@ -248,10 +247,10 @@ describe "ControllerGenerator" do
     it 'should destroy controller files in sub apps' 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(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project",'-d') }
-      assert_no_file_exists(@controller_path.gsub('app','subby'))
-      assert_no_file_exists(@controller_test_path.gsub('app','subby'))
+      capture_io { generate(:controller, 'demo_items', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items', '-a=/subby', "-r=#{@apptmp}/sample_project", '-d') }
+      assert_no_file_exists(@controller_path.gsub('app', 'subby'))
+      assert_no_file_exists(@controller_test_path.gsub('app', 'subby'))
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
     end
   end

data/test/test_generator.rb

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

data/test/test_helper_generator.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "HelperGenerator" do
+describe 'HelperGenerator' do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
@@ -14,14 +14,14 @@ describe "HelperGenerator" do
 
   describe 'the helper generator' do
     it 'should fail outside app root' do
-      out, err = capture_io { generate(:helper, 'demo', "-r=#{@apptmp}") }
+      out, = capture_io { generate(:helper, 'demo', "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/app/helpers/demo_helper.rb")
     end
 
     it 'should fail with NameError if given invalid namespace names' do
-      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
-      assert_raises(::NameError) { capture_io { generate(:helper, "wrong/name", "--root=#{@apptmp}/sample") } }
+      capture_io { generate(:project, 'sample', "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:helper, 'wrong/name', "--root=#{@apptmp}/sample") } }
     end
 
     it 'should generate helper within existing project' do
@@ -44,7 +44,7 @@ describe "HelperGenerator" do
     it 'should generate helper 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(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
     end
 
@@ -58,38 +58,37 @@ describe "HelperGenerator" do
     it 'should generate helper test for bacon' 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(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby'))
+      capture_io { generate(:helper, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app', 'subby'))
     end
 
     it 'should generate helper test for minitest' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby'))
+      capture_io { generate(:helper, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app', 'subby'))
     end
 
     it 'should generate helper test for rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb")
     end
 
     it 'should generate helper test for shoulda' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      expected_pattern = /class DemoItemsHelperTest < Test::Unit::TestCase/m
-      assert_match_in_file(/context "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby'))
-      assert_file_exists(@helper_test_path.gsub('app','subby'))
+      capture_io { generate(:helper, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/context "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app', 'subby'))
+      assert_file_exists(@helper_test_path.gsub('app', 'subby'))
       assert_file_exists("#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
     end
 
-    it "should generate helper test for testunit" do
+    it 'should generate helper test for testunit' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testunit', '--script=none') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'DemoItems', '-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class DemoItemsHelperTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
       assert_match_in_file(/@helpers\.extend SampleProject::Subby::DemoItemsHelper/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
     end
@@ -102,11 +101,11 @@ describe "HelperGenerator" do
     end
   end
 
-  describe "the helper destroy option" do
+  describe 'the helper destroy option' do
     it 'should destroy helper files' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:helper, 'demo_items', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'demo_items', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists(@helper_path)
       assert_no_file_exists(@helper_test_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
@@ -114,8 +113,8 @@ describe "HelperGenerator" do
 
     it 'should destroy helper files with rspec' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:helper, 'demo_items', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'demo_items', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists(@helper_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/spec/app/helpers/demo_items_helper_spec.rb")
@@ -124,8 +123,8 @@ describe "HelperGenerator" do
     it 'should destroy helper files in sub apps' 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(:helper, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:helper, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:helper, 'demo_items', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'demo_items', '-a=/subby', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
     end
   end

data/test/test_mailer_generator.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "MailerGenerator" do
+describe 'MailerGenerator' do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
@@ -12,14 +12,14 @@ describe "MailerGenerator" do
 
   describe 'the mailer generator' do
     it 'should fail outside app root' do
-      out, err = capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}") }
+      out, = 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
 
     it 'should fail with NameError if given invalid namespace names' do
-      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
-      assert_raises(::NameError) { capture_io { generate(:mailer, "wrong/name", "--root=#{@apptmp}/sample") } }
+      capture_io { generate(:project, 'sample', "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:mailer, 'wrong/name', "--root=#{@apptmp}/sample") } }
     end
 
     it 'should generate mailer in specified app' do
@@ -62,11 +62,11 @@ describe "MailerGenerator" do
     end
   end
 
-  describe "the mailer destroy option" 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') }
+      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project", '-d') }
       assert_no_dir_exists("#{@apptmp}/sample_project/app/views/demo")
       assert_no_file_exists("#{@apptmp}/sample_project/app/mailers/demo.rb")
     end