Merge pull request #2264 from rspec/update-spec_helper-to-use-defaults

Streamline RSpec config

Author: JonRowe

spec/rspec/rails/assertion_adapter_spec.rb

@@ -1,4 +1,4 @@
-describe RSpec::Rails::MinitestAssertionAdapter do
+RSpec.describe RSpec::Rails::MinitestAssertionAdapter do
   include RSpec::Rails::MinitestAssertionAdapter
 
   RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/}.each do |m|

spec/rspec/rails/assertion_delegator_spec.rb

@@ -1,4 +1,4 @@
-describe RSpec::Rails::AssertionDelegator do
+RSpec.describe RSpec::Rails::AssertionDelegator do
   it "provides a module that delegates assertion methods to an isolated class" do
     klass = Class.new {
       include RSpec::Rails::AssertionDelegator.new(RSpec::Rails::Assertions)

spec/rspec/rails/configuration_spec.rb

@@ -196,7 +196,8 @@ def in_inferring_type_from_location_environment
   it "metadata `type: :request` sets up request example groups" do
     a_rails_app = double("Rails application")
     the_rails_module = Module.new {
-      def self.version; end;
+      def self.version; end
+      def self.application; end
     }
     allow(the_rails_module).to receive(:application) { a_rails_app }
     version = ::Rails::VERSION
@@ -232,7 +233,8 @@ def self.version; end;
   it "metadata `type: :feature` sets up feature example groups" do
     a_rails_app = double("Rails application")
     the_rails_module = Module.new {
-      def self.version; end;
+      def self.version; end
+      def self.application; end
     }
     allow(the_rails_module).to receive(:application) { a_rails_app }
     version = ::Rails::VERSION

spec/rspec/rails/example/controller_example_group_spec.rb

@@ -3,7 +3,7 @@ def self.abstract?; false; end
 end
 
 module RSpec::Rails
-  describe ControllerExampleGroup do
+  RSpec.describe ControllerExampleGroup do
     it_behaves_like "an rspec-rails example group mixin", :controller,
       './spec/controllers/', '.\\spec\\controllers\\'
 
@@ -60,12 +60,11 @@ def my_helper
       let(:controller) { double('controller') }
       let(:example) { group.new }
       let(:routes) do
-        routes = nil
         with_isolated_stderr do
           routes = ActionDispatch::Routing::RouteSet.new
           routes.draw { resources :foos }
+          routes
         end
-        routes
       end
 
       before do
@@ -84,7 +83,6 @@ def my_helper
 
       it "calls NamedRouteCollection#route_defined? when it checks that given route is defined or not" do
         expect(routes.named_routes).to receive(:route_defined?).and_return(true)
-        expect(routes.named_routes).not_to receive(:helpers)
 
         example.foos_url
       end

spec/rspec/rails/example/feature_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe FeatureExampleGroup do
+  RSpec.describe FeatureExampleGroup do
     it_behaves_like "an rspec-rails example group mixin", :feature,
       './spec/features/', '.\\spec\\features\\'
 

spec/rspec/rails/example/helper_example_group_spec.rb

@@ -20,12 +20,14 @@ class InternalClass
 
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
-        helper_spec = Object.new.extend HelperExampleGroup
-        expect(helper_spec).to receive(:view_assigns)
-        av_tc_b_view = double('_view')
-        expect(av_tc_b_view).to receive(:assign)
-        allow(helper_spec).to receive(:_view) { av_tc_b_view }
-        expect(helper_spec.helper).to eq(av_tc_b_view)
+        without_partial_double_verification do
+          helper_spec = Object.new.extend HelperExampleGroup
+          expect(helper_spec).to receive(:view_assigns)
+          av_tc_b_view = double('_view')
+          expect(av_tc_b_view).to receive(:assign)
+          allow(helper_spec).to receive(:_view) { av_tc_b_view }
+          expect(helper_spec.helper).to eq(av_tc_b_view)
+        end
       end
 
       before do
@@ -54,7 +56,7 @@ def _view
     end
   end
 
-  describe HelperExampleGroup::ClassMethods do
+  RSpec.describe HelperExampleGroup::ClassMethods do
     describe "determine_default_helper_class" do
       let(:group) do
         RSpec::Core::ExampleGroup.describe do

spec/rspec/rails/example/job_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe JobExampleGroup do
+  RSpec.describe JobExampleGroup do
     if defined?(ActiveJob)
       it_behaves_like "an rspec-rails example group mixin", :job,
         './spec/jobs/', '.\\spec\\jobs\\'

spec/rspec/rails/example/mailer_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe MailerExampleGroup do
+  RSpec.describe MailerExampleGroup do
     module ::Rails; end
     before do
       allow(Rails).to receive_message_chain(:application, :routes, :url_helpers).and_return(Rails)

spec/rspec/rails/example/model_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe ModelExampleGroup do
+  RSpec.describe ModelExampleGroup do
     it_behaves_like "an rspec-rails example group mixin", :model,
       './spec/models/', '.\\spec\\models\\'
   end

spec/rspec/rails/example/request_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe RequestExampleGroup do
+  RSpec.describe RequestExampleGroup do
     it_behaves_like "an rspec-rails example group mixin", :request,
       './spec/requests/', '.\\spec\\requests\\',
       './spec/integration/', '.\\spec\\integration\\',

spec/rspec/rails/example/routing_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe RoutingExampleGroup do
+  RSpec.describe RoutingExampleGroup do
     it_behaves_like "an rspec-rails example group mixin", :routing,
       './spec/routing/', '.\\spec\\routing\\'
 

spec/rspec/rails/example/view_example_group_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe ViewExampleGroup do
+  RSpec.describe ViewExampleGroup do
     it_behaves_like "an rspec-rails example group mixin", :view,
       './spec/views/', '.\\spec\\views\\'
 
@@ -8,15 +8,19 @@ module ::ThingsHelper; end
       module ::Namespaced; module ThingsHelper; end; end
 
       it 'includes the helper with the same name' do
-        group = RSpec::Core::ExampleGroup.describe 'things/show.html.erb'
+        group = RSpec::Core::ExampleGroup.describe('things/show.html.erb') do
+          def self.helper(*); end # Stub method
+        end
         expect(group).to receive(:helper).with(ThingsHelper)
         group.class_exec do
           include ViewExampleGroup
         end
       end
 
       it 'includes the namespaced helper with the same name' do
-        group = RSpec::Core::ExampleGroup.describe 'namespaced/things/show.html.erb'
+        group = RSpec::Core::ExampleGroup.describe('namespaced/things/show.html.erb') do
+          def self.helper(*); end # Stub method
+        end
         expect(group).to receive(:helper).with(Namespaced::ThingsHelper)
         group.class_exec do
           include ViewExampleGroup
@@ -56,7 +60,9 @@ module ::ApplicationHelper; end
         end
 
         it 'includes the application helper' do
-          group = RSpec::Core::Example.describe 'bars/new.html.erb'
+          group = RSpec::Core::ExampleGroup.describe('bars/new.html.erb') do
+            def self.helper(*); end # Stub method
+          end
           expect(group).to receive(:helper).with(ApplicationHelper)
           group.class_exec do
             include ViewExampleGroup
@@ -124,6 +130,7 @@ def _assigns
             end
           end
           include local
+          def _default_file_to_render; end # Stub method
           include ViewExampleGroup::ExampleMethods
         end.new
       end
@@ -174,7 +181,7 @@ def _assigns
         Class.new do
           include ViewExampleGroup::ExampleMethods
           def controller
-            @controller ||= Object.new
+            @controller ||= OpenStruct.new(params: nil)
           end
         end.new
       end
@@ -189,8 +196,10 @@ def controller
       let(:view_spec) do
         Class.new do
           include ViewExampleGroup::ExampleMethods
+          def _default_file_to_render; end
         end.new
       end
+
       context "with a common _default_file_to_render" do
         it "it returns the directory" do
           allow(view_spec).to receive(:_default_file_to_render).
@@ -213,6 +222,7 @@ def controller
     describe "#view" do
       let(:view_spec) do
         Class.new do
+          def _view; end # Stub method
           include ViewExampleGroup::ExampleMethods
         end.new
       end
@@ -227,13 +237,13 @@ def controller
         with_isolated_config do
           run_count = 0
           RSpec.configuration.before(:each, :type => :view) do
-            allow(view).to receive(:a_stubbed_helper) { :value }
+            allow(view).to receive(:render) { :value }
             run_count += 1
           end
           group = RSpec::Core::ExampleGroup.describe 'a view', :type => :view do
             specify { true }
           end
-          group.run NullObject.new
+          group.run
           expect(run_count).to eq 1
         end
       end

spec/rspec/rails/fixture_file_upload_support_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe FixtureFileUploadSupport do
+  RSpec.describe FixtureFileUploadSupport do
     context 'with fixture path set in config' do
       it 'resolves fixture file' do
         RSpec.configuration.fixture_path = File.dirname(__FILE__)

spec/rspec/rails/fixture_support_spec.rb

@@ -1,5 +1,5 @@
 module RSpec::Rails
-  describe FixtureSupport do
+  RSpec.describe FixtureSupport do
     context "with use_transactional_fixtures set to false" do
       it "still supports fixture_path" do
         allow(RSpec.configuration).to receive(:use_transactional_fixtures) { false }

spec/rspec/rails/matchers/be_a_new_spec.rb

@@ -1,4 +1,4 @@
-describe "be_a_new matcher" do
+RSpec.describe "be_a_new matcher" do
   context "new record" do
     let(:record) do
       Class.new do

spec/rspec/rails/matchers/be_new_record_spec.rb

@@ -1,4 +1,4 @@
-describe "be_new_record" do
+RSpec.describe "be_new_record" do
   context "a new record" do
     let(:record) { double('record', new_record?: true) }
 

spec/rspec/rails/matchers/be_routable_spec.rb

@@ -1,4 +1,4 @@
-describe "be_routable" do
+RSpec.describe "be_routable" do
   include RSpec::Rails::Matchers::RoutingMatchers
   attr_reader :routes
 

spec/rspec/rails/matchers/be_valid_spec.rb

@@ -1,6 +1,6 @@
 require 'rspec/rails/matchers/be_valid'
 
-describe "be_valid matcher" do
+RSpec.describe "be_valid matcher" do
   class Post
     include ActiveModel::Validations
     attr_accessor :title

spec/rspec/rails/matchers/has_spec.rb

@@ -19,7 +19,7 @@ class AssociatedItem < ActiveRecord::Base
   belongs_to :collection_owner
 end
 
-describe "should have_xxx" do
+RSpec.describe "should have_xxx" do
   it "works with ActiveRecord::Associations::CollectionProxy" do
     owner = CollectionOwner.new
     expect(owner.associated_items).to have_some_quality

spec/rspec/rails/matchers/have_rendered_spec.rb

@@ -1,23 +1,26 @@
 %w[have_rendered render_template].each do |template_expectation|
-  describe template_expectation do
+  RSpec.describe template_expectation do
     include RSpec::Rails::Matchers::RenderTemplate
     let(:response) { ActionDispatch::TestResponse.new }
 
     context "given a hash" do
+      def assert_template(*); end
       it "delegates to assert_template" do
         expect(self).to receive(:assert_template).with({:this => "hash"}, "this message")
         expect("response").to send(template_expectation, {:this => "hash"}, "this message")
       end
     end
 
     context "given a string" do
+      def assert_template(*); end
       it "delegates to assert_template" do
         expect(self).to receive(:assert_template).with("this string", "this message")
         expect("response").to send(template_expectation, "this string", "this message")
       end
     end
 
     context "given a symbol" do
+      def assert_template(*); end
       it "converts to_s and delegates to assert_template" do
         expect(self).to receive(:assert_template).with("template_name", "this message")
         expect("response").to send(template_expectation, :template_name, "this message")
@@ -26,8 +29,8 @@
 
     context "with should" do
       context "when assert_template passes" do
+        def assert_template(*); end
         it "passes" do
-          def assert_template(*); end
           expect do
             expect(response).to send(template_expectation, "template_name")
           end.to_not raise_exception

spec/rspec/rails/matchers/redirect_to_spec.rb

@@ -1,7 +1,7 @@
 require "active_support"
 require "active_support/test_case"
 
-describe "redirect_to" do
+RSpec.describe "redirect_to" do
   include RSpec::Rails::Matchers::RedirectTo
 
   let(:response) { ActionDispatch::TestResponse.new }

spec/rspec/rails/matchers/relation_match_array_spec.rb

@@ -1,4 +1,4 @@
-describe "ActiveSupport::Relation match_array matcher" do
+RSpec.describe "ActiveSupport::Relation match_array matcher" do
   before { MockableModel.delete_all }
 
   let!(:models) { Array.new(3) { MockableModel.create } }

spec/rspec/rails/matchers/route_to_spec.rb

@@ -1,4 +1,4 @@
-describe "route_to" do
+RSpec.describe "route_to" do
   include RSpec::Rails::Matchers::RoutingMatchers
   include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
 

spec/rspec/rails/minitest_lifecycle_adapter_spec.rb

@@ -1,4 +1,4 @@
-describe RSpec::Rails::MinitestLifecycleAdapter do
+RSpec.describe RSpec::Rails::MinitestLifecycleAdapter do
   it "invokes minitest lifecycle hooks at the appropriate times" do
     invocations = []
     example_group = RSpec::Core::ExampleGroup.describe("MinitestHooks") do