Merge pull request #1799 from rspec/myron/tweaks

Audit tweaks

Author: Sam Phippen

lib/rspec/rails/example/feature_example_group.rb

@@ -63,7 +63,7 @@ def visit(*)
     main_feature = nil unless c.expose_dsl_globally?
     c.alias_example_group_to :feature, opts
     c.alias_example_to :scenario
-    c.alias_example_to :xscenario
+    c.alias_example_to :xscenario, :skip => 'Temporarily skipped with xscenario'
   end
 
   # Due to load order issues and `config.expose_dsl_globally?` defaulting to

lib/rspec/rails/example/rails_example_group.rb

@@ -11,7 +11,6 @@ module RailsExampleGroup
       include RSpec::Rails::SetupAndTeardownAdapter
       include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
       include RSpec::Rails::MinitestAssertionAdapter
-      include RSpec::Rails::Matchers
       include RSpec::Rails::FixtureSupport
     end
   end

spec/rspec/rails/matchers/active_job_spec.rb

@@ -28,8 +28,6 @@ def to_global_id(options = {})
 end
 
 RSpec.describe "ActiveJob matchers", :skip => !RSpec::Rails::FeatureCheck.has_active_job? do
-  include RSpec::Rails::Matchers
-
   around do |example|
     original_logger = ActiveJob::Base.logger
     ActiveJob::Base.logger = Logger.new(nil) # Silence messages "[ActiveJob] Enqueued ...".

spec/rspec/rails/matchers/be_a_new_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe "be_a_new matcher" do
-  include RSpec::Rails::Matchers
-
   context "new record" do
     let(:record) do
       Class.new do

spec/rspec/rails/matchers/be_new_record_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe "be_new_record" do
-  include RSpec::Rails::Matchers
-
   context "un-persisted record" do
     let(:record) { double('record', :persisted? => false) }
 

spec/rspec/rails/matchers/be_valid_spec.rb

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

spec/rspec/rails/matchers/have_http_status_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe "have_http_status" do
-  include RSpec::Rails::Matchers
-
   def create_response(opts = {})
     ActionDispatch::TestResponse.new(opts.fetch(:status)).tap {|x|
       x.request = ActionDispatch::Request.new({})