rubocop-betterment 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a8e6e836b70797730769203cc1f58e341cce95e
-  data.tar.gz: d28f3bc8399c4778f7e29cf0815c44808951ede9
+  metadata.gz: fe0109185da03f1c923006903de0336b09941de2
+  data.tar.gz: f7ce1a98024ba65910f624b84d4e316f47975ed6
 SHA512:
-  metadata.gz: 2b605a6a49483f80ae71a00540075adc516e4478c9bd4ff8f28e2b258201a484445044cf01953f36cd73c215b544abf40b99ac3a0c01bdd5f195d21602effb1d
-  data.tar.gz: b8081a6defeb7207bd158934c762965be285e6db38b25cf620c956f0fe997875bdee136648760482dffa592ba38338194954ca095321fe409377fa56787e8bd6
+  metadata.gz: 60cffaab104cc7bcb8ac220073ed67a2c32b1f64758dafae509220ec6b213d40489a31c64c1a6bc0231242578a1fa1c70a8ef3288299d162f095b7c6ad6ed952
+  data.tar.gz: 08795fe114125cfa3dcc398756097394505393f85713be356847571608cf6e8612ff212e50541667bdc3688aed86643025948c83f80ff3706d35422b043deb1a

data/config/default.yml

@@ -1,7 +1,8 @@
 # please keep this file alphabetically ordered!
 
-require: rubocop/cop/betterment
-require: rubocop-rspec
+require:
+  - rubocop/cop/betterment.rb
+  - rubocop-rspec
 
 AllCops:
   Exclude:
@@ -17,6 +18,11 @@ AllCops:
   DisplayStyleGuide: true
   DisplayCopNames: true
 
+Betterment/SitePrismLoaded:
+  Include:
+    - 'spec/features/**/*_spec.rb'
+    - 'spec/system/**/*_spec.rb'
+
 Capybara/FeatureMethods:
   Enabled: false
 

data/lib/rubocop/cop/betterment/site_prism_loaded.rb

@@ -0,0 +1,25 @@
+module RuboCop
+  module Cop
+    module Betterment
+      class SitePrismLoaded < Cop
+        MSG = 'Use `be_loaded` instead of `be_displayed`'.freeze
+
+        def_node_matcher :be_displayed_call?, <<-PATTERN
+          (send (send nil? :expect _) _ (send nil? :be_displayed))
+        PATTERN
+
+        def on_send(node)
+          return unless be_displayed_call?(node)
+
+          add_offense(node, location: node.children[2].loc.expression)
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.children[2].loc.expression, 'be_loaded')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/betterment/timeout.rb

@@ -4,13 +4,14 @@ module RuboCop
       class Timeout < Cop
         MSG = 'Using Timeout.timeout without a custom exception can prevent rescue blocks from executing'.freeze
 
+        def_node_matcher :timeout_call?, <<-PATTERN
+          (send (const nil? :Timeout) :timeout _)
+        PATTERN
+
         def on_send(node)
-          target_receiver = s(:const, nil, :Timeout)
-          target_method = :timeout
+          return unless timeout_call?(node)
 
-          if node.receiver == target_receiver && node.method_name == target_method && node.arguments.one?
-            add_offense(node, location: node.source_range)
-          end
+          add_offense(node)
         end
       end
     end

data/lib/rubocop/cop/betterment.rb

@@ -1,2 +1,4 @@
+require 'rubocop'
 require 'rubocop/cop/betterment/timeout'
 require 'rubocop/cop/betterment/memoization_with_arguments'
+require 'rubocop/cop/betterment/site_prism_loaded'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-betterment
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Development
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -92,6 +92,7 @@ files:
 - config/default.yml
 - lib/rubocop/cop/betterment.rb
 - lib/rubocop/cop/betterment/memoization_with_arguments.rb
+- lib/rubocop/cop/betterment/site_prism_loaded.rb
 - lib/rubocop/cop/betterment/timeout.rb
 homepage: 
 licenses: