Set request specs as the default for scaffolding

Running rake spec::controllers is removed
from smoke tests because they are not generated
anymore by default

Author: klyonrad

example_app_generator/generate_stuff.rb

@@ -137,8 +137,8 @@ def using_source_path(path)
           'config.warnings = false'
 gsub_file '.rspec', '--warnings', ''
 
-# Remove skips so we can test controller specs work
-gsub_file 'spec/controllers/gadgets_controller_spec.rb',
+# Remove skips so we can test that request specs work
+gsub_file 'spec/requests/gadgets_request_spec.rb',
           'skip("Add a hash of attributes valid for your model")',
           '{}'
 

example_app_generator/run_specs.rb

@@ -7,7 +7,6 @@
 run('bin/rake --backtrace spec:requests') || abort
 run('bin/rake --backtrace spec:models') || abort
 run('bin/rake --backtrace spec:views') || abort
-run('bin/rake --backtrace spec:controllers') || abort
 run('bin/rake --backtrace spec:helpers') || abort
 run('bin/rake --backtrace spec:mailers') || abort
 run("bin/rake --backtrace stats") || abort

lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -16,8 +16,8 @@ class ScaffoldGenerator < Base
       class_option :singleton, type: :boolean, desc: "Supply to create a singleton controller"
       class_option :api, type: :boolean, desc: "Skip specs unnecessary for API-only apps"
 
-      class_option :request_specs,    type: :boolean, default: false, desc: "Generate request specs"
-      class_option :controller_specs, type: :boolean, default: true,  desc: "Generate controller specs"
+      class_option :request_specs,    type: :boolean, default: true,  desc: 'Generate request specs'
+      class_option :controller_specs, type: :boolean, default: false, desc: 'Generate controller specs'
       class_option :view_specs,       type: :boolean, default: true,  desc: "Generate view specs"
       class_option :helper_specs,     type: :boolean, default: true,  desc: "Generate helper specs"
       class_option :routing_specs,    type: :boolean, default: true,  desc: "Generate routing specs"

spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -8,7 +8,7 @@
   describe 'standard request specs' do
     subject { file('spec/requests/posts_request_spec.rb') }
 
-    describe 'with --request_specs' do
+    describe 'with no options' do
       before { run_generator %w[posts --request_specs] }
       it { is_expected.to exist }
       it { is_expected.to contain("require 'rails_helper'") }
@@ -19,17 +19,17 @@
       it { is_expected.to contain(/"redirects to the \w+ list"/) }
     end
 
-    describe 'with no options' do
-      before { run_generator %w[posts] }
+    describe 'with --no-request_specs' do
+      before { run_generator %w[posts --no-request_specs] }
       it { is_expected.not_to exist }
     end
   end
 
   describe 'standard controller spec' do
     subject { file('spec/controllers/posts_controller_spec.rb') }
 
-    describe 'with no options' do
-      before { run_generator %w[posts] }
+    describe 'with --controller_specs' do
+      before { run_generator %w[posts --controller_specs] }
       it { is_expected.to contain(/require 'rails_helper'/) }
       it { is_expected.to contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/) }
       it { is_expected.to contain(/GET #new/) }
@@ -47,13 +47,13 @@
       it { is_expected.to contain(/"redirects to the \w+ list"/) }
     end
 
-    describe 'with --no-controller_specs' do
-      before { run_generator %w[posts --no-controller_specs] }
+    describe 'with no option' do
+      before { run_generator %w[posts] }
       it { is_expected.not_to exist }
     end
 
     describe 'with --api' do
-      before { run_generator %w[posts --api] }
+      before { run_generator %w[posts --controller_specs --api] }
       it { is_expected.to contain(/require 'rails_helper'/) }
       it { is_expected.to contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/) }
       it { is_expected.not_to contain(/GET #new/) }
@@ -81,7 +81,7 @@
 
   describe 'namespaced controller spec' do
     subject { file('spec/controllers/admin/posts_controller_spec.rb') }
-    before  { run_generator %w[admin/posts] }
+    before  { run_generator %w[admin/posts --controller_specs] }
     it { is_expected.to contain(/^RSpec.describe Admin::PostsController, #{type_metatag(:controller)}/) }
   end