Moves Models into their own namespace - Ref #1315

spec/app/models/interesting_finding_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::InterestingFinding do
+describe WPScan::Model::InterestingFinding do
   it_behaves_like WPScan::References do
     subject(:finding) { described_class.new('http://e.org/file.php', opts) }
     let(:opts)        { { references: references } }

spec/app/models/media_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::Media do
+describe WPScan::Model::Media do
   subject(:media) { described_class.new(url) }
   let(:url)       { 'http://e.oeg/?attachment_id=2' }
 

spec/app/models/plugin_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::Plugin do
+describe WPScan::Model::Plugin do
   subject(:plugin) { described_class.new(slug, blog, opts) }
   let(:slug)       { 'spec' }
   let(:blog)       { WPScan::Target.new('http://wp.lab/') }
@@ -70,7 +70,7 @@ describe WPScan::Plugin do
     context 'when values' do
       let(:slug) { 'no-vulns-popular' }
 
-      its(:latest_version) { should eql WPScan::Version.new('2.0') }
+      its(:latest_version) { should eql WPScan::Model::Version.new('2.0') }
       its(:last_updated) { should eql '2015-05-16T00:00:00.000Z' }
       its(:popular?) { should be true }
     end
@@ -87,7 +87,12 @@ describe WPScan::Plugin do
       end
 
       context 'when version' do
-        before { expect(plugin).to receive(:version).at_least(1).and_return(WPScan::Version.new(version_number)) }
+        before do
+          expect(plugin)
+            .to receive(:version)
+            .at_least(1)
+            .and_return(WPScan::Model::Version.new(version_number))
+        end
 
         context 'when version < last_version' do
           let(:version_number) { '1.2' }
@@ -113,7 +118,12 @@ describe WPScan::Plugin do
       end
 
       context 'when version' do
-        before { expect(plugin).to receive(:version).at_least(1).and_return(WPScan::Version.new('1.0')) }
+        before do
+          expect(plugin)
+            .to receive(:version)
+            .at_least(1)
+            .and_return(WPScan::Model::Version.new('1.0'))
+        end
 
         its(:outdated?) { should eql false }
       end
@@ -166,7 +176,12 @@ describe WPScan::Plugin do
         end
 
         context 'when plugin version' do
-          before { expect(plugin).to receive(:version).at_least(1).and_return(WPScan::Version.new(number)) }
+          before do
+            expect(plugin)
+              .to receive(:version)
+              .at_least(1)
+              .and_return(WPScan::Model::Version.new(number))
+          end
 
           context 'when < to a fixed_in' do
             let(:number) { '5.0' }

spec/app/models/theme_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::Theme do
+describe WPScan::Model::Theme do
   subject(:theme)  { described_class.new(slug, blog, opts) }
   let(:slug)       { 'spec' }
   let(:blog)       { WPScan::Target.new('http://wp.lab/') }

spec/app/models/timthumb_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::Timthumb do
+describe WPScan::Model::Timthumb do
   subject(:timthumb) { described_class.new(url, opts) }
   let(:url)          { 'http://wp.lab/wp-content/timthumb.php' }
   let(:fixtures)     { FIXTURES.join('models', 'timthumb') }
@@ -86,7 +86,7 @@ describe WPScan::Timthumb do
     end
 
     context 'when version' do
-      let(:version) { WPScan::Version.new(version_number) }
+      let(:version) { WPScan::Model::Version.new(version_number) }
 
       context 'when version >= 2.8.14' do
         let(:version_number) { '2.8.14' }

spec/app/models/wp_item_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::WpItem do
+describe WPScan::Model::WpItem do
   subject(:wp_item)  { described_class.new(slug, blog, opts) }
   let(:slug)         { 'test_item' }
   let(:blog)         { WPScan::Target.new(url) }

spec/app/models/wp_version_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::WpVersion do
+describe WPScan::Model::WpVersion do
   describe '#new' do
     context 'when invalid number' do
       it 'raises an error' do

spec/app/models/xml_rpc_spec.rb

@@ -1,4 +1,4 @@
-describe WPScan::XMLRPC do
+describe WPScan::Model::XMLRPC do
   subject(:xml_rpc) { described_class.new('http//e.org/xmlrpc.php') }
 
   describe '#references' do