merb-gen 0.9.13 → 1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/lib/generators/controller.rb +4 -4
  2. data/lib/generators/templates/application/common/merb.thor +1107 -1072
  3. data/lib/generators/templates/application/merb_stack/autotest/discover.rb +2 -1
  4. data/lib/generators/templates/application/merb_stack/autotest/merb.rb +5 -2
  5. data/lib/generators/templates/application/merb_stack/autotest/merb_rspec.rb +2 -2
  6. data/lib/generators/templates/component/controller/spec/requests/%file_name%_spec.rb +7 -0
  7. data/lib/generators/templates/component/controller/test/{controllers → requests}/%file_name%_test.rb +1 -2
  8. data/lib/generators/templates/component/resource_controller/app/views/%file_name%/edit.html.erb +1 -1
  9. data/lib/generators/templates/component/resource_controller/app/views/%file_name%/index.html.erb +1 -1
  10. data/lib/generators/templates/component/resource_controller/app/views/%file_name%/new.html.erb +1 -1
  11. data/lib/generators/templates/component/resource_controller/app/views/%file_name%/show.html.erb +1 -1
  12. data/lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb +1 -1
  13. data/spec/controller_spec.rb +2 -2
  14. metadata +7 -7
  15. data/lib/generators/templates/component/controller/spec/controllers/%file_name%_spec.rb +0 -7
data/lib/generators/controller.rb CHANGED
@@ -28,13 +28,13 @@ module Merb::Generators
28
28
  end
29
29
 
30
30
  template :controller_spec, :testing_framework => :rspec do |template|
31
- template.source = 'spec/controllers/%file_name%_spec.rb'
32
- template.destination = "spec/controllers" / base_path / "#{file_name}_spec.rb"
31
+ template.source = 'spec/requests/%file_name%_spec.rb'
32
+ template.destination = "spec/requests" / base_path / "#{file_name}_spec.rb"
33
33
  end
34
34
 
35
35
  template :controller_test_unit, :testing_framework => :test_unit do |template|
36
- template.source = 'test/controllers/%file_name%_test.rb'
37
- template.destination = "test/controllers" / base_path / "#{file_name}_test.rb"
36
+ template.source = 'test/requests/%file_name%_test.rb'
37
+ template.destination = "test/requests" / base_path / "#{file_name}_test.rb"
38
38
  end
39
39
 
40
40
  def after_generation