rubocop-discourse 2.2.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4393a2ad64c2662ce3c1dcdb1608501b93b6c13bc31b9a7a2a25b2c8a1404e89
-  data.tar.gz: eabd1def336f6290d8a694c209256827585b4a28baa2f0a84fa74f65cfc76f07
+  metadata.gz: 50836476c0589b9ca8acc327ce038e96e0e2896ad1facad4c91d389205aaffca
+  data.tar.gz: 42ed42e6fc27220ce081eb59855e72e5397c13aee5763c839777d7cd8172ea61
 SHA512:
-  metadata.gz: 40a5a38b088a3ab91c3a155ab4a2bcf78ed44ecd62a4fc98ccbf2b21cba5aac0d6d906b460e5be293f48dace6be3295d73841b0c147f9c4296002b094971d95b
-  data.tar.gz: 72b08959eb26c04941c3fc972a3d9725f6465355f02c0fb1913dfa7826a76ca42ad716327a1a40ea541eebadbfc01715783dc2467fa255d204cff7d09c36f213
+  metadata.gz: 04e74b802d15a2d1c1b2de4e312748733ef1e586220aaf0769b1b9f6212c5fc1fa245c2f4213ec06ac0c2e3b78bfcc10a8ef26c1b84571cc54401c6e17b03531
+  data.tar.gz: 30496a225a1d441fdfb83e824b7f9f004131616b703ee14e11b9a51f4d6e6509b2fc714abe775da026d9081e4f08e2a91b87be35f652386302557560518b1a47

data/.github/workflows/ci.yml

@@ -19,7 +19,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: 2.6
-          architecture: 'x64'
 
       - name: Setup bundler
         run: gem install bundler

data/.gitignore

@@ -1,3 +1 @@
-.rubocop-http*
 Gemfile.lock
-.byebug_history

data/config/default.yml

@@ -44,3 +44,9 @@ Discourse/NoJsonParseResponse:
   Patterns:
   - _spec.rb
   - "(?:^|/)spec/"
+
+Discourse/NoMockingJobs:
+  Enabled: true
+  Patterns:
+  - _spec.rb
+  - "(?:^|/)spec/"

data/lib/rubocop/cop/discourse/no_mocking_jobs.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Discourse
+      class NoMockingJobs < Cop
+        MSG = "Use the test helpers provided by Sidekiq instead of mocking `Jobs.expects(:enqueue)`."
+
+        def_node_matcher :mocking_jobs_enqueue?, <<~MATCHER
+        (send (const nil? :Jobs) :expects (:sym :enqueue))
+        MATCHER
+
+        def_node_matcher :mocking_jobs_enqueue_in?, <<~MATCHER
+        (send (const nil? :Jobs) :expects (:sym :enqueue_in))
+        MATCHER
+
+        def on_send(node)
+          if mocking_jobs_enqueue?(node) || mocking_jobs_enqueue_in?(node)
+            add_offense(node, message: MSG)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/discourse/time_eq_matcher.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Discourse
-      # Use `time_eq` matcher with timestamps in specs.
+      # Use `eq_time` matcher with timestamps in specs.
       #
       # @example
       #   # bad
@@ -12,7 +12,7 @@ module RuboCop
       #   # good
       #   expect(user.created_at).to eq_time(Time.zone.now)
       class TimeEqMatcher < Cop
-        MSG = "Use time_eq when testing timestamps"
+        MSG = "Use eq_time when testing timestamps"
 
         def_node_matcher :using_eq_matcher_with_timestamp?, <<-MATCHER
           (send

data/rubocop-discourse.gemspec

@@ -2,15 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name        = "rubocop-discourse"
-  s.version     = "2.2.0"
+  s.version     = "2.4.1"
   s.summary     = "Custom rubocop cops used by Discourse"
   s.authors     = ["David Taylor"]
-  s.files       = `git ls-files`.split($/)
-  s.license       = "MIT"
+  s.license     = "MIT"
+  s.homepage    = "https://github.com/discourse/rubocop-discourse"
+
+  s.files = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rubocop", ">= 0.69.0"
-  s.add_runtime_dependency "rubocop-rspec", ">= 1.39.0"
+  s.add_runtime_dependency "rubocop", ">= 1.1.0"
+  s.add_runtime_dependency "rubocop-rspec", ">= 2.0.0"
 
   s.add_development_dependency "rake", "~> 13.0"
   s.add_development_dependency "rspec"

data/rubocop-rspec.yml

@@ -99,9 +99,6 @@ RSpec/InstanceSpy:
 RSpec/InstanceVariable:
   Enabled: false # TODO
 
-RSpec/InvalidPredicateMatcher:
-  Enabled: true
-
 RSpec/ItBehavesLike:
   Enabled: true
 
@@ -192,20 +189,20 @@ RSpec/VoidExpect:
 RSpec/Yield:
   Enabled: true
 
-Capybara/CurrentPathExpectation:
+RSpec/Capybara/CurrentPathExpectation:
   Enabled: true
 
-Capybara/FeatureMethods:
+RSpec/Capybara/FeatureMethods:
   Enabled: true
 
-FactoryBot/AttributeDefinedStatically:
+RSpec/FactoryBot/AttributeDefinedStatically:
   Enabled: true
 
-FactoryBot/CreateList:
+RSpec/FactoryBot/CreateList:
   Enabled: true
 
-FactoryBot/FactoryClassName:
+RSpec/FactoryBot/FactoryClassName:
   Enabled: true
 
-Rails/HttpStatus:
+RSpec/Rails/HttpStatus:
   Enabled: true

data/spec/lib/rubocop/cop/no_mocking_jobs_enqueue_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Discourse::NoMockingJobs, :config do
+  subject(:cop) { described_class.new(config) }
+
+  let(:config) do
+    RuboCop::Config.new
+  end
+
+  it "raises an offense if Jobs is mocked with :enqueue" do
+    inspect_source(<<~RUBY)
+    Jobs.expects(:enqueue)
+    RUBY
+
+    expect(cop.offenses.first.message).to eq(described_class::MSG)
+  end
+
+  it "raises an offense if Jobs is mocked with :enqueue_in" do
+    inspect_source(<<~RUBY)
+    Jobs.expects(:enqueue_in)
+    RUBY
+
+    expect(cop.offenses.first.message).to eq(described_class::MSG)
+  end
+
+  it "does not raise an offense if Jobs is not mocked with :enqueue or :enqueue_in" do
+    inspect_source(<<~RUBY)
+    Jobs.enqueue(:some_job)
+    RUBY
+
+    expect(cop.offenses).to eq([])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.1
 platform: ruby
 authors:
 - David Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.69.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.69.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,7 @@ files:
 - lib/rubocop/cop/discourse/no_chdir.rb
 - lib/rubocop/cop/discourse/no_direct_multisite_manipulation.rb
 - lib/rubocop/cop/discourse/no_json_parse_response.rb
+- lib/rubocop/cop/discourse/no_mocking_jobs.rb
 - lib/rubocop/cop/discourse/no_nokogiri_html_fragment.rb
 - lib/rubocop/cop/discourse/no_reset_column_information_in_migrations.rb
 - lib/rubocop/cop/discourse/no_time_new_without_args.rb
@@ -98,9 +99,10 @@ files:
 - rubocop-discourse.gemspec
 - rubocop-rspec.yml
 - spec/lib/rubocop/cop/no_add_reference_active_record_migrations_spec.rb
+- spec/lib/rubocop/cop/no_mocking_jobs_enqueue_spec.rb
 - spec/lib/rubocop/cop/no_reset_column_information_migrations_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage: https://github.com/discourse/rubocop-discourse
 licenses:
 - MIT
 metadata: {}