rubocop 0.7.2 → 0.8.0

data/spec/rubocop/cops/trailing_whitespace_spec.rb

@@ -9,17 +9,17 @@ module Rubocop
 
       it 'registers an offence for a line ending with space' do
         source = ['x = 0 ']
-        tws.inspect('file.rb', source, nil, nil)
+        tws.inspect(source, nil, nil, nil)
         expect(tws.offences.size).to eq(1)
       end
 
       it 'registers an offence for a line ending with tab' do
-        tws.inspect('file.rb', ["x = 0\t"], nil, nil)
+        tws.inspect(["x = 0\t"], nil, nil, nil)
         expect(tws.offences.size).to eq(1)
       end
 
       it 'accepts a line without trailing whitespace' do
-        tws.inspect('file.rb', ["x = 0\n"], nil, nil)
+        tws.inspect(["x = 0\n"], nil, nil, nil)
         expect(tws.offences).to be_empty
       end
     end

data/spec/rubocop/cops/trivial_accessors_spec.rb

@@ -12,7 +12,7 @@ module Rubocop
       end
 
       it 'finds trivial reader' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['def foo',
                         '  @foo',
                         'end',
@@ -26,7 +26,7 @@ module Rubocop
       end
 
       it 'finds trivial reader in a class' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         '  def foo',
                         '    @foo',
@@ -41,7 +41,7 @@ module Rubocop
       end
 
       it 'finds trivial reader in a nested class' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         '  class Nested',
                         '    def foo',
@@ -55,7 +55,7 @@ module Rubocop
       end
 
       it 'finds trivial readers in a little less trivial class' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         '  def foo',
                         '    @foo',
@@ -115,7 +115,7 @@ module Rubocop
       end
 
       it 'finds trivial reader with braces' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class Test',
                         '  # trivial reader with braces',
                         '  def name()',
@@ -128,7 +128,7 @@ module Rubocop
       end
 
       it 'finds trivial writer without braces' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class Test',
                         '  # trivial writer without braces',
                         '  def name= name',
@@ -141,7 +141,7 @@ module Rubocop
       end
 
       it 'does not find trivial writer with function calls' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialTest',
                         ' def test=(val)',
                         '   @test = val',
@@ -153,7 +153,7 @@ module Rubocop
       end
 
       it 'finds trivials with less peculiar methods' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class NilStats',
                         'def most_traded_pair',
                         'end',
@@ -167,9 +167,6 @@ module Rubocop
                         'def gain_at(date)',
                         '  1',
                         'end',
-                        'def gain= value',
-                        '  @value = 0.1',
-                        'end',
                         'def gain_percentage',
                         '  0',
                         'end',
@@ -195,7 +192,7 @@ module Rubocop
       end
 
       it 'finds oneliner trivials' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class Oneliner',
                         '  def foo; @foo; end',
                         '  def foo= foo; @foo = foo; end',
@@ -206,7 +203,7 @@ module Rubocop
       end
 
       it 'does not find a trivial reader' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['def bar',
                         '  @bar + foo',
                         'end'])
@@ -214,7 +211,7 @@ module Rubocop
       end
 
       it 'finds trivial writer' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['def foo=(val)',
                         ' @foo = val',
                         'end'])
@@ -224,7 +221,7 @@ module Rubocop
       end
 
       it 'finds trivial writer in a class' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         '  def foo=(val)',
                         '    @foo = val',
@@ -250,7 +247,7 @@ module Rubocop
       end
 
       it 'finds trivial accessors in a little less trivial class' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         ' def foo',
                         ' @foo',
@@ -271,7 +268,7 @@ module Rubocop
       end
 
       it 'does not find a trivial writer' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['def bar=(value)',
                         ' @bar = value + 42',
                         'end'])
@@ -279,7 +276,7 @@ module Rubocop
       end
 
       it 'finds trivial writers in a little less trivial class' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         ' def foo_bar=(foo, bar)',
                         ' @foo_bar = foo + bar',
@@ -297,7 +294,7 @@ module Rubocop
       end
 
       it 'does not find trivial accessors with method calls' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        ['class TrivialFoo',
                         ' def foo_bar(foo)',
                         '   foo_bar = foo + 42',
@@ -315,7 +312,7 @@ module Rubocop
       end
 
       it 'does not find trivial writer with exceptions' do
-        inspect_source(trivial_accessors_finder, '',
+        inspect_source(trivial_accessors_finder,
                        [' def expiration_formatted=(value)',
                         '   begin',
                         '     @expiration = foo_stuff',

data/spec/rubocop/cops/unless_else_spec.rb

@@ -8,20 +8,20 @@ module Rubocop
       let(:ue) { UnlessElse.new }
 
       it 'registers an offence for an unless with else' do
-        inspect_source(ue, 'file.rb', ['unless x',
-                                       '  a = 1',
-                                       'else',
-                                       '  a = 0',
-                                       'end'])
+        inspect_source(ue, ['unless x',
+                            '  a = 1',
+                            'else',
+                            '  a = 0',
+                            'end'])
         expect(ue.offences.map(&:message)).to eq(
           ['Never use unless with else. Rewrite these with the ' +
            'positive case first.'])
       end
 
       it 'accepts an unless without else' do
-        inspect_source(ue, 'file.rb', ['unless x',
-                                       '  a = 1',
-                                       'end'])
+        inspect_source(ue, ['unless x',
+                            '  a = 1',
+                            'end'])
         expect(ue.offences.map(&:message)).to be_empty
       end
     end

data/spec/rubocop/cops/variable_interpolation_spec.rb

@@ -9,7 +9,6 @@ module Rubocop
 
       it 'registers an offence for interpolated global variables' do
         inspect_source(vi,
-                       'file.rb',
                        ['puts "this is a #$test"'])
         expect(vi.offences.size).to eq(1)
         expect(vi.offences.map(&:message))
@@ -18,7 +17,6 @@ module Rubocop
 
       it 'registers an offence for interpolated regexp back references' do
         inspect_source(vi,
-                       'file.rb',
                        ['puts "this is a #$1"'])
         expect(vi.offences.size).to eq(1)
         expect(vi.offences.map(&:message))
@@ -27,7 +25,6 @@ module Rubocop
 
       it 'registers an offence for interpolated instance variables' do
         inspect_source(vi,
-                       'file.rb',
                        ['puts "this is a #@test"'])
         expect(vi.offences.size).to eq(1)
         expect(vi.offences.map(&:message))
@@ -36,7 +33,6 @@ module Rubocop
 
       it 'registers an offence for interpolated class variables' do
         inspect_source(vi,
-                       'file.rb',
                        ['puts "this is a #@@t"'])
         expect(vi.offences.size).to eq(1)
         expect(vi.offences.map(&:message))
@@ -45,7 +41,6 @@ module Rubocop
 
       it 'does not register an offence for variables in expressions' do
         inspect_source(vi,
-                       'file.rb',
                        ['puts "this is a #{@test} #{@@t} #{$t} #{$1}"'])
         expect(vi.offences).to be_empty
       end

data/spec/rubocop/cops/when_then_spec.rb

@@ -8,36 +8,29 @@ module Rubocop
       let(:wt) { WhenThen.new }
 
       it 'registers an offence for when x;' do
-        inspect_source(wt, 'file.rb', ['case a',
-                                       'when b; c',
-                                       'end'])
+        inspect_source(wt, ['case a',
+                            'when b; c',
+                            'end'])
         expect(wt.offences.map(&:message)).to eq(
           ['Never use "when x;". Use "when x then" instead.'])
       end
 
-      it 'misses semicolon but does not crash when there are no tokens' do
-        inspect_source(wt, 'file.rb', ['case a',
-                                       'when []; {}',
-                                       'end'])
-        expect(wt.offences.map(&:message)).to eq([])
-      end
-
       it 'accepts when x then' do
-        inspect_source(wt, 'file.rb', ['case a',
-                                       'when b then c',
-                                       'end'])
+        inspect_source(wt, ['case a',
+                            'when b then c',
+                            'end'])
         expect(wt.offences.map(&:message)).to be_empty
       end
 
       it 'accepts ; separating statements in the body of when' do
-        inspect_source(wt, 'file.rb', ['case a',
-                                       'when b then c; d',
-                                       'end',
-                                       '',
-                                       'case e',
-                                       'when f',
-                                       '  g; h',
-                                       'end'])
+        inspect_source(wt, ['case a',
+                            'when b then c; d',
+                            'end',
+                            '',
+                            'case e',
+                            'when f',
+                            '  g; h',
+                            'end'])
         expect(wt.offences.map(&:message)).to be_empty
       end
     end

data/spec/rubocop/cops/word_array_spec.rb

@@ -9,28 +9,36 @@ module Rubocop
 
       it 'registers an offence for arrays of single quoted strings' do
         inspect_source(wa,
-                       'file.rb',
                        ["['one', 'two', 'three']"])
         expect(wa.offences.size).to eq(1)
       end
 
       it 'registers an offence for arrays of double quoted strings' do
         inspect_source(wa,
-                       'file.rb',
                        ['["one", "two", "three"]'])
         expect(wa.offences.size).to eq(1)
       end
 
       it 'does not register an offence for array of non-words' do
         inspect_source(wa,
-                       'file.rb',
                        ['["one space", "two", "three"]'])
         expect(wa.offences).to be_empty
       end
 
+      it 'does not register an offence for array starting with %w' do
+        inspect_source(wa,
+                       ['%w(one two three)'])
+        expect(wa.offences).to be_empty
+      end
+
+      it 'does not register an offence for array with one element' do
+        inspect_source(wa,
+                       ['["three"]'])
+        expect(wa.offences).to be_empty
+      end
+
       it 'does not register an offence for array with empty strings' do
         inspect_source(wa,
-                       'file.rb',
                        ['["", "two", "three"]'])
         expect(wa.offences).to be_empty
       end

data/spec/spec_helper.rb

@@ -49,6 +49,7 @@ end
 
 RSpec.configure do |config|
   config.filter_run_excluding ruby: ->(v) { !RUBY_VERSION.start_with?(v.to_s) }
+  config.filter_run_excluding broken: true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
   config.expect_with :rspec do |c|
@@ -62,8 +63,15 @@ end
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-def inspect_source(cop, file, source)
-  tokens, sexp, correlations = Rubocop::CLI.rip_source(source)
-  cop.correlations = correlations
-  cop.inspect(file, source, tokens, sexp)
+def inspect_source(cop, source)
+  ast, comments, tokens, _ = Rubocop::CLI.parse('(string)') do |source_buffer|
+    source_buffer.source = source.join($RS)
+  end
+  cop.inspect(source, tokens, ast, comments)
+end
+
+class Rubocop::Cop::Cop
+  def messages
+    offences.map(&:message)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +119,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
 - .gitignore
 - .rspec
 - .rubocop.yml
@@ -124,10 +137,10 @@ files:
 - lib/rubocop/cli.rb
 - lib/rubocop/config.rb
 - lib/rubocop/config_store.rb
+- lib/rubocop/cop/access_control.rb
 - lib/rubocop/cop/alias.rb
 - lib/rubocop/cop/align_parameters.rb
-- lib/rubocop/cop/ampersands_pipes_vs_and_or.rb
-- lib/rubocop/cop/array_literal.rb
+- lib/rubocop/cop/and_or.rb
 - lib/rubocop/cop/ascii_comments.rb
 - lib/rubocop/cop/ascii_identifiers.rb
 - lib/rubocop/cop/avoid_class_vars.rb
@@ -137,16 +150,17 @@ files:
 - lib/rubocop/cop/avoid_perlisms.rb
 - lib/rubocop/cop/block_comments.rb
 - lib/rubocop/cop/blocks.rb
-- lib/rubocop/cop/brace_after_percent.rb
 - lib/rubocop/cop/case_indentation.rb
 - lib/rubocop/cop/class_and_module_camel_case.rb
 - lib/rubocop/cop/class_methods.rb
 - lib/rubocop/cop/collection_methods.rb
 - lib/rubocop/cop/colon_method_call.rb
+- lib/rubocop/cop/constant_name.rb
 - lib/rubocop/cop/cop.rb
 - lib/rubocop/cop/def_parentheses.rb
 - lib/rubocop/cop/empty_line_between_defs.rb
 - lib/rubocop/cop/empty_lines.rb
+- lib/rubocop/cop/empty_literal.rb
 - lib/rubocop/cop/encoding.rb
 - lib/rubocop/cop/end_of_line.rb
 - lib/rubocop/cop/ensure_return.rb
@@ -156,14 +170,13 @@ files:
 - lib/rubocop/cop/favor_percent_r.rb
 - lib/rubocop/cop/favor_sprintf.rb
 - lib/rubocop/cop/favor_unless_over_negated_if.rb
-- lib/rubocop/cop/grammar.rb
 - lib/rubocop/cop/handle_exceptions.rb
-- lib/rubocop/cop/hash_literal.rb
 - lib/rubocop/cop/hash_syntax.rb
 - lib/rubocop/cop/if_then_else.rb
 - lib/rubocop/cop/leading_comment_space.rb
 - lib/rubocop/cop/line_continuation.rb
 - lib/rubocop/cop/line_length.rb
+- lib/rubocop/cop/loop.rb
 - lib/rubocop/cop/method_and_variable_snake_case.rb
 - lib/rubocop/cop/method_length.rb
 - lib/rubocop/cop/new_lambda_literal.rb
@@ -173,7 +186,6 @@ files:
 - lib/rubocop/cop/op_method.rb
 - lib/rubocop/cop/parameter_lists.rb
 - lib/rubocop/cop/parentheses_around_condition.rb
-- lib/rubocop/cop/percent_literals.rb
 - lib/rubocop/cop/percent_r.rb
 - lib/rubocop/cop/reduce_arguments.rb
 - lib/rubocop/cop/rescue_exception.rb
@@ -185,13 +197,14 @@ files:
 - lib/rubocop/cop/string_literals.rb
 - lib/rubocop/cop/surrounding_space.rb
 - lib/rubocop/cop/symbol_array.rb
-- lib/rubocop/cop/symbol_snake_case.rb
+- lib/rubocop/cop/symbol_name.rb
 - lib/rubocop/cop/syntax.rb
 - lib/rubocop/cop/tab.rb
 - lib/rubocop/cop/ternary_operator.rb
 - lib/rubocop/cop/trailing_whitespace.rb
 - lib/rubocop/cop/trivial_accessors.rb
 - lib/rubocop/cop/unless_else.rb
+- lib/rubocop/cop/util.rb
 - lib/rubocop/cop/variable_interpolation.rb
 - lib/rubocop/cop/when_then.rb
 - lib/rubocop/cop/word_array.rb
@@ -204,50 +217,50 @@ files:
 - spec/rubocop/cli_spec.rb
 - spec/rubocop/config_spec.rb
 - spec/rubocop/config_store_spec.rb
+- spec/rubocop/cops/access_control_spec.rb
 - spec/rubocop/cops/alias_spec.rb
 - spec/rubocop/cops/align_parameters_spec.rb
-- spec/rubocop/cops/ampersands_pipes_vs_and_or_spec.rb
-- spec/rubocop/cops/array_literal_spec.rb
+- spec/rubocop/cops/and_or_spec.rb
 - spec/rubocop/cops/ascii_comments_spec.rb
 - spec/rubocop/cops/ascii_identifiers_spec.rb
 - spec/rubocop/cops/avoid_class_vars_spec.rb
 - spec/rubocop/cops/avoid_for_spec.rb
-- spec/rubocop/cops/avoid_global_vars.rb
+- spec/rubocop/cops/avoid_global_vars_spec.rb
 - spec/rubocop/cops/avoid_perl_backrefs_spec.rb
 - spec/rubocop/cops/avoid_perlisms_spec.rb
 - spec/rubocop/cops/block_comments_spec.rb
-- spec/rubocop/cops/brace_after_percent_spec.rb
+- spec/rubocop/cops/blocks_spec.rb
 - spec/rubocop/cops/case_indentation_spec.rb
 - spec/rubocop/cops/class_and_module_camel_case_spec.rb
 - spec/rubocop/cops/class_methods_spec.rb
 - spec/rubocop/cops/collection_methods_spec.rb
 - spec/rubocop/cops/colon_method_call_spec.rb
+- spec/rubocop/cops/constant_name_spec.rb
 - spec/rubocop/cops/cop_spec.rb
 - spec/rubocop/cops/def_with_parentheses_spec.rb
 - spec/rubocop/cops/def_without_parentheses_spec.rb
 - spec/rubocop/cops/empty_line_between_defs_spec.rb
 - spec/rubocop/cops/empty_lines_spec.rb
+- spec/rubocop/cops/empty_literal_spec.rb
 - spec/rubocop/cops/encoding_spec.rb
 - spec/rubocop/cops/end_of_line_spec.rb
 - spec/rubocop/cops/ensure_return_spec.rb
 - spec/rubocop/cops/eval_spec.rb
 - spec/rubocop/cops/favor_join_spec.rb
 - spec/rubocop/cops/favor_modifier_spec.rb
-- spec/rubocop/cops/favor_percent_r.rb
+- spec/rubocop/cops/favor_percent_r_spec.rb
 - spec/rubocop/cops/favor_sprintf_spec.rb
 - spec/rubocop/cops/favor_unless_over_negated_if_spec.rb
 - spec/rubocop/cops/favor_until_over_negated_while_spec.rb
-- spec/rubocop/cops/grammar_spec.rb
 - spec/rubocop/cops/handle_exceptions_spec.rb
-- spec/rubocop/cops/hash_literal_spec.rb
 - spec/rubocop/cops/hash_syntax_spec.rb
 - spec/rubocop/cops/if_with_semicolon_spec.rb
 - spec/rubocop/cops/leading_comment_space_spec.rb
 - spec/rubocop/cops/line_continuation_spec.rb
 - spec/rubocop/cops/line_length_spec.rb
+- spec/rubocop/cops/loop_spec.rb
 - spec/rubocop/cops/method_and_variable_snake_case_spec.rb
 - spec/rubocop/cops/method_length_spec.rb
-- spec/rubocop/cops/multiline_blocks_spec.rb
 - spec/rubocop/cops/multiline_if_then_spec.rb
 - spec/rubocop/cops/new_lambda_literal_spec.rb
 - spec/rubocop/cops/not_spec.rb
@@ -257,13 +270,11 @@ files:
 - spec/rubocop/cops/op_method_spec.rb
 - spec/rubocop/cops/parameter_lists_spec.rb
 - spec/rubocop/cops/parentheses_around_condition_spec.rb
-- spec/rubocop/cops/percent_literals_spec.rb
 - spec/rubocop/cops/percent_r_spec.rb
 - spec/rubocop/cops/reduce_arguments_spec.rb
 - spec/rubocop/cops/rescue_exception_spec.rb
 - spec/rubocop/cops/rescue_modifier_spec.rb
 - spec/rubocop/cops/semicolon_spec.rb
-- spec/rubocop/cops/single_line_blocks_spec.rb
 - spec/rubocop/cops/single_line_methods_spec.rb
 - spec/rubocop/cops/space_after_colon_spec.rb
 - spec/rubocop/cops/space_after_comma_spec.rb
@@ -277,7 +288,7 @@ files:
 - spec/rubocop/cops/space_inside_parens_spec.rb
 - spec/rubocop/cops/string_literals_spec.rb
 - spec/rubocop/cops/symbol_array_spec.rb
-- spec/rubocop/cops/symbol_snake_case_spec.rb
+- spec/rubocop/cops/symbol_name_spec.rb
 - spec/rubocop/cops/syntax_spec.rb
 - spec/rubocop/cops/tab_spec.rb
 - spec/rubocop/cops/ternary_operator_spec.rb
@@ -321,50 +332,50 @@ test_files:
 - spec/rubocop/cli_spec.rb
 - spec/rubocop/config_spec.rb
 - spec/rubocop/config_store_spec.rb
+- spec/rubocop/cops/access_control_spec.rb
 - spec/rubocop/cops/alias_spec.rb
 - spec/rubocop/cops/align_parameters_spec.rb
-- spec/rubocop/cops/ampersands_pipes_vs_and_or_spec.rb
-- spec/rubocop/cops/array_literal_spec.rb
+- spec/rubocop/cops/and_or_spec.rb
 - spec/rubocop/cops/ascii_comments_spec.rb
 - spec/rubocop/cops/ascii_identifiers_spec.rb
 - spec/rubocop/cops/avoid_class_vars_spec.rb
 - spec/rubocop/cops/avoid_for_spec.rb
-- spec/rubocop/cops/avoid_global_vars.rb
+- spec/rubocop/cops/avoid_global_vars_spec.rb
 - spec/rubocop/cops/avoid_perl_backrefs_spec.rb
 - spec/rubocop/cops/avoid_perlisms_spec.rb
 - spec/rubocop/cops/block_comments_spec.rb
-- spec/rubocop/cops/brace_after_percent_spec.rb
+- spec/rubocop/cops/blocks_spec.rb
 - spec/rubocop/cops/case_indentation_spec.rb
 - spec/rubocop/cops/class_and_module_camel_case_spec.rb
 - spec/rubocop/cops/class_methods_spec.rb
 - spec/rubocop/cops/collection_methods_spec.rb
 - spec/rubocop/cops/colon_method_call_spec.rb
+- spec/rubocop/cops/constant_name_spec.rb
 - spec/rubocop/cops/cop_spec.rb
 - spec/rubocop/cops/def_with_parentheses_spec.rb
 - spec/rubocop/cops/def_without_parentheses_spec.rb
 - spec/rubocop/cops/empty_line_between_defs_spec.rb
 - spec/rubocop/cops/empty_lines_spec.rb
+- spec/rubocop/cops/empty_literal_spec.rb
 - spec/rubocop/cops/encoding_spec.rb
 - spec/rubocop/cops/end_of_line_spec.rb
 - spec/rubocop/cops/ensure_return_spec.rb
 - spec/rubocop/cops/eval_spec.rb
 - spec/rubocop/cops/favor_join_spec.rb
 - spec/rubocop/cops/favor_modifier_spec.rb
-- spec/rubocop/cops/favor_percent_r.rb
+- spec/rubocop/cops/favor_percent_r_spec.rb
 - spec/rubocop/cops/favor_sprintf_spec.rb
 - spec/rubocop/cops/favor_unless_over_negated_if_spec.rb
 - spec/rubocop/cops/favor_until_over_negated_while_spec.rb
-- spec/rubocop/cops/grammar_spec.rb
 - spec/rubocop/cops/handle_exceptions_spec.rb
-- spec/rubocop/cops/hash_literal_spec.rb
 - spec/rubocop/cops/hash_syntax_spec.rb
 - spec/rubocop/cops/if_with_semicolon_spec.rb
 - spec/rubocop/cops/leading_comment_space_spec.rb
 - spec/rubocop/cops/line_continuation_spec.rb
 - spec/rubocop/cops/line_length_spec.rb
+- spec/rubocop/cops/loop_spec.rb
 - spec/rubocop/cops/method_and_variable_snake_case_spec.rb
 - spec/rubocop/cops/method_length_spec.rb
-- spec/rubocop/cops/multiline_blocks_spec.rb
 - spec/rubocop/cops/multiline_if_then_spec.rb
 - spec/rubocop/cops/new_lambda_literal_spec.rb
 - spec/rubocop/cops/not_spec.rb
@@ -374,13 +385,11 @@ test_files:
 - spec/rubocop/cops/op_method_spec.rb
 - spec/rubocop/cops/parameter_lists_spec.rb
 - spec/rubocop/cops/parentheses_around_condition_spec.rb
-- spec/rubocop/cops/percent_literals_spec.rb
 - spec/rubocop/cops/percent_r_spec.rb
 - spec/rubocop/cops/reduce_arguments_spec.rb
 - spec/rubocop/cops/rescue_exception_spec.rb
 - spec/rubocop/cops/rescue_modifier_spec.rb
 - spec/rubocop/cops/semicolon_spec.rb
-- spec/rubocop/cops/single_line_blocks_spec.rb
 - spec/rubocop/cops/single_line_methods_spec.rb
 - spec/rubocop/cops/space_after_colon_spec.rb
 - spec/rubocop/cops/space_after_comma_spec.rb
@@ -394,7 +403,7 @@ test_files:
 - spec/rubocop/cops/space_inside_parens_spec.rb
 - spec/rubocop/cops/string_literals_spec.rb
 - spec/rubocop/cops/symbol_array_spec.rb
-- spec/rubocop/cops/symbol_snake_case_spec.rb
+- spec/rubocop/cops/symbol_name_spec.rb
 - spec/rubocop/cops/syntax_spec.rb
 - spec/rubocop/cops/tab_spec.rb
 - spec/rubocop/cops/ternary_operator_spec.rb