garfield/wpscan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses Pathname#join rather than File#join when possible

Browse Source
This commit is contained in:
erwanlr
2019-02-11 19:30:49 +00:00
parent cdc1dab4a6
commit 7a0f98b2cb
64 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/lib/browser_spec.rb
View File

@@ -5,7 +5,7 @@ describe WPScan::Browser do
describe '#user_agents_list' do
context 'when not set' do
its(:user_agents_list) { should eql File.join(WPScan::DB_DIR, 'user-agents.txt') }
its(:user_agents_list) { should eql WPScan::DB_DIR.join('user-agents.txt').to_s }
end
context 'when set' do

8
spec/lib/finders/dynamic_finder/plugin_version_spec.rb
View File

@@ -32,7 +32,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
subject(:finder) { described_class.new(plugin) }
let(:plugin) { WPScan::Plugin.new(slug, target) }
let(:target) { WPScan::Target.new('http://wp.lab/') }
let(:fixtures) { File.join(DYNAMIC_FINDERS_FIXTURES, 'plugin_version') }
let(:fixtures) { DYNAMIC_FINDERS_FIXTURES.join('plugin_version') }
let(:expected) do
if expected_all[slug][finder_class].is_a?(Hash)
@@ -62,7 +62,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
context 'when the version is detected' do
let(:stubbed_response) do
df_stubbed_response(
File.join(fixtures, "#{finder_super_class.underscore}_passive_all.html"),
fixtures.join("#{finder_super_class.underscore}_passive_all.html"),
finder_super_class
)
end
@@ -95,7 +95,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
end
describe '#aggressive' do
let(:fixtures) { File.join(super(), slug, finder_class.underscore) }
let(:fixtures) { super().join(slug, finder_class.underscore) }
before do
expect(target).to receive(:content_dir).at_least(1).and_return('wp-content')
@@ -106,7 +106,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
if config['path']
context 'when the version is detected' do
let(:stubbed_response) do
df_stubbed_response(File.join(fixtures, config['path']), finder_super_class)
df_stubbed_response(fixtures.join(config['path']), finder_super_class)
end
it 'returns the expected version' do

8
spec/lib/finders/dynamic_finder/wp_version_spec.rb
View File

@@ -14,7 +14,7 @@ WPScan::DB::DynamicFinders::Wordpress.versions_finders_configs.each do |finder_c
describe df_tested_class_constant('WpVersion', finder_class) do
subject(:finder) { described_class.new(target) }
let(:target) { WPScan::Target.new('http://wp.lab/') }
let(:fixtures) { File.join(DYNAMIC_FINDERS_FIXTURES, 'wp_version') }
let(:fixtures) { DYNAMIC_FINDERS_FIXTURES.join('wp_version') }
let(:expected) do
expected_all[finder_class].is_a?(Hash) ? [expected_all[finder_class]] : expected_all[finder_class]
@@ -35,7 +35,7 @@ WPScan::DB::DynamicFinders::Wordpress.versions_finders_configs.each do |finder_c
context 'when no PATH' do
let(:stubbed_response) do
df_stubbed_response(
File.join(fixtures, "#{finder_super_class.underscore}_passive_all.html"),
fixtures.join("#{finder_super_class.underscore}_passive_all.html"),
finder_super_class
)
end
@@ -61,7 +61,7 @@ WPScan::DB::DynamicFinders::Wordpress.versions_finders_configs.each do |finder_c
end
describe '#aggressive' do
let(:fixtures) { File.join(super(), finder_class.underscore) }
let(:fixtures) { super().join(finder_class.underscore) }
before do
allow(target).to receive(:sub_dir).and_return(nil)
@@ -72,7 +72,7 @@ WPScan::DB::DynamicFinders::Wordpress.versions_finders_configs.each do |finder_c
if config['path']
context 'when the version is detected' do
let(:stubbed_response) do
df_stubbed_response(File.join(fixtures, config['path']), finder_super_class)
df_stubbed_response(fixtures.join(config['path']), finder_super_class)
end
it 'returns the expected version' do