rubocop-rspec 1.32.0 → 1.33.0

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

@@ -11,6 +11,14 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterHook do
         it { does_something }
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        before { do_something }
+
+        it { does_something }
+      end
+    RUBY
   end
 
   it 'checks for empty line after `after` hook' do
@@ -21,6 +29,14 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterHook do
         it { does_something }
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        after { do_something }
+
+        it { does_something }
+      end
+    RUBY
   end
 
   it 'checks for empty line after `around` hook' do
@@ -31,6 +47,14 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterHook do
         it { does_something }
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        around { |test| test.run }
+
+        it { does_something }
+      end
+    RUBY
   end
 
   it 'approves empty line after `before` hook' do
@@ -106,23 +130,4 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterHook do
       end
     RUBY
   end
-
-  bad_example = <<-RUBY
-    RSpec.describe User do
-      before { do_something }
-      it { does_something }
-    end
-  RUBY
-
-  good_example = <<-RUBY
-    RSpec.describe User do
-      before { do_something }
-
-      it { does_something }
-    end
-  RUBY
-
-  include_examples 'autocorrect',
-                   bad_example,
-                   good_example
 end

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

@@ -11,6 +11,14 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterSubject do
         let(:params) { foo }
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        subject { described_class.new }
+
+        let(:params) { foo }
+      end
+    RUBY
   end
 
   it 'checks for empty line after subject!' do
@@ -21,6 +29,14 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterSubject do
         let(:params) { foo }
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        subject! { described_class.new }
+
+        let(:params) { foo }
+      end
+    RUBY
   end
 
   it 'approves empty line after subject' do
@@ -75,23 +91,4 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterSubject do
       end
     RUBY
   end
-
-  bad_example = <<-RUBY
-  RSpec.describe User do
-    subject { described_class.new }
-    let(:params) { foo }
-  end
-  RUBY
-
-  good_example = <<-RUBY
-  RSpec.describe User do
-    subject { described_class.new }
-
-    let(:params) { foo }
-  end
-  RUBY
-
-  include_examples 'autocorrect',
-                   bad_example,
-                   good_example
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::ExampleLength, :config do
   subject(:cop) { described_class.new(config) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::ExampleWithoutDescription, :config do
   subject(:cop) { described_class.new(config) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
   subject(:cop) { described_class.new(config) }
 
@@ -19,6 +21,11 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
             ^^^^^^^^^^^^^^^^^^^ Do not use should when describing your tests.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it 'does something' do
+        end
+      RUBY
     end
 
     it 'finds description with `Should` at the beginning' do
@@ -27,6 +34,11 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
             ^^^^^^^^^^^^^^^^^^^ Do not use should when describing your tests.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it 'does something' do
+        end
+      RUBY
     end
 
     it 'finds description with `shouldn\'t` at the beginning' do
@@ -35,6 +47,24 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
             ^^^^^^^^^^^^^^^^^^^^^^ Do not use should when describing your tests.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it "does not do something" do
+        end
+      RUBY
+    end
+
+    it 'finds description with `SHOULDN\'T` at the beginning' do
+      expect_offense(<<-RUBY)
+        it "SHOULDN'T do something" do
+            ^^^^^^^^^^^^^^^^^^^^^^ Do not use should when describing your tests.
+        end
+      RUBY
+
+      expect_correction(<<-RUBY)
+        it "DOES NOT do something" do
+        end
+      RUBY
     end
 
     it 'flags a lone should' do
@@ -43,6 +73,11 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
             ^^^^^^ Do not use should when describing your tests.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it '' do
+        end
+      RUBY
     end
 
     it 'flags a lone should not' do
@@ -51,6 +86,11 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
             ^^^^^^^^^^ Do not use should when describing your tests.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it 'does not' do
+        end
+      RUBY
     end
 
     it 'finds leading its' do
@@ -59,6 +99,11 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config do
             ^^^^^^^^^^^^^^^^^ Do not repeat 'it' when describing your tests.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it "does something" do
+        end
+      RUBY
     end
 
     it "skips words beginning with 'it'" do
@@ -81,30 +126,6 @@ RSpec.describe RuboCop::Cop::RSpec::ExampleWording, :config 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/expect_change_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::ExpectChange, :config do
   subject(:cop) { described_class.new(config) }
 
@@ -11,10 +13,16 @@ RSpec.describe RuboCop::Cop::RSpec::ExpectChange, :config do
     it 'finds blocks that contain simple message sending' do
       expect_offense(<<-RUBY)
         it do
-          expect(run).to change { User.count }
+          expect(run).to change { User.count }.by(1)
                          ^^^^^^^^^^^^^^^^^^^^^ Prefer `change(User, :count)`.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it do
+          expect(run).to change(User, :count).by(1)
+        end
+      RUBY
     end
 
     it 'ignores blocks that cannot be converted to obj/attribute pair' do
@@ -32,12 +40,6 @@ RSpec.describe RuboCop::Cop::RSpec::ExpectChange, :config do
         end
       RUBY
     end
-
-    include_examples(
-      'autocorrect',
-      'expect(run).to change { User.count }.by(1)',
-      'expect(run).to change(User, :count).by(1)'
-    )
   end
 
   context 'with EnforcedStyle `block`' do
@@ -46,10 +48,16 @@ RSpec.describe RuboCop::Cop::RSpec::ExpectChange, :config do
     it 'finds change matcher without block' do
       expect_offense(<<-RUBY)
         it do
-          expect(run).to change(User, :count)
+          expect(run).to change(User, :count).by(1)
                          ^^^^^^^^^^^^^^^^^^^^ Prefer `change { User.count }`.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it do
+          expect(run).to change { User.count }.by(1)
+        end
+      RUBY
     end
 
     it 'finds change matcher when receiver is a variable' do
@@ -59,6 +67,12 @@ RSpec.describe RuboCop::Cop::RSpec::ExpectChange, :config do
                          ^^^^^^^^^^^^^^^^^^^^ Prefer `change { user.count }`.
         end
       RUBY
+
+      expect_correction(<<-RUBY)
+        it do
+          expect(run).to change { user.count }
+        end
+      RUBY
     end
 
     it 'ignores methods called change' do
@@ -68,11 +82,5 @@ RSpec.describe RuboCop::Cop::RSpec::ExpectChange, :config do
         end
       RUBY
     end
-
-    include_examples(
-      'autocorrect',
-      'expect(run).to change(User, :count).by(1)',
-      'expect(run).to change { User.count }.by(1)'
-    )
   end
 end

data/spec/rubocop/cop/rspec/factory_bot/attribute_defined_statically_spec.rb

@@ -66,6 +66,21 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::AttributeDefinedStatically do #
     RUBY
   end
 
+  it 'registers an offense for attributes defined on explicit receiver' do
+    expect_offense(<<-RUBY)
+      FactoryBot.define do
+        factory :post do |post_definition|
+          post_definition.end Date.tomorrow
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use a block to declare attribute values.
+          post_definition.trait :published do |published_definition|
+            published_definition.published_at 1.day.from_now
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use a block to declare attribute values.
+          end
+        end
+      end
+    RUBY
+  end
+
   it 'accepts valid factory definitions' do
     expect_no_offenses(<<-RUBY)
       FactoryBot.define do
@@ -98,6 +113,27 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::AttributeDefinedStatically do #
     RUBY
   end
 
+  it 'does not add offense if method called on another object' do
+    expect_no_offenses(<<-RUBY)
+      FactoryBot.define do
+        factory :post do |post_definition|
+          Registrar.register :post_factory
+        end
+      end
+    RUBY
+  end
+
+  it 'does not add offense if method called on a local variable' do
+    expect_no_offenses(<<-RUBY)
+      FactoryBot.define do
+        factory :post do |post_definition|
+          local = Registrar
+          local.register :post_factory
+        end
+      end
+    RUBY
+  end
+
   it 'accepts valid association definitions' do
     expect_no_offenses(<<-RUBY)
       FactoryBot.define do

data/spec/rubocop/cop/rspec/factory_bot/create_list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::FactoryBot::CreateList, :config do
   subject(:cop) { described_class.new(config) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::FilePath, :config do
   subject(:cop) { described_class.new(config) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::Focus do
   subject(:cop) { described_class.new }
 
@@ -112,7 +114,6 @@ RSpec.describe RuboCop::Cop::RSpec::Focus do
     RUBY
   end
 
-  # rubocop:disable RSpec/ExampleLength
   it 'flags focused block types' do
     expect_offense(<<-RUBY)
       fdescribe 'test' do; end
@@ -135,5 +136,4 @@ RSpec.describe RuboCop::Cop::RSpec::Focus do
       ^^^^^^^^^^^^ Focused spec found.
     RUBY
   end
-  # rubocop:enable RSpec/ExampleLength
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::HookArgument, :config do
   subject(:cop) { described_class.new(config) }
 

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

@@ -1,58 +1,99 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::HooksBeforeExamples do
   subject(:cop) { described_class.new }
 
   it 'flags `before` after `it`' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
-        it { is_expected.to be_after_let }
+        it { is_expected.to be_after_before_hook }
         before { setup }
         ^^^^^^^^^^^^^^^^ Move `before` above the examples in the group.
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        before { setup }
+        it { is_expected.to be_after_before_hook }
+      end
+    RUBY
   end
 
   it 'flags `before` after `context`' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
         context 'a context' do
-          it { is_expected.to be_after_let }
+          it { is_expected.to be_after_before_hook }
         end
 
         before { setup }
         ^^^^^^^^^^^^^^^^ Move `before` above the examples in the group.
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        before { setup }
+        context 'a context' do
+          it { is_expected.to be_after_before_hook }
+        end
+
+      end
+    RUBY
   end
 
   it 'flags `before` after `include_examples`' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
-        include_examples('should be after let')
+        include_examples('should be after before-hook')
 
         before { setup }
         ^^^^^^^^^^^^^^^^ Move `before` above the examples in the group.
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        before { setup }
+        include_examples('should be after before-hook')
+
+      end
+    RUBY
   end
 
   it 'flags `after` after an example' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
-        it { is_expected.to be_after_let }
+        it { is_expected.to be_after_after_hook }
         after { cleanup }
         ^^^^^^^^^^^^^^^^^ Move `after` above the examples in the group.
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        after { cleanup }
+        it { is_expected.to be_after_after_hook }
+      end
+    RUBY
   end
 
   it 'flags scoped hook after an example' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
-        it { is_expected.to be_after_let }
+        it { is_expected.to be_after_before_hook }
         before(:each) { cleanup }
         ^^^^^^^^^^^^^^^^^^^^^^^^^ Move `before` above the examples in the group.
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      RSpec.describe User do
+        before(:each) { cleanup }
+        it { is_expected.to be_after_before_hook }
+      end
+    RUBY
   end
 
   it 'does not flag hooks before the examples' do
@@ -61,7 +102,7 @@ RSpec.describe RuboCop::Cop::RSpec::HooksBeforeExamples do
         before(:each) { setup }
         after(:each) { cleanup }
 
-        it { is_expected.to be_after_let }
+        it { is_expected.to be_after_hooks }
 
         context 'a context' do
           it { is_expected.to work }
@@ -106,30 +147,4 @@ RSpec.describe RuboCop::Cop::RSpec::HooksBeforeExamples do
       end
     RUBY
   end
-
-  bad_code = <<-RUBY
-    RSpec.describe User do
-      include_examples('should be after hook')
-      context 'another one' do
-        before { another_setup }
-        include_examples('should be ok')
-      end
-
-      after { cleanup }
-    end
-  RUBY
-
-  good_code = <<-RUBY
-    RSpec.describe User do
-      after { cleanup }
-      include_examples('should be after hook')
-      context 'another one' do
-        before { another_setup }
-        include_examples('should be ok')
-      end
-
-    end
-  RUBY
-
-  include_examples 'autocorrect', bad_code, good_code
 end