#1503 with changelog.

Changelog.md

@@ -1,6 +1,11 @@
-### 3.4.1 Development
+### 3.5.0 Development
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.4.0...master)
 
+Enhancements:
+
+* Add a `---singularize` option for the feature spec generator (Felicity McCabe,
+  #1503)
+
 Bug fixes:
 
 * Make it possible to write nested specs within helper specs on classes that are

lib/generators/rspec/feature/feature_generator.rb

@@ -4,12 +4,25 @@ module Rspec
   module Generators
     # @private
     class FeatureGenerator < Base
-      class_option :feature_specs, :type => :boolean, :default => true, :desc => "Generate feature specs"
+      class_option :feature_specs, :type => :boolean, :default => true,  :desc => "Generate feature specs"
+      class_option :singularize,   :type => :boolean, :default => false, :desc => "Singularize the generated feature"
 
       def generate_feature_spec
         return unless options[:feature_specs]
 
-        template 'feature_spec.rb', File.join('spec/features', class_path, "#{table_name}_spec.rb") # file_name?
+        template template_name, File.join('spec/features', class_path, filename)
+      end
+
+      def template_name
+        options[:singularize] ? 'feature_singular_spec.rb' : 'feature_spec.rb'
+      end
+
+      def filename
+        if options[:singularize]
+          "#{table_name.singularize}_spec.rb"
+        else
+          "#{table_name}_spec.rb"
+        end
       end
     end
   end

lib/generators/rspec/feature/templates/feature_singular_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.feature "<%= class_name.singularize %>", <%= type_metatag(:feature) %> do
+  pending "add some scenarios (or delete) #{__FILE__}"
+end

spec/generators/rspec/feature/feature_generator_spec.rb

@@ -24,6 +24,21 @@
       end
     end
 
+    describe 'are singularized appropriately with the --singularize flag' do
+      before do
+        run_generator %w(posts --singularize)
+      end
+      describe 'the spec' do
+        subject(:feature_spec) { file('spec/features/post_spec.rb') }
+        it "exists with the appropriate filename" do
+          expect(feature_spec).to exist
+        end
+        it "contains the singularized feature" do
+          expect(feature_spec).to contain(/^RSpec.feature \"Post\", #{type_metatag(:feature)}/)
+        end
+      end
+    end
+
     describe "are not generated" do
       before do
         run_generator %w(posts --no-feature-specs)