Cleanup workaround

It seems that the workaround was exclusively used in the
DescriptionExtractor spec.

Author: pirj

lib/rubocop/cop/rspec/cop.rb

@@ -2,26 +2,6 @@
 
 module RuboCop
   module Cop
-    WorkaroundCop = Cop.dup
-
-    # Clone of the the normal RuboCop::Cop::Cop class so we can rewrite
-    # the inherited method without breaking functionality
-    class WorkaroundCop
-      # Remove the Cop.inherited method to be a noop. Our RSpec::Cop
-      # class will invoke the inherited hook instead
-      class << self
-        undef inherited
-        def inherited(*) end
-      end
-
-      # Special case `Module#<` so that the rspec support rubocop exports
-      # is compatible with our subclass
-      def self.<(other)
-        other.equal?(RuboCop::Cop::Cop) || super
-      end
-    end
-    private_constant(:WorkaroundCop)
-
     module RSpec
       # @abstract parent class to rspec cops
       #
@@ -37,7 +17,7 @@ module RSpec
       #       Patterns:
       #       - '_test.rb$'
       #       - '(?:^|/)test/'
-      class Cop < WorkaroundCop
+      class Cop < ::RuboCop::Cop::Cop
         include RuboCop::RSpec::Language
         include RuboCop::RSpec::Language::NodePattern
 

lib/rubocop/rspec/description_extractor.rb

@@ -68,10 +68,8 @@ def documented_constant
         end
 
         def cop_subclass?
-          # YARD superclass resolution is a bit flaky: All classes loaded before
-          # RuboCop::Cop::WorkaroundCop are shown as having RuboCop::Cop as
-          # superclass, while all the following classes are listed as having
-          # RuboCop::Cop::RSpec::Cop as their superclass.
+          # FIXME: simplify
+
           COP_CLASS_NAMES.include?(yardoc.superclass.path)
         end
 

spec/rubocop/cop/rspec/cop_spec.rb

@@ -20,7 +20,6 @@
   end
 
   let(:fake_cop) do
-    stub_const('RuboCop::RSpec', Module.new)
     # rubocop:disable Style/ClassAndModuleChildren
     # rubocop:disable RSpec/LeakyConstantDeclaration
     class RuboCop::RSpec::FakeCop < described_class

spec/rubocop/rspec/description_extractor_spec.rb

@@ -42,11 +42,19 @@ def bar
     YARD::Registry.all
   end
 
+  let(:temp_class) do
+    temp = RuboCop::Cop::Cop.dup
+    temp.class_exec do
+      class << self
+        undef inherited
+        def inherited(*) end
+      end
+    end
+    temp
+  end
+
   def stub_cop_const(name)
-    stub_const(
-      "RuboCop::Cop::RSpec::#{name}",
-      Class.new(RuboCop::Cop.const_get(:WorkaroundCop))
-    )
+    stub_const("RuboCop::Cop::RSpec::#{name}", Class.new(temp_class))
   end
 
   before do