rubocop-rspec 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c5a02b8f251474055785a8e599fa2bbd66a5da
-  data.tar.gz: 4d34abb87f561cbe99dcd4df35d4d2e4b8eb1499
+  metadata.gz: 6a604474acdd504b70582e29579a8ec65a6bbbfa
+  data.tar.gz: f8fa3ac1215089b95341115ca35edb73ddb148c3
 SHA512:
-  metadata.gz: 55de6981f33d7f310a4290a1fc4578bb6d0ba905a2ce4ea86f966d025165cfd6d08d05f5198b56dcd207178724f574e6e046cb4af01be02a7e36662cfe792647
-  data.tar.gz: 73f5cdbc39ed5bc4aaa0d2fa8aa0769855b09f2d960ccf5078638582be79556109a491819a4253414a567a50baef1e66b6b737203998a57fad0cf2997c4446ca
+  metadata.gz: a0d4f97983ce7f1147d32b8948d22d5c7b30490a946e5500e2aa78f60daad47f9e68eac81e6da2825e83f8248a8a8ed4dfd538a30e4b7dcc9af462fee16bda2c
+  data.tar.gz: dd3bc63ff868cef005a10da71f873dc804d333fd8950de8636d980064341b386a74e281ba698d051859c7c4ddceb7ee257d527ac68c7129fd660f7321014b9ac

data/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 ## Master (Unreleased)
 
-## 1.15.0 (2017-05-24)
+## 1.15.1 (2017-04-30)
+
+* Fix the handling of various edge cases in the `RSpec/ExampleWording` cop, including one that would cause autocorrect to crash. ([@dgollahon][])
+* Fix `RSpec/IteratedExpectation` crashing when there is an assignment in the iteration. ([@Darhazer][])
+* Fix false positive in `RSpec/SingleArgumentMessageChain` cop when the single argument is a hash. ([@Darhazer][])
+
+## 1.15.0 (2017-03-26)
 
 * Add `RSpec/DescribeSymbol` cop. ([@tsigo][])
 * Fix error when `RSpec/OverwritingSetup` and `RSpec/ScatteredLet` analyzed empty example groups. ([@backus][])

data/Rakefile

@@ -44,4 +44,4 @@ task confirm_config: :build_config do
   end
 end
 
-task default: %i(build_config coverage internal_investigation confirm_config)
+task default: %i[build_config coverage internal_investigation confirm_config]

data/config/default.yml

@@ -73,8 +73,9 @@ RSpec/ExampleWording:
   Enabled: true
   CustomTransform:
     be: is
+    BE: IS
     have: has
-    not: does not
+    HAVE: HAS
   IgnoredWords: []
 
 RSpec/ExpectActual:

data/lib/rubocop/cop/rspec/cop.rb

@@ -33,11 +33,12 @@ module RuboCop
       #       - '_test.rb$'
       #       - '(?:^|/)test/'
       class Cop < WorkaroundCop
+        include RuboCop::RSpec::Language
+        include RuboCop::RSpec::Language::NodePattern
+
         DEFAULT_CONFIGURATION =
           RuboCop::RSpec::CONFIG.fetch('AllCops').fetch('RSpec')
 
-        include RuboCop::RSpec::Language, RuboCop::RSpec::Language::NodePattern
-
         # Invoke the original inherited hook so our cops are recognized
         def self.inherited(subclass)
           RuboCop::Cop::Cop.inherited(subclass)

data/lib/rubocop/cop/rspec/describe_method.rb

@@ -17,8 +17,8 @@ module RuboCop
       #   describe MyClass, '.my_class_method' do
       #   end
       class DescribeMethod < Cop
-        include RuboCop::RSpec::TopLevelDescribe,
-                RuboCop::RSpec::Util
+        include RuboCop::RSpec::TopLevelDescribe
+        include RuboCop::RSpec::Util
 
         MSG = 'The second argument to describe should be the method '\
               "being tested. '#instance' or '.class'.".freeze

data/lib/rubocop/cop/rspec/example_wording.rb

@@ -33,8 +33,8 @@ module RuboCop
         MSG_SHOULD = 'Do not use should when describing your tests.'.freeze
         MSG_IT     = "Do not repeat 'it' when describing your tests.".freeze
 
-        SHOULD_PREFIX = 'should'.freeze
-        IT_PREFIX     = 'it '.freeze
+        SHOULD_PREFIX = /\Ashould(?:n't)?\b/i
+        IT_PREFIX     = /\Ait /i
 
         def_node_matcher(
           :it_description,
@@ -43,20 +43,16 @@ module RuboCop
 
         def on_block(node)
           it_description(node) do |description_node, message|
-            text = message.downcase
-
-            if text.start_with?(SHOULD_PREFIX)
+            if message =~ SHOULD_PREFIX
               add_wording_offense(description_node, MSG_SHOULD)
-            elsif text.start_with?(IT_PREFIX)
+            elsif message =~ IT_PREFIX
               add_wording_offense(description_node, MSG_IT)
             end
           end
         end
 
         def autocorrect(range)
-          lambda do |corrector|
-            corrector.replace(range, replacement_text(range))
-          end
+          ->(corrector) { corrector.replace(range, replacement_text(range)) }
         end
 
         private
@@ -77,13 +73,13 @@ module RuboCop
         def replacement_text(range)
           text = range.source
 
-          if text.start_with?('should')
+          if text =~ SHOULD_PREFIX
             RuboCop::RSpec::Wording.new(
               text,
               ignore:  ignored_words,
               replace: custom_transform
             ).rewrite
-          elsif text.start_with?(IT_PREFIX)
+          else
             text.sub(IT_PREFIX, '')
           end
         end

data/lib/rubocop/cop/rspec/expect_actual.rb

@@ -19,7 +19,7 @@ module RuboCop
       class ExpectActual < Cop
         MSG = 'Provide the actual you are testing to `expect(...)`.'.freeze
 
-        SIMPLE_LITERALS = %i(
+        SIMPLE_LITERALS = %i[
           true
           false
           nil
@@ -30,16 +30,16 @@ module RuboCop
           complex
           rational
           regopt
-        ).freeze
+        ].freeze
 
-        COMPLEX_LITERALS = %i(
+        COMPLEX_LITERALS = %i[
           array
           hash
           pair
           irange
           erange
           regexp
-        ).freeze
+        ].freeze
 
         def_node_matcher :expect_literal, '(send _ :expect $#literal?)'
 

data/lib/rubocop/cop/rspec/iterated_expectation.rb

@@ -44,7 +44,7 @@ module RuboCop
         end
 
         def only_expectations?(body, arg)
-          body.children.all? { |child| expectation?(child, arg) }
+          body.each_child_node.all? { |child| expectation?(child, arg) }
         end
       end
     end

data/lib/rubocop/cop/rspec/leading_subject.rb

@@ -54,7 +54,7 @@ module RuboCop
         private
 
         def let?(node)
-          [:let, :let!].include?(node.method_name)
+          %i[let let!].include?(node.method_name)
         end
 
         def find_first_let(node)

data/lib/rubocop/cop/rspec/message_expectation.rb

@@ -29,7 +29,7 @@ module RuboCop
 
         MSG = 'Prefer `%s` for setting message expectations.'.freeze
 
-        SUPPORTED_STYLES = %w(allow expect).freeze
+        SUPPORTED_STYLES = %w[allow expect].freeze
 
         def_node_matcher :message_expectation, <<-PATTERN
           (send $(send nil {:expect :allow} ...) :to #receive_message?)

data/lib/rubocop/cop/rspec/message_spies.rb

@@ -34,7 +34,7 @@ module RuboCop
                             'expectations. Setup `%s` as a spy using `allow`'\
                             ' or `instance_spy`.'.freeze
 
-        SUPPORTED_STYLES = %w(have_received receive).freeze
+        SUPPORTED_STYLES = %w[have_received receive].freeze
 
         def_node_matcher :message_expectation, %(
           (send (send nil :expect $_) {:to :to_not :not_to} ...)

data/lib/rubocop/cop/rspec/single_argument_message_chain.rb

@@ -19,12 +19,16 @@ module RuboCop
               '`%<called>s` with a single argument.'.freeze
 
         def_node_matcher :message_chain, <<-PATTERN
-          (send _ #{Matchers::MESSAGE_CHAIN.node_pattern_union} $...)
+          (send _ #{Matchers::MESSAGE_CHAIN.node_pattern_union} $_)
         PATTERN
 
+        def_node_matcher :single_key_hash?, '(hash pair)'
+
         def on_send(node)
-          message_chain(node) do |(first, *remaining)|
-            return if first.to_s.include?('.') || remaining.any?
+          message_chain(node) do |arg|
+            return if arg.to_s.include?('.')
+
+            return if arg.hash_type? && !single_key_hash?(arg)
 
             add_offense(node, :selector)
           end
@@ -33,11 +37,27 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             corrector.replace(node.loc.selector, replacement(node.method_name))
+            message_chain(node) do |arg|
+              autocorrect_hash_arg(corrector, arg) if single_key_hash?(arg)
+            end
           end
         end
 
         private
 
+        def autocorrect_hash_arg(corrector, arg)
+          key, value = *arg.children.first
+
+          corrector.replace(arg.loc.expression, key_to_arg(key))
+          corrector.insert_after(arg.parent.loc.end,
+                                 ".and_return(#{value.source})")
+        end
+
+        def key_to_arg(node)
+          key, = *node
+          node.sym_type? ? ":#{key}" : node.source
+        end
+
         def replacement(method)
           method.equal?(:receive_message_chain) ? 'receive' : 'stub'
         end

data/lib/rubocop/rspec/concept.rb

@@ -4,7 +4,8 @@ module RuboCop
   module RSpec
     # Wrapper for RSpec DSL methods
     class Concept
-      include Language, Language::NodePattern
+      include Language
+      include Language::NodePattern
       extend NodePattern::Macros
 
       def initialize(node)
@@ -12,7 +13,7 @@ module RuboCop
       end
 
       def eql?(other)
-        node.eql?(other.node)
+        node == other.node
       end
 
       alias == eql?

data/lib/rubocop/rspec/hook.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Wrapper for RSpec hook
     class Hook < Concept
-      STANDARDIZED_SCOPES = %i(each context suite).freeze
+      STANDARDIZED_SCOPES = %i[each context suite].freeze
       private_constant(:STANDARDIZED_SCOPES)
 
       def name

data/lib/rubocop/rspec/language.rb

@@ -44,49 +44,49 @@ module RuboCop
       end
 
       module Matchers
-        MESSAGE_CHAIN = SelectorSet.new(%i(receive_message_chain stub_chain))
+        MESSAGE_CHAIN = SelectorSet.new(%i[receive_message_chain stub_chain])
       end
 
       module ExampleGroups
-        GROUPS  = SelectorSet.new(%i(describe context feature example_group))
-        SKIPPED = SelectorSet.new(%i(xdescribe xcontext xfeature))
-        FOCUSED = SelectorSet.new(%i(fdescribe fcontext ffeature))
+        GROUPS  = SelectorSet.new(%i[describe context feature example_group])
+        SKIPPED = SelectorSet.new(%i[xdescribe xcontext xfeature])
+        FOCUSED = SelectorSet.new(%i[fdescribe fcontext ffeature])
 
         ALL = GROUPS + SKIPPED + FOCUSED
       end
 
       module SharedGroups
-        EXAMPLES = SelectorSet.new(%i(shared_examples shared_examples_for))
-        CONTEXT = SelectorSet.new(%i(shared_context))
+        EXAMPLES = SelectorSet.new(%i[shared_examples shared_examples_for])
+        CONTEXT = SelectorSet.new(%i[shared_context])
 
         ALL = EXAMPLES + CONTEXT
       end
 
       module Includes
         EXAMPLES = SelectorSet.new(
-          %i(
+          %i[
             it_behaves_like
             it_should_behave_like
             include_examples
-          )
+          ]
         )
-        CONTEXT = SelectorSet.new(%i(include_context))
+        CONTEXT = SelectorSet.new(%i[include_context])
 
         ALL = EXAMPLES + CONTEXT
       end
 
       module Examples
-        EXAMPLES = SelectorSet.new(%i(it specify example scenario its))
-        FOCUSED  = SelectorSet.new(%i(fit fspecify fexample fscenario focus))
-        SKIPPED  = SelectorSet.new(%i(xit xspecify xexample xscenario skip))
-        PENDING  = SelectorSet.new(%i(pending))
+        EXAMPLES = SelectorSet.new(%i[it specify example scenario its])
+        FOCUSED  = SelectorSet.new(%i[fit fspecify fexample fscenario focus])
+        SKIPPED  = SelectorSet.new(%i[xit xspecify xexample xscenario skip])
+        PENDING  = SelectorSet.new(%i[pending])
 
         ALL = EXAMPLES + FOCUSED + SKIPPED + PENDING
       end
 
       module Hooks
         ALL = SelectorSet.new(
-          %i(
+          %i[
             prepend_before
             before
             append_before
@@ -94,16 +94,16 @@ module RuboCop
             prepend_after
             after
             append_after
-          )
+          ]
         )
       end
 
       module Helpers
-        ALL = SelectorSet.new(%i(let let!))
+        ALL = SelectorSet.new(%i[let let!])
       end
 
       module Subject
-        ALL = SelectorSet.new(%i(subject))
+        ALL = SelectorSet.new(%i[subject subject!])
       end
 
       ALL =

data/lib/rubocop/rspec/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Version information for the RSpec RuboCop plugin.
     module Version
-      STRING = '1.15.0'.freeze
+      STRING = '1.15.1'.freeze
     end
   end
 end

data/lib/rubocop/rspec/wording.rb

@@ -4,6 +4,11 @@ module RuboCop
   module RSpec
     # RSpec example wording rewriter
     class Wording
+      SHOULDNT_PREFIX    = /\Ashould(?:n't| not)\b/i
+      SHOULDNT_BE_PREFIX = /#{SHOULDNT_PREFIX} be\b/i
+      ES_SUFFIX_PATTERN  = /(?:o|s|x|ch|sh|z)\z/i
+      IES_SUFFIX_PATTERN = /[^aeou]y\z/i
+
       def initialize(text, ignore:, replace:)
         @text         = text
         @ignores      = ignore
@@ -11,37 +16,66 @@ module RuboCop
       end
 
       def rewrite
-        text.split.tap do |words|
-          first_word = words.shift
-          words.unshift('not') if first_word.eql?("shouldn't")
-
-          words.each_with_index do |value, key|
-            next if ignores.include?(value)
-            words[key] = simple_present(words.fetch(key))
-            break
-          end
-        end.join(' ')
+        case text
+        when SHOULDNT_BE_PREFIX
+          replace_prefix(SHOULDNT_BE_PREFIX, 'is not')
+        when SHOULDNT_PREFIX
+          replace_prefix(SHOULDNT_PREFIX, 'does not')
+        else
+          remove_should_and_pluralize
+        end
       end
 
       private
 
       attr_reader :text, :ignores, :replacements
 
-      def simple_present(word)
-        return replacements.fetch(word) if replacements.key?(word)
+      def replace_prefix(pattern, replacement)
+        text.sub(pattern) do |shouldnt|
+          uppercase?(shouldnt) ? replacement.upcase : replacement
+        end
+      end
+
+      def uppercase?(word)
+        word.upcase.eql?(word)
+      end
+
+      def remove_should_and_pluralize
+        _should, *words = text.split
+
+        words.each_with_index do |word, index|
+          next if ignored_word?(word)
 
-        # ends with o s x ch sh or ss
-        if %w(o s x ch sh).any?(&word.public_method(:end_with?))
-          return "#{word}es"
+          words[index] = substitute(word)
+
+          break
         end
 
-        # ends with y
-        if word.end_with?('y') && !%w(a u o e).include?(word[-2])
-          return "#{word[0..-2]}ies"
+        words.join(' ')
+      end
+
+      def ignored_word?(word)
+        ignores.any? { |ignore| ignore.casecmp(word).zero? }
+      end
+
+      def substitute(word)
+        # NOTE: Custom replacements are case sensitive.
+        return replacements.fetch(word) if replacements.key?(word)
+
+        case word
+        when ES_SUFFIX_PATTERN  then append_suffix(word, 'es')
+        when IES_SUFFIX_PATTERN then append_suffix(word[0..-2], 'ies')
+        else append_suffix(word, 's')
         end
+      end
 
-        "#{word}s"
+      def append_suffix(word, suffix)
+        suffix = suffix.upcase if uppercase?(word)
+
+        "#{word}#{suffix}"
       end
+
+      private_constant(*constants(false))
     end
   end
 end

data/spec/expect_violation/expectation_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe ExpectViolation::Expectation do
 
     it 'has an assertion with correct violation message' do
       expect(assertions.map(&:message)).to eql(
-        %w(Charlie Charlie Alpha Bronco Delta)
+        %w[Charlie Charlie Alpha Bronco Delta]
       )
     end
 

data/spec/project/default_config_spec.rb

@@ -14,11 +14,11 @@ RSpec.describe 'config/default.yml' do
         "RSpec/#{cop_name}"
       end
 
-    cop_names - %w(RSpec/Cop)
+    cop_names - %w[RSpec/Cop]
   end
 
   let(:config_keys) do
-    cop_names + %w(AllCops)
+    cop_names + %w[AllCops]
   end
 
   def cop_configuration(config_key)

data/spec/rubocop/cop/rspec/cop_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe RuboCop::Cop::RSpec::Cop do
           }
         },
         'RSpec/FakeCop' => {
-          'Exclude' => %w(bar_spec.rb)
+          'Exclude' => %w[bar_spec.rb]
         }
       }
 

data/spec/rubocop/cop/rspec/described_class_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe RuboCop::Cop::RSpec::DescribedClass, :config do
   end
 
   context 'when SkipBlocks is not set' do
-    let(:cop_config) { Hash.new }
+    let(:cop_config) { {} }
 
     include_examples 'SkipBlocks disabled'
   end

data/spec/rubocop/cop/rspec/empty_example_group_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyExampleGroup, :config do
 
   context 'when a custom include method is specified' do
     let(:cop_config) do
-      { 'CustomIncludeMethods' => %w(it_has_special_behavior) }
+      { 'CustomIncludeMethods' => %w[it_has_special_behavior] }
     end
 
     it 'does not flag an otherwise empty example group' do

data/spec/rubocop/cop/rspec/example_wording_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
   context 'with configuration' do
     let(:cop_config) do
       {
-        'CustomTransform' => { 'have' => 'has', 'not' => 'does not' },
-        'IgnoredWords'    => %w(only really)
+        'CustomTransform' => { 'have' => 'has' },
+        'IgnoredWords'    => %w[only really]
       }
     end
 
@@ -37,6 +37,22 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
       RUBY
     end
 
+    it 'flags a lone should' do
+      expect_violation(<<-RUBY)
+        it 'should' do
+            ^^^^^^ Do not use should when describing your tests.
+        end
+      RUBY
+    end
+
+    it 'flags a lone should not' do
+      expect_violation(<<-RUBY)
+        it 'should not' do
+            ^^^^^^^^^^ Do not use should when describing your tests.
+        end
+      RUBY
+    end
+
     it 'finds leading its' do
       expect_violation(<<-RUBY)
         it "it does something" do
@@ -59,13 +75,36 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
       RUBY
     end
 
+    it 'skips descriptions starting with words that begin with `should`' do
+      expect_no_violations(<<-RUBY)
+        it 'shoulders the burden' do
+        end
+      RUBY
+    end
+
     include_examples 'autocorrect',
                      'it "should only have trait" do end',
                      'it "only has trait" do end'
 
+    include_examples 'autocorrect',
+                     'it "SHOULDN\'T only have trait" do end',
+                     'it "DOES NOT only have trait" do end'
+
     include_examples 'autocorrect',
                      'it "it does something" do end',
                      'it "does something" do end'
+
+    include_examples 'autocorrect',
+                     'it "It does something" do end',
+                     'it "does something" do end'
+
+    include_examples 'autocorrect',
+                     'it "should" do end',
+                     'it "" do end'
+
+    include_examples 'autocorrect',
+                     'it "should not" do end',
+                     'it "does not" do end'
   end
 
   context 'when configuration is empty' do

data/spec/rubocop/cop/rspec/iterated_expectation_spec.rb

@@ -59,6 +59,14 @@ RSpec.describe RuboCop::Cop::RSpec::IteratedExpectation do
     RUBY
   end
 
+  it 'ignores assignments in the iteration' do
+    expect_no_violations(<<-RUBY)
+      it 'validates users' do
+        [user1, user2, user3].each { |user| array = array.concat(user) }
+      end
+    RUBY
+  end
+
   it 'ignores `each` when there is a negative expectation' do
     expect_no_violations(<<-RUBY)
       it 'validates users' do

data/spec/rubocop/cop/rspec/multiple_expectations_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe RuboCop::Cop::RSpec::MultipleExpectations, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'without configuration' do
-    let(:cop_config) { Hash.new }
+    let(:cop_config) { {} }
 
     it 'flags multiple expectations' do
       expect_violation(<<-RUBY)

data/spec/rubocop/cop/rspec/single_argument_message_chain_spec.rb

@@ -47,6 +47,45 @@ RSpec.describe RuboCop::Cop::RSpec::SingleArgumentMessageChain do
         end
       RUBY
     end
+
+    context 'with single-key hash argument' do
+      it 'reports an offence' do
+        expect_violation(<<-RUBY)
+          before do
+            allow(foo).to receive_message_chain(bar: 42)
+                          ^^^^^^^^^^^^^^^^^^^^^ Use `receive` instead of calling `receive_message_chain` with a single argument.
+          end
+        RUBY
+      end
+
+      include_examples(
+        'autocorrect',
+        'before { allow(foo).to receive_message_chain(bar: 42) }',
+        'before { allow(foo).to receive(:bar).and_return(42) }'
+      )
+
+      include_examples(
+        'autocorrect',
+        'before { allow(foo).to receive_message_chain("bar" => 42) }',
+        'before { allow(foo).to receive("bar").and_return(42) }'
+      )
+
+      include_examples(
+        'autocorrect',
+        'before { allow(foo).to receive_message_chain(:"#{foo}" => 42) }',
+        'before { allow(foo).to receive(:"#{foo}").and_return(42) }'
+      )
+    end
+
+    context 'with multiple keys hash argument' do
+      it "doesn't report an offence" do
+        expect_no_violations(<<-RUBY)
+          before do
+            allow(foo).to receive_message_chain(bar: 42, baz: 42)
+          end
+        RUBY
+      end
+    end
   end
 
   describe 'stub_chain' do

data/spec/rubocop/rspec/example_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe RuboCop::RSpec::Example do
 
   it 'extracts implementation' do
     expect(example('it("foo") { bar; baz }').implementation)
-      .to eql(s(:begin, s(:send, nil, :bar), s(:send, nil, :baz)))
+      .to eq(s(:begin, s(:send, nil, :bar), s(:send, nil, :baz)))
   end
 
   it 'returns node' do

data/spec/rubocop/rspec/language/selector_set_spec.rb

@@ -1,14 +1,14 @@
 RSpec.describe RuboCop::RSpec::Language::SelectorSet do
-  subject(:selector_set) { described_class.new(%i(foo bar)) }
+  subject(:selector_set) { described_class.new(%i[foo bar]) }
 
   it 'composes sets' do
-    combined = selector_set + described_class.new(%i(baz))
+    combined = selector_set + described_class.new(%i[baz])
 
-    expect(combined).to eq(described_class.new(%i(foo bar baz)))
+    expect(combined).to eq(described_class.new(%i[foo bar baz]))
   end
 
   it 'compares by value' do
-    expect(selector_set).not_to eq(described_class.new(%i(foo bar baz)))
+    expect(selector_set).not_to eq(described_class.new(%i[foo bar baz]))
   end
 
   context '#include?' do

data/spec/rubocop/rspec/wording_spec.rb

@@ -1,11 +1,6 @@
 RSpec.describe RuboCop::RSpec::Wording do
-  let(:replacements) do
-    { 'have' => 'has', 'not' => 'does not' }
-  end
-
-  let(:ignores) do
-    %w(only really)
-  end
+  let(:replacements) { { 'have' => 'has' } }
+  let(:ignores)      { %w[only really]     }
 
   expected_rewrites =
     {
@@ -26,7 +21,18 @@ RSpec.describe RuboCop::RSpec::Wording do
       'should search the internet'         => 'searches the internet',
       'should wish me luck'                => 'wishes me luck',
       'should really only return one item' => 'really only returns one item',
-      "shouldn't return something"         => 'does not return something'
+      "shouldn't return something"         => 'does not return something',
+      'SHOULD RETAIN UPPERCASE'            => 'RETAINS UPPERCASE',
+      "shouldn't be true"                  => 'is not true',
+      "SHOULDN'T BE true"                  => 'IS NOT true',
+      "SHOULDN'T NOT RETAIN UPPERCASE"     => 'DOES NOT NOT RETAIN UPPERCASE',
+      'should WORRY'                       => 'WORRIES',
+      'should WISH me luck'                => 'WISHES me luck',
+      ''                                   => '',
+      'should'                             => '',
+      "shouldn't"                          => 'does not',
+      'should not'                         => 'does not',
+      'should fizz'                        => 'fizzes'
     }
 
   expected_rewrites.each do |old, new|

data/spec/support/expect_violation.rb

@@ -39,13 +39,14 @@ module ExpectViolation
   end
 
   class Expectation
+    include Adamantium
+    include Concord.new(:string)
+
     VIOLATION_LINE_PATTERN = /\A *\^/
 
     VIOLATION = :violation
     SOURCE    = :line
 
-    include Adamantium, Concord.new(:string)
-
     def source
       source_map.to_s
     end
@@ -117,6 +118,10 @@ module ExpectViolation
     end
 
     class Assertion
+      include Adamantium
+      include Anima.new(:message, :column_range, :line_number)
+      include Comparable
+
       def self.parse(text:, line_number:)
         parser = Parser.new(text)
 
@@ -127,10 +132,6 @@ module ExpectViolation
         )
       end
 
-      include Anima.new(:message, :column_range, :line_number),
-              Adamantium,
-              Comparable
-
       def <=>(other)
         to_a <=> other.to_a
       end
@@ -142,9 +143,10 @@ module ExpectViolation
       end
 
       class Parser
-        COLUMN_PATTERN = /^ *(?<carets>\^\^*) (?<message>.+)$/
+        include Adamantium
+        include Concord.new(:text)
 
-        include Concord.new(:text), Adamantium
+        COLUMN_PATTERN = /^ *(?<carets>\^\^*) (?<message>.+)$/
 
         def column_range
           Range.new(*match.offset(:carets), true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Code style checking for RSpec files