Moves Models into their own namespace - Ref #1315
This commit is contained in:
@@ -30,7 +30,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
|
||||
# If someone find a fix for that, please share!
|
||||
describe df_tested_class_constant('PluginVersion', finder_class, slug), slow: true do
|
||||
subject(:finder) { described_class.new(plugin) }
|
||||
let(:plugin) { WPScan::Plugin.new(slug, target) }
|
||||
let(:plugin) { WPScan::Model::Plugin.new(slug, target) }
|
||||
let(:target) { WPScan::Target.new('http://wp.lab/') }
|
||||
let(:fixtures) { DYNAMIC_FINDERS_FIXTURES.join('plugin_version') }
|
||||
|
||||
@@ -75,7 +75,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
|
||||
found.each_with_index do |version, index|
|
||||
expected_version = expected.at(index)
|
||||
|
||||
expect(version).to be_a WPScan::Version
|
||||
expect(version).to be_a WPScan::Model::Version
|
||||
expect(version.number).to eql expected_version['number'].to_s
|
||||
expect(version.found_by).to eql expected_version['found_by']
|
||||
expect(version.interesting_entries).to match_array expected_version['interesting_entries']
|
||||
@@ -117,7 +117,7 @@ WPScan::DB::DynamicFinders::Plugin.versions_finders_configs.each do |slug, confi
|
||||
found.each_with_index do |version, index|
|
||||
expected_version = expected.at(index)
|
||||
|
||||
expect(version).to be_a WPScan::Version
|
||||
expect(version).to be_a WPScan::Model::Version
|
||||
expect(version.number).to eql expected_version['number'].to_s
|
||||
expect(version.found_by).to eql expected_version['found_by']
|
||||
expect(version.interesting_entries).to match_array expected_version['interesting_entries']
|
||||
|
||||
@@ -48,7 +48,7 @@ WPScan::DB::DynamicFinders::Wordpress.versions_finders_configs.each do |finder_c
|
||||
found.each_with_index do |version, index|
|
||||
expected_version = expected.at(index)
|
||||
|
||||
expect(version).to be_a WPScan::WpVersion
|
||||
expect(version).to be_a WPScan::Model::WpVersion
|
||||
expect(version.number).to eql expected_version['number'].to_s
|
||||
expect(version.found_by).to eql expected_version['found_by']
|
||||
expect(version.interesting_entries).to match_array expected_version['interesting_entries']
|
||||
@@ -83,7 +83,7 @@ WPScan::DB::DynamicFinders::Wordpress.versions_finders_configs.each do |finder_c
|
||||
found.each_with_index do |version, index|
|
||||
expected_version = expected.at(index)
|
||||
|
||||
expect(version).to be_a WPScan::WpVersion
|
||||
expect(version).to be_a WPScan::Model::WpVersion
|
||||
expect(version.number).to eql expected_version['number'].to_s
|
||||
expect(version.found_by).to eql expected_version['found_by']
|
||||
expect(version.interesting_entries).to match_array expected_version['interesting_entries']
|
||||
|
||||
@@ -18,14 +18,14 @@ describe WPScan::Target do
|
||||
end
|
||||
|
||||
context 'when interesting_findings' do
|
||||
let(:interesting_findings) { ['aa', CMSScanner::RobotsTxt.new(target.url)] }
|
||||
let(:interesting_findings) { ['aa', CMSScanner::Model::RobotsTxt.new(target.url)] }
|
||||
|
||||
context 'when no XMLRPC' do
|
||||
its(:xmlrpc) { should be_nil }
|
||||
end
|
||||
|
||||
context 'when XMLRPC' do
|
||||
let(:xmlrpc) { WPScan::XMLRPC.new(target.url('xmlrpc.php')) }
|
||||
let(:xmlrpc) { WPScan::Model::XMLRPC.new(target.url('xmlrpc.php')) }
|
||||
let(:interesting_findings) { super() << xmlrpc }
|
||||
|
||||
its(:xmlrpc) { should eq xmlrpc }
|
||||
@@ -81,13 +81,13 @@ describe WPScan::Target do
|
||||
|
||||
context 'when wp_version found' do
|
||||
context 'when not vulnerable' do
|
||||
before { target.instance_variable_set(:@wp_version, WPScan::WpVersion.new('4.4')) }
|
||||
before { target.instance_variable_set(:@wp_version, WPScan::Model::WpVersion.new('4.4')) }
|
||||
|
||||
it { should_not be_vulnerable }
|
||||
end
|
||||
|
||||
context 'when vulnerable' do
|
||||
before { target.instance_variable_set(:@wp_version, WPScan::WpVersion.new('3.8.1')) }
|
||||
before { target.instance_variable_set(:@wp_version, WPScan::Model::WpVersion.new('3.8.1')) }
|
||||
|
||||
it { should be_vulnerable }
|
||||
end
|
||||
@@ -95,7 +95,7 @@ describe WPScan::Target do
|
||||
|
||||
context 'when config_backups' do
|
||||
before do
|
||||
target.instance_variable_set(:@config_backups, [WPScan::ConfigBackup.new(target.url('/a-file-url'))])
|
||||
target.instance_variable_set(:@config_backups, [WPScan::Model::ConfigBackup.new(target.url('/a-file-url'))])
|
||||
end
|
||||
|
||||
it { should be_vulnerable }
|
||||
@@ -103,7 +103,7 @@ describe WPScan::Target do
|
||||
|
||||
context 'when db_exports' do
|
||||
before do
|
||||
target.instance_variable_set(:@db_exports, [WPScan::DbExport.new(target.url('/wordpress.sql'))])
|
||||
target.instance_variable_set(:@db_exports, [WPScan::Model::DbExport.new(target.url('/wordpress.sql'))])
|
||||
end
|
||||
|
||||
it { should be_vulnerable }
|
||||
@@ -111,7 +111,9 @@ describe WPScan::Target do
|
||||
|
||||
context 'when users' do
|
||||
before do
|
||||
target.instance_variable_set(:@users, [CMSScanner::User.new('u1'), CMSScanner::User.new('u2')])
|
||||
target.instance_variable_set(:@users,
|
||||
[WPScan::Model::User.new('u1'),
|
||||
WPScan::Model::User.new('u2')])
|
||||
end
|
||||
|
||||
context 'when no passwords' do
|
||||
|
||||
Reference in New Issue
Block a user