From fa3005f2b7b65b4aabe4031ff4ddddd101f30af6 Mon Sep 17 00:00:00 2001 From: erwanlr Date: Fri, 29 Jan 2021 11:56:04 +0100 Subject: [PATCH] Updates rubocop dep --- .rubocop.yml | 1 + app/controllers/core.rb | 2 +- app/models/timthumb.rb | 2 +- spec/app/controllers/vuln_api_spec.rb | 2 +- spec/app/models/plugin_spec.rb | 2 +- spec/app/models/theme_spec.rb | 2 +- spec/lib/db/vuln_api_spec.rb | 2 +- spec/shared_examples/views/vuln_api.rb | 6 +++--- wpscan.gemspec | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 914d691e..26aa4123 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,7 @@ require: rubocop-performance AllCops: NewCops: enable + SuggestExtensions: false TargetRubyVersion: 2.5 Exclude: - '*.gemspec' diff --git a/app/controllers/core.rb b/app/controllers/core.rb index d61b6641..af226ae4 100644 --- a/app/controllers/core.rb +++ b/app/controllers/core.rb @@ -39,7 +39,7 @@ module WPScan output('@notice', msg: 'It seems like you have not updated the database for some time.') print '[?] Do you want to update now? [Y]es [N]o, default: [N]' - /^y/i.match?(Readline.readline) ? true : false + /^y/i.match?(Readline.readline) end def update_db diff --git a/app/models/timthumb.rb b/app/models/timthumb.rb index 5adee0df..08eaa16a 100644 --- a/app/models/timthumb.rb +++ b/app/models/timthumb.rb @@ -63,7 +63,7 @@ module WPScan def webshot_enabled? res = Browser.get(url, params: { webshot: 1, src: "http://#{default_allowed_domains.sample}" }) - /WEBSHOT_ENABLED == true/.match?(res.body) ? false : true + !/WEBSHOT_ENABLED == true/.match?(res.body) end # @return [ Array ] The default allowed domains (between the 2.0 and 2.8.13) diff --git a/spec/app/controllers/vuln_api_spec.rb b/spec/app/controllers/vuln_api_spec.rb index 08f609a3..bd9178f8 100644 --- a/spec/app/controllers/vuln_api_spec.rb +++ b/spec/app/controllers/vuln_api_spec.rb @@ -7,7 +7,7 @@ describe WPScan::Controller::VulnApi do before do WPScan::ParsedCli.options = rspec_parsed_options(cli_args) - WPScan::DB::VulnApi.instance_variable_set(:'@default_request_params', nil) + WPScan::DB::VulnApi.instance_variable_set(:@default_request_params, nil) end describe '#cli_options' do diff --git a/spec/app/models/plugin_spec.rb b/spec/app/models/plugin_spec.rb index 051ba705..b1254aeb 100644 --- a/spec/app/models/plugin_spec.rb +++ b/spec/app/models/plugin_spec.rb @@ -172,7 +172,7 @@ describe WPScan::Model::Plugin do after do expect(plugin.vulnerabilities).to eq @expected - expect(plugin.vulnerable?).to eql @expected.empty? ? false : true + expect(plugin.vulnerable?).to eql !@expected.empty? end context 'when plugin not in the DB' do diff --git a/spec/app/models/theme_spec.rb b/spec/app/models/theme_spec.rb index 7ea6c0de..a7caabf3 100644 --- a/spec/app/models/theme_spec.rb +++ b/spec/app/models/theme_spec.rb @@ -200,7 +200,7 @@ describe WPScan::Model::Theme do after do expect(theme.vulnerabilities).to eq @expected - expect(theme.vulnerable?).to eql @expected.empty? ? false : true + expect(theme.vulnerable?).to eql !@expected.empty? end context 'when theme not in the DB' do diff --git a/spec/lib/db/vuln_api_spec.rb b/spec/lib/db/vuln_api_spec.rb index 15c1be0e..a9d69e91 100644 --- a/spec/lib/db/vuln_api_spec.rb +++ b/spec/lib/db/vuln_api_spec.rb @@ -12,7 +12,7 @@ describe WPScan::DB::VulnApi do before do # Reset the default_request_params - api.instance_variable_set(:'@default_request_params', nil) + api.instance_variable_set(:@default_request_params, nil) end describe '#uri' do diff --git a/spec/shared_examples/views/vuln_api.rb b/spec/shared_examples/views/vuln_api.rb index 4150708d..699b37b8 100644 --- a/spec/shared_examples/views/vuln_api.rb +++ b/spec/shared_examples/views/vuln_api.rb @@ -32,7 +32,7 @@ shared_examples 'App::Views::VulnApi' do it 'outputs the expected string' do @tpl_vars = tpl_vars.merge( - status: { 'success': true, 'plan' => 'free', 'requests_remaining' => 0 }, + status: { success: true, 'plan' => 'free', 'requests_remaining' => 0 }, api_requests: 3 ) end @@ -43,7 +43,7 @@ shared_examples 'App::Views::VulnApi' do it 'outputs the expected string' do @tpl_vars = tpl_vars.merge( - status: { 'success': true, 'plan' => 'paid', 'requests_remaining' => 120 }, + status: { success: true, 'plan' => 'paid', 'requests_remaining' => 120 }, api_requests: 3 ) end @@ -54,7 +54,7 @@ shared_examples 'App::Views::VulnApi' do it 'outputs the expected string' do @tpl_vars = tpl_vars.merge( - status: { 'success': true, 'plan' => 'enterprise', 'requests_remaining' => 'Unlimited' }, + status: { success: true, 'plan' => 'enterprise', 'requests_remaining' => 'Unlimited' }, api_requests: 3 ) end diff --git a/wpscan.gemspec b/wpscan.gemspec index 9abdee8b..d4cd6449 100644 --- a/wpscan.gemspec +++ b/wpscan.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.10.0' s.add_development_dependency 'rspec-its', '~> 1.3.0' - s.add_development_dependency 'rubocop', '~> 1.8.0' + s.add_development_dependency 'rubocop', '~> 1.9.0' s.add_development_dependency 'rubocop-performance', '~> 1.9.0' s.add_development_dependency 'simplecov', '~> 0.21.0' s.add_development_dependency 'simplecov-lcov', '~> 0.8.0'