padrino-gen 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7628694455061d5f6906099df64d2570594b629
-  data.tar.gz: 30c14c0393ea4289e1aa41d06d579646e1f864b7
+  metadata.gz: effdab76dcbf3f1dec71da8a9272954f2ab5bd3f
+  data.tar.gz: 1aaab8565a82db9b0ccb97da317318b54c12415e
 SHA512:
-  metadata.gz: c230053d26d0c623f1f03b5ef036f7f0b0315f14bdc3b3abeb8d8cfc327584407d27b3d04fa590c5fdaf4110d2a71d309ddf9ca7697c91dbe600a4a7c3991bc2
-  data.tar.gz: 226607ee34f61de01dd944de3dd97245c70c2b9b033e978e663c4983edfa05e95cd936667dfa20791324198ad6025c801448a0c664943741832f69c232d5f9d0
+  metadata.gz: ab6563038789f50343e38c33e648404239470ef2ebbec10b70ea6225ee24b2cd6f9a7794bdf51a705a16ee8cf8f74f5499e74746219ad14f33251b47f89c189f
+  data.tar.gz: ca0642e0a51ab6f870be8e36bf271d2bae826f8885cad03ec2d88f4190a1869954c0b42e9b6004daad239a1eefa5c9b52e02e15a831196d9e3b1ec6326cbe658

data/lib/padrino-gen/generators/actions.rb

@@ -495,6 +495,13 @@ WARNING
         end
       end
 
+      ##
+      # Recognizes the path of application.
+      #
+      def recognize_path
+        options[:app] == '.' ? '/..' : '/../..'
+      end
+
       # Class methods for Thor generators to support the generators and component choices.
       module ClassMethods
         ##

data/lib/padrino-gen/generators/components/tests/bacon.rb

@@ -59,6 +59,21 @@ describe "!NAME! Model" do
 end
 TEST
 
+BACON_HELPER_TEST = <<-TEST unless defined?(BACON_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+describe "!NAME!" do
+  before do
+    @helpers = Class.new
+    @helpers.extend !NAME!
+  end
+
+  it "should return nil" do
+    @helpers.foo.should.equal nil
+  end
+end
+TEST
+
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'bacon', :group => 'test'
@@ -74,8 +89,14 @@ end
 
 def generate_model_test(name)
   bacon_contents  = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  path = options[:app] == '.' ? '/..' : '/../..'
-  bacon_contents.gsub!(/!PATH!/,path)
+  bacon_contents.gsub!(/!PATH!/, recognize_path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), bacon_contents, :skip => true
 end
+
+def generate_helper_test(name, project_name, app_name)
+  bacon_contents = BACON_HELPER_TEST.gsub(/!NAME!/, "#{project_name}::#{app_name}::#{name}")
+  bacon_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), bacon_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/minitest.rb

@@ -2,7 +2,7 @@ MINITEST_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(MINITEST_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path('../../config/boot', __FILE__)
 
-class MiniTest::Unit::TestCase
+class MiniTest::Spec
   include Rack::Test::Methods
 
   # You can use this method to custom specify a Rack app
@@ -62,6 +62,25 @@ describe "!NAME! Model" do
 end
 TEST
 
+MINITEST_HELPER_TEST = (<<-TEST) unless defined?(MINITEST_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+describe "!NAME!" do
+  before do
+    @helpers = Class.new
+    @helpers.extend !NAME!
+  end
+
+  def helpers
+    @helpers
+  end
+
+  it "should return nil" do
+    assert_equal nil, helpers.foo
+  end
+end
+TEST
+
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'minitest', :require => 'minitest/autorun', :group => 'test'
@@ -77,8 +96,14 @@ end
 
 def generate_model_test(name)
   minitest_contents = MINITEST_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  path = options[:app] == '.' ? '/..' : '/../..'
-  minitest_contents.gsub!(/!PATH!/,path)
+  minitest_contents.gsub!(/!PATH!/, recognize_path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), minitest_contents, :skip => true
 end
+
+def generate_helper_test(name, project_name, app_name)
+  minitest_contents = MINITEST_HELPER_TEST.gsub(/!NAME!/, "#{project_name}::#{app_name}::#{name}")
+  minitest_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), minitest_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/riot.rb

@@ -74,6 +74,20 @@ context "!NAME! Model" do
 end
 TEST
 
+RIOT_HELPER_TEST = (<<-TEST) unless defined?(RIOT_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+describe "!NAME!" do
+  setup do
+    helpers = Class.new
+    helpers.extend !NAME!
+    [helpers.foo]
+  end
+
+  asserts("#foo"){ topic.first }.nil
+end
+TEST
+
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'riot', :group => 'test'
@@ -89,8 +103,14 @@ end
 
 def generate_model_test(name)
   riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
-  path = options[:app] == '.' ? '/..' : '/../..'
-  riot_contents.gsub!(/!PATH!/,path)
+  riot_contents.gsub!(/!PATH!/, recognize_path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), riot_contents, :skip => true
 end
+
+def generate_helper_test(name, project_name, app_name)
+  riot_contents = RIOT_HELPER_TEST.gsub(/!NAME!/, "#{project_name}::#{app_name}::#{name}")
+  riot_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), riot_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/rspec.rb

@@ -65,6 +65,20 @@ describe !NAME! do
 end
 TEST
 
+RSPEC_HELPER_TEST = (<<-TEST) unless defined?(RSPEC_HELPER_TEST)
+require 'spec_helper'
+
+describe "!NAME!" do
+  let(:helpers){ Class.new }
+  before { helpers.extend !NAME! }
+  subject { helpers }
+
+  it "should return nil" do
+    expect(subject.foo).to be_nil
+  end
+end
+TEST
+
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'rspec', :group => 'test'
@@ -83,3 +97,9 @@ def generate_model_test(name)
   model_spec_path = File.join('spec',options[:app],'models',"#{name.to_s.underscore}_spec.rb")
   create_file destination_root(model_spec_path), rspec_contents, :skip => true
 end
+
+def generate_helper_test(name, project_name, app_name)
+  rspec_contents = RSPEC_HELPER_TEST.gsub(/!NAME!/, "#{project_name}::#{app_name}::#{name}")
+  helper_spec_path = File.join('spec', options[:app], 'helpers', "#{name.underscore}_spec.rb")
+  create_file destination_root(helper_spec_path), rspec_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/shoulda.rb

@@ -68,6 +68,27 @@ class !NAME!Test < Test::Unit::TestCase
 end
 TEST
 
+SHOULDA_HELPER_TEST = (<<-TEST) unless defined?(SHOULDA_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  context "!NAME!" do
+    setup do
+      @helpers = Class.new
+      @helpers.extend !NAME!
+    end
+
+    def helpers
+      @helpers
+    end
+
+    should "return nil" do
+      assert_equal nil, helpers.foo
+    end
+  end
+end
+TEST
+
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'shoulda', :group => 'test'
@@ -83,8 +104,14 @@ end
 
 def generate_model_test(name)
   shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  path = options[:app] == '.' ? '/..' : '/../..'
-  shoulda_contents.gsub!(/!PATH!/,path)
+  shoulda_contents.gsub!(/!PATH!/, recognize_path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), shoulda_contents, :skip => true
 end
+
+def generate_helper_test(name, project_name, app_name)
+  shoulda_contents = SHOULDA_HELPER_TEST.gsub(/!NAME!/, "#{project_name}::#{app_name}::#{name}")
+  shoulda_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), shoulda_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/steak.rb

@@ -1,5 +1,5 @@
 STEAK_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_SETUP)
-PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
 RSpec.configure do |conf|
@@ -68,6 +68,20 @@ describe !NAME! do
 end
 TEST
 
+STEAK_HELPER_TEST = <<-TEST unless defined?(STEAK_HELPER_TEST)
+require 'spec_helper'
+
+describe "!NAME!" do
+  let(:helpers){ Class.new }
+  before { helpers.extend !NAME! }
+  subject { helpers }
+
+  it "should return nil" do
+    expect(subject.foo).to be_nil
+  end
+end
+TEST
+
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'steak', :group => 'test'
@@ -91,3 +105,9 @@ def generate_model_test(name)
   model_spec_path = File.join('spec',options[:app],'models',"#{name.to_s.underscore}_spec.rb")
   create_file destination_root(model_spec_path), rspec_contents, :skip => true
 end
+
+def generate_helper_test(name, project_name, app_name)
+  rspec_contents = STEAK_HELPER_TEST.gsub(/!NAME!/, "#{project_name}::#{app_name}::#{name}")
+  helper_spec_path = File.join('spec', options[:app], 'helpers', "#{name.underscore}_spec.rb")
+  create_file destination_root(helper_spec_path), rspec_contents, :skip => true
+end

data/lib/padrino-gen/generators/controller.rb

@@ -42,6 +42,7 @@ module Padrino
           @app_name     = fetch_app_name(app)
           @actions      = controller_actions(fields)
           @controller   = name.to_s.underscore
+          @helper_name  = "#{@controller.camelize}Helper"
           @layout       = options[:layout] if options[:layout] && !options[:layout].empty?
 
           block_opts = []
@@ -54,7 +55,10 @@ module Padrino
           template 'templates/helper.rb.tt',     destination_root(app, 'helpers', "#{name.to_s.underscore}_helper.rb")
           empty_directory destination_root(app, "/views/#{name.to_s.underscore}")
           include_component_module_for(:test)
-          generate_controller_test(name) if test?
+          if test?
+            generate_controller_test(name)
+            generate_helper_test(@helper_name, @project_name, @app_name)
+          end
         else
           say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end

data/lib/padrino-gen/generators/templates/helper.rb.tt

@@ -1,7 +1,13 @@
 # Helper methods defined here can be accessed in any controller or view in the application
 
-<%= @project_name %>::<%= @app_name %>.helpers do
-  # def simple_helper_method
-  #  ...
-  # end
+module <%= @project_name %>
+  class <%= @app_name %>
+    module <%= @helper_name %>
+      # def simple_helper_method
+      # ...
+      # end
+    end
+
+    helpers <%= @helper_name %>
+  end
 end

data/lib/padrino-gen/padrino-tasks/sql-helpers.rb

@@ -26,6 +26,9 @@ module Padrino
             arguments << "CREATE DATABASE #{database} DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
 
             Process.wait Process.spawn(environment, 'mysql', *arguments)
+          when 'sqlite'
+            fail "Database #{database} already exists" if File.file?(database)
+            File.open(database, 'a') {}
           else
             raise "Adapter #{adapter} not supported for creating databases yet."
         end
@@ -55,6 +58,8 @@ module Padrino
             arguments << "DROP DATABASE IF EXISTS #{database}"
 
             Process.wait Process.spawn(environment, 'mysql', *arguments)
+          when 'sqlite'
+            File.delete(database) if File.file?(database)
           else
             raise "Adapter #{adapter} not supported for dropping databases yet."
         end

data/test/test_app_generator.rb

@@ -72,7 +72,7 @@ describe "AppGenerator" do
       capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
       capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-a=demo') }
       assert_match_in_file(/SampleProject::Demo.controllers :demo_items do/m, "#{@apptmp}/sample_project/demo/controllers/demo_items.rb")
-      assert_match_in_file(/SampleProject::Demo.helpers do/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb")
+      assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/views/demo_items")
     end
 

data/test/test_controller_generator.rb

@@ -6,6 +6,8 @@ describe "ControllerGenerator" do
     `mkdir -p #{@apptmp}`
     @controller_path = "#{@apptmp}/sample_project/app/controllers/demo_items.rb"
     @controller_test_path = "#{@apptmp}/sample_project/test/app/controllers/demo_items_controller_test.rb"
+    @helper_path = "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb"
+    @helper_test_path = "#{@apptmp}/sample_project/test/app/helpers/demo_items_helper_test.rb"
   end
 
   def teardown
@@ -23,16 +25,27 @@ describe "ControllerGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
-      assert_match_in_file(/SampleProject::App.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
+      assert_match_in_file(/helpers DemoItemsHelper/, @helper_path)
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_file_exists(@controller_test_path)
     end
 
+    it 'should generate helper within existing project' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/module SampleProject/, @helper_path)
+      assert_match_in_file(/class App/, @helper_path)
+      assert_match_in_file(/module DemoItemsHelper/, @helper_path)
+      assert_match_in_file(/helpers DemoItemsHelper/, @helper_path)
+      assert_file_exists(@helper_path)
+      assert_file_exists(@helper_test_path)
+    end
+
     it 'should generate controller within existing project with weird name' do
       capture_io { generate(:project, 'warepedia', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") }
       assert_match_in_file(/Warepedia::App.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb")
-      assert_match_in_file(/Warepedia::App.helpers do/m, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb")
+      assert_match_in_file(/helpers DemoItemsHelper/, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/warepedia/app/views/demo_items")
     end
 
@@ -41,7 +54,7 @@ describe "ControllerGenerator" do
       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'))
-      assert_match_in_file(/SampleProject::Subby.helpers do/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
+      assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/subby/views/demo_items")
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
@@ -86,7 +99,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
-      assert_match_in_file(/SampleProject::App.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
+      assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_no_file_exists("#{@apptmp}/sample_project/test")
     end
@@ -97,6 +110,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_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 riot' do
@@ -105,6 +119,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_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
@@ -113,6 +128,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app', 'subby'))
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_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
@@ -120,6 +136,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_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
@@ -129,7 +146,9 @@ describe "ControllerGenerator" do
       expected_pattern = /class DemoItemsControllerTest < 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_file_exists("#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
+      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 steak' do
@@ -138,6 +157,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
       assert_match_in_file(/feature "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/acceptance/controllers/demo_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 cucumber' do
@@ -155,6 +175,7 @@ describe "ControllerGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/app/controllers/demo_items.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/demo_items_helper_spec.rb")
     end
 
     # Controller action generation
@@ -185,6 +206,15 @@ describe "ControllerGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
     end
 
+    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') }
+      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")
+    end
+
     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") }

data/test/test_project_generator.rb

@@ -576,7 +576,7 @@ describe "ProjectGenerator" do
       assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'steak'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_match_in_file(/RSpec.configure/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake")
       assert_match_in_file(/RSpec::Core::RakeTask\.new\("spec:\#/,"#{@apptmp}/sample_project/spec/spec.rake")
@@ -592,7 +592,7 @@ describe "ProjectGenerator" do
       assert_match_in_file(/gem 'minitest'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/include Rack::Test::Methods/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
-      assert_match_in_file(/MiniTest::Unit::TestCase/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/MiniTest::Spec/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_match_in_file(/SampleProject::App\.tap/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
       assert_match_in_file(/Rake::TestTask\.new\("test:\#/,"#{@apptmp}/sample_project/test/test.rake")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com