Merge pull request #1052 from rspec/no-monkey-patch-generators

Use non-monkey patch describe in generators.

lib/generators/rspec/controller/templates/controller_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>Controller, :type => :controller do
+RSpec.describe <%= class_name %>Controller, :type => :controller do
 
 <% for action in actions -%>
   describe "GET '<%= action %>'" do

lib/generators/rspec/controller/templates/view_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", :type => :view do
+RSpec.describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end

lib/generators/rspec/helper/templates/helper_spec.rb

@@ -11,7 +11,7 @@
 #   end
 # end
 <% module_namespacing do -%>
-describe <%= class_name %>Helper, :type => :helper do
+RSpec.describe <%= class_name %>Helper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

lib/generators/rspec/integration/templates/request_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "<%= class_name.pluralize %>", :type => :request do
+RSpec.describe "<%= class_name.pluralize %>", :type => :request do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
       get <%= index_helper %>_path

lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 <% module_namespacing do -%>
-describe <%= class_name %>, :type => :mailer do
+RSpec.describe <%= class_name %>, :type => :mailer do
 <% for action in actions -%>
   describe "<%= action %>" do
     let(:mail) { <%= class_name %>.<%= action %> }

lib/generators/rspec/model/templates/model_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>, :type => :model do
+RSpec.describe <%= class_name %>, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>Observer, :type => :observer do
+RSpec.describe <%= class_name %>Observer, :type => :observer do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -19,7 +19,7 @@
 # that an instance is receiving a specific message.
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller, :type => :controller do
+RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to

lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit", :type => :view do
+RSpec.describe "<%= ns_table_name %>/edit", :type => :view do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/index", :type => :view do
+RSpec.describe "<%= ns_table_name %>/index", :type => :view do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>

lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new", :type => :view do
+RSpec.describe "<%= ns_table_name %>/new", :type => :view do
   before(:each) do
     assign(:<%= ns_file_name %>, <%= class_name %>.new(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

lib/generators/rspec/scaffold/templates/routing_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller, :type => :routing do
+RSpec.describe <%= controller_class_name %>Controller, :type => :routing do
   describe "routing" do
 
 <% unless options[:singleton] -%>

lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/show", :type => :view do
+RSpec.describe "<%= ns_table_name %>/show", :type => :view do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

lib/generators/rspec/view/templates/view_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-describe "<%= file_path %>/<%= @action %>", :type => :view do
+RSpec.describe "<%= file_path %>/<%= @action %>", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end

spec/generators/rspec/controller/controller_generator_spec.rb

@@ -19,8 +19,7 @@
       describe 'the spec' do
         it { is_expected.to exist }
         it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/describe PostsController/) }
-        it { is_expected.to contain(/describe PostsController, :type => :controller/) }
+        it { is_expected.to contain(/^RSpec.describe PostsController, :type => :controller/) }
       end
     end
     describe 'skipped with a flag' do
@@ -73,13 +72,13 @@
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
           it { is_expected.to exist }
           it { is_expected.to contain(/require 'rails_helper'/) }
-          it { is_expected.to contain(/describe "posts\/index.html.erb", :type => :view/) }
+          it { is_expected.to contain(/^RSpec.describe "posts\/index.html.erb", :type => :view/) }
         end
         describe 'show.html.erb' do
           subject { file('spec/views/posts/show.html.erb_spec.rb') }
           it { is_expected.to exist }
           it { is_expected.to contain(/require 'rails_helper'/) }
-          it { is_expected.to contain(/describe "posts\/show.html.erb", :type => :view/) }
+          it { is_expected.to contain(/^RSpec.describe "posts\/show.html.erb", :type => :view/) }
         end
       end
       describe 'with haml' do
@@ -90,7 +89,7 @@
           subject { file('spec/views/posts/index.html.haml_spec.rb') }
           it { is_expected.to exist }
           it { is_expected.to contain(/require 'rails_helper'/) }
-          it { is_expected.to contain(/describe "posts\/index.html.haml", :type => :view/) }
+          it { is_expected.to contain(/^RSpec.describe "posts\/index.html.haml", :type => :view/) }
         end
       end
     end

spec/generators/rspec/helper/helper_generator_spec.rb

@@ -18,7 +18,7 @@
     describe 'the spec' do
       it { is_expected.to exist }
       it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/describe PostsHelper, :type => :helper/) }
+      it { is_expected.to contain(/^RSpec.describe PostsHelper, :type => :helper/) }
     end
   end
   describe 'skipped with a flag' do

spec/generators/rspec/integration/integration_generator_spec.rb

@@ -26,7 +26,7 @@
     subject { file('spec/requests/posts_spec.rb') }
     it { is_expected.to exist }
     it { is_expected.to contain(/require 'rails_helper'/) }
-    it { is_expected.to contain(/describe "Posts", :type => :request/) }
+    it { is_expected.to contain(/^RSpec.describe "Posts", :type => :request/) }
     it { is_expected.to contain(/describe "GET \/posts"/) }
     it { is_expected.to contain(/get posts_index_path/) }
   end

spec/generators/rspec/mailer/mailer_generator_spec.rb

@@ -17,6 +17,7 @@
       end
       it { is_expected.to exist }
       it { is_expected.to contain(/require "rails_helper"/) }
+      it { is_expected.to contain(/^RSpec.describe Posts, :type => :mailer/) }
       it { is_expected.to contain(/describe "index" do/) }
       it { is_expected.to contain(/describe "show" do/) }
     end

spec/generators/rspec/model/model_generator_spec.rb

@@ -27,7 +27,7 @@
 
         it { is_expected.to exist }
         it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/describe Posts, :type => :model/) }
+        it { is_expected.to contain(/^RSpec.describe Posts, :type => :model/) }
       end
 
       describe 'the fixtures' do

spec/generators/rspec/observer/observer_generator_spec.rb

@@ -16,6 +16,6 @@
   describe 'the spec' do
     it { is_expected.to exist }
     it { is_expected.to contain(/require 'rails_helper'/) }
-    it { is_expected.to contain(/describe PostsObserver, :type => :observer/) }
+    it { is_expected.to contain(/^RSpec.describe PostsObserver, :type => :observer/) }
   end
 end

spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -13,7 +13,7 @@
     describe 'with no options' do
       before { run_generator %w(posts) }
       it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/describe PostsController, :type => :controller/) }
+      it { is_expected.to contain(/^RSpec.describe PostsController, :type => :controller/) }
     end
 
     describe 'with --no-controller_specs' do
@@ -25,7 +25,7 @@
   describe 'namespaced controller spec' do
     subject { file('spec/controllers/admin/posts_controller_spec.rb') }
     before  { run_generator %w(admin/posts) }
-    it { is_expected.to contain(/describe Admin::PostsController, :type => :controller/)}
+    it { is_expected.to contain(/^RSpec.describe Admin::PostsController, :type => :controller/)}
   end
 
   describe 'view specs' do
@@ -36,31 +36,31 @@
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
         it { is_expected.to exist }
         it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/describe "(.*)\/edit", :type => :view/) }
+        it { is_expected.to contain(/^RSpec.describe "(.*)\/edit", :type => :view/) }
         it { is_expected.to contain(/it "renders the edit (.*) form"/) }
       end
 
       describe 'index' do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
         it { is_expected.to exist }
         it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/describe "(.*)\/index", :type => :view/) }
+        it { is_expected.to contain(/^RSpec.describe "(.*)\/index", :type => :view/) }
         it { is_expected.to contain(/it "renders a list of (.*)"/) }
       end
 
       describe 'new' do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
         it { is_expected.to exist }
         it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/describe "(.*)\/new", :type => :view/) }
+        it { is_expected.to contain(/^RSpec.describe "(.*)\/new", :type => :view/) }
         it { is_expected.to contain(/it "renders new (.*) form"/) }
       end
 
       describe 'show' do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
         it { is_expected.to exist }
         it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/describe "(.*)\/show", :type => :view/) }
+        it { is_expected.to contain(/^RSpec.describe "(.*)\/show", :type => :view/) }
         it { is_expected.to contain(/it "renders attributes in <p>"/) }
       end
     end
@@ -136,7 +136,7 @@
     describe 'with default options' do
       before { run_generator %w(posts) }
       it { is_expected.to contain(/require "rails_helper"/) }
-      it { is_expected.to contain(/describe PostsController, :type => :routing/) }
+      it { is_expected.to contain(/^RSpec.describe PostsController, :type => :routing/) }
       it { is_expected.to contain(/describe "routing"/) }
     end
 

spec/generators/rspec/view/view_generator_spec.rb

@@ -14,7 +14,7 @@
       run_generator %w(posts index)
       file('spec/views/posts/index.html.erb_spec.rb').tap do |f|
         expect(f).to contain(/require 'rails_helper'/)
-        expect(f).to contain(/describe "posts\/index", :type => :view/)
+        expect(f).to contain(/^RSpec.describe "posts\/index", :type => :view/)
       end
     end
 
@@ -23,7 +23,7 @@
         run_generator %w(admin/posts index)
         file('spec/views/admin/posts/index.html.erb_spec.rb').tap do |f|
           expect(f).to contain(/require 'rails_helper'/)
-          expect(f).to contain(/describe "admin\/posts\/index", :type => :view/)
+          expect(f).to contain(/^RSpec.describe "admin\/posts\/index", :type => :view/)
         end
       end
     end
@@ -34,7 +34,7 @@
       run_generator %w(posts index --template_engine haml)
       file('spec/views/posts/index.html.haml_spec.rb').tap do |f|
         expect(f).to contain(/require 'rails_helper'/)
-        expect(f).to contain(/describe "posts\/index", :type => :view/)
+        expect(f).to contain(/^RSpec.describe "posts\/index", :type => :view/)
       end
     end
   end