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\\',