rubocop-discourse 2.3.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954b3ae3f59036a9880d2d055c37e97e5bbc0d454207638cc390efb41cfde649
-  data.tar.gz: 7b5607256ae2d3190a9d7d1ef7d95f73deb23964139a8a10c3fb628663912d96
+  metadata.gz: a72b547f01dafa6cb189e9bfa4478817b6235ae725707b36e4b7f692351c3707
+  data.tar.gz: 2bfc96ac97e72886e781ddf5bc94f38c04a6f7ce45946dea2823f35d8db8e798
 SHA512:
-  metadata.gz: 4916ff3fcd7569705f59ced1716acbbeec52d763eff392e6eb148d5bc72d4fe6cff5644a0dfedc89353b4f856d77e609159d178b2b2d9643f904bed88d59cb4a
-  data.tar.gz: 8c1a20229b96ef6b69085147c95c5b799c6f7c9b0d38e8dc63c5cb5dc07931a332c231771f45fe656bd03c563fd3fa85f8f1c2bf79d9d64ad96415ce6ce764e3
+  metadata.gz: cbcd4c1f22751539ee6a1c9550a08170d91f92b26e7098362bcf3039f0d3658b5df789c72b947e857fa38ba7523ca53b5061feff1b9bd6135940db61ce6baef6
+  data.tar.gz: 1f1d6460703cf74e03ce57ac50deed273f7a1a0f2df3d8a1ab9d6a9d0ec18aa53be63ad442c79dd08cfbf664811ea79caa02ae65127b23ae78a14c1c8721d71f

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
@@ -29,7 +28,7 @@ jobs:
 
       - name: Rubocop
         run: bundle exec rubocop
-      
+
       - name: Rspec
         run: bundle exec rspec spec
 
@@ -42,6 +41,6 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Release Gem
-        uses: CvX/publish-rubygems-action@master
+        uses: discourse/publish-rubygems-action@main
         env:
           RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/.gitignore

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

data/default.yml

@@ -15,6 +15,7 @@ AllCops:
     - "**/node_modules/**/*"
     - "public/**/*"
     - "plugins/**/gems/**/*"
+    - "plugins/**/vendor/**/*"
 
 Discourse:
   Enabled: true

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

@@ -4,15 +4,20 @@ module RuboCop
   module Cop
     module Discourse
       class NoMockingJobs < Cop
-        MSG = "Use the test helpers provided by Sidekiq instead of mocking `Jobs`."
+        MSG = "Use the test helpers provided by Sidekiq instead of mocking `Jobs.expects(:enqueue)`."
 
-        def_node_matcher :mocking_jobs?, <<~MATCHER
-        (send (const nil? :Jobs) :expects ...)
+        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)
-          return unless mocking_jobs?(node)
-          add_offense(node, message: MSG)
+          if mocking_jobs_enqueue?(node) || mocking_jobs_enqueue_in?(node)
+            add_offense(node, message: MSG)
+          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.3.0"
+  s.version     = "2.4.2"
   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_spec.rb → no_mocking_jobs_enqueue_spec.rb}

@@ -9,7 +9,7 @@ describe RuboCop::Cop::Discourse::NoMockingJobs, :config do
     RuboCop::Config.new
   end
 
-  it "raises an offense if Jobs is mocked" do
+  it "raises an offense if Jobs is mocked with :enqueue" do
     inspect_source(<<~RUBY)
     Jobs.expects(:enqueue)
     RUBY
@@ -17,7 +17,15 @@ describe RuboCop::Cop::Discourse::NoMockingJobs, :config do
     expect(cop.offenses.first.message).to eq(described_class::MSG)
   end
 
-  it "does not raise an offense if Jobs is not mocked" do
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.2
 platform: ruby
 authors:
 - David Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2021-06-07 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
@@ -99,10 +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_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: {}