metasploit_data_models 1.0.0.pre.rails.pre.4.0b → 1.0.0

data/spec/app/models/mdm/task_host_spec.rb

@@ -1,25 +1,23 @@
-require 'spec_helper'
-
-describe Mdm::TaskHost do
+RSpec.describe Mdm::TaskHost, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       task_host = FactoryGirl.build(:mdm_task_host)
-      task_host.should be_valid
+      expect(task_host).to be_valid
     end
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
     end
 
     context 'columns' do
-      it { should have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:host_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer).with_options(:null => false) }
     end
   end
 
@@ -36,8 +34,8 @@ describe Mdm::TaskHost do
   end
 
   context "Associations" do
-    it { should belong_to(:task).class_name('Mdm::Task') }
-    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:task).class_name('Mdm::Task') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
   end
 
   context "validations" do
@@ -46,7 +44,7 @@ describe Mdm::TaskHost do
       host = FactoryGirl.build(:mdm_host)
       FactoryGirl.create(:mdm_task_host, :task => task, :host => host)
       task_host2 = FactoryGirl.build(:mdm_task_host, :task => task, :host => host)
-      task_host2.should_not be_valid
+      expect(task_host2).not_to be_valid
     end
   end
 end

data/spec/app/models/mdm/task_service_spec.rb

@@ -1,25 +1,23 @@
-require 'spec_helper'
-
-describe Mdm::TaskService do
+RSpec.describe Mdm::TaskService, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       task_service = FactoryGirl.build(:mdm_task_service)
-      task_service.should be_valid
+      expect(task_service).to be_valid
     end
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
     end
 
     context 'columns' do
-      it { should have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:service_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:service_id).of_type(:integer).with_options(:null => false) }
     end
   end
 
@@ -36,8 +34,8 @@ describe Mdm::TaskService do
   end
 
   context "Associations" do
-    it { should belong_to(:task).class_name('Mdm::Task') }
-    it { should belong_to(:service).class_name('Mdm::Service') }
+    it { is_expected.to belong_to(:task).class_name('Mdm::Task') }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
   end
 
   context "validations" do
@@ -46,7 +44,7 @@ describe Mdm::TaskService do
       service = FactoryGirl.build(:mdm_service)
       FactoryGirl.create(:mdm_task_service, :task => task, :service => service)
       task_service2 = FactoryGirl.build(:mdm_task_service, :task => task, :service => service)
-      task_service2.should_not be_valid
+      expect(task_service2).not_to be_valid
     end
   end
 end

data/spec/app/models/mdm/task_session_spec.rb

@@ -1,25 +1,23 @@
-require 'spec_helper'
-
-describe Mdm::TaskSession do
+RSpec.describe Mdm::TaskSession, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       task_session = FactoryGirl.build(:mdm_task_session)
-      task_session.should be_valid
+      expect(task_session).to be_valid
     end
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
     end
 
     context 'columns' do
-      it { should have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:session_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:session_id).of_type(:integer).with_options(:null => false) }
     end
   end
 
@@ -41,7 +39,7 @@ describe Mdm::TaskSession do
       session = FactoryGirl.build(:mdm_session)
       FactoryGirl.create(:mdm_task_session, :task => task, :session => session)
       task_session2 = FactoryGirl.build(:mdm_task_session, :task => task, :session => session)
-      task_session2.should_not be_valid
+      expect(task_session2).not_to be_valid
     end
   end
 

data/spec/app/models/mdm/task_spec.rb

@@ -1,36 +1,34 @@
-require 'spec_helper'
-
-describe Mdm::Task do
+RSpec.describe Mdm::Task, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       task = FactoryGirl.build(:mdm_task)
-      task.should be_valid
+      expect(task).to be_valid
     end
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:completed_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:completed_at).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
-      it { should have_db_column(:created_by).of_type(:string) }
-      it { should have_db_column(:module).of_type(:string) }
-      it { should have_db_column(:path).of_type(:string) }
-      it { should have_db_column(:info).of_type(:string) }
-      it { should have_db_column(:description).of_type(:string) }
-      it { should have_db_column(:progress).of_type(:integer) }
-      it { should have_db_column(:options).of_type(:text) }
-      it { should have_db_column(:error).of_type(:text) }
-      it { should have_db_column(:result).of_type(:text) }
-      it { should have_db_column(:module_uuid).of_type(:string) }
-      it { should have_db_column(:settings).of_type(:binary) }
+      it { is_expected.to have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
+      it { is_expected.to have_db_column(:created_by).of_type(:string) }
+      it { is_expected.to have_db_column(:module).of_type(:string) }
+      it { is_expected.to have_db_column(:path).of_type(:string) }
+      it { is_expected.to have_db_column(:info).of_type(:string) }
+      it { is_expected.to have_db_column(:description).of_type(:string) }
+      it { is_expected.to have_db_column(:progress).of_type(:integer) }
+      it { is_expected.to have_db_column(:options).of_type(:text) }
+      it { is_expected.to have_db_column(:error).of_type(:text) }
+      it { is_expected.to have_db_column(:result).of_type(:text) }
+      it { is_expected.to have_db_column(:module_uuid).of_type(:string) }
+      it { is_expected.to have_db_column(:settings).of_type(:binary) }
     end
   end
 
@@ -47,15 +45,15 @@ describe Mdm::Task do
   end
 
   context "Associations" do
-    it { should have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }
-    it { should have_many(:creds).class_name('Mdm::Cred').through(:task_creds) }
-    it { should have_many(:task_sessions).class_name('Mdm::TaskSession').dependent(:destroy) }
-    it { should have_many(:sessions).class_name('Mdm::Session').through(:task_sessions) }
-    it { should have_many(:task_hosts).class_name('Mdm::TaskHost').dependent(:destroy) }
-    it { should have_many(:hosts).class_name('Mdm::Host').through(:task_hosts) }
-    it { should have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
-    it { should have_many(:services).class_name('Mdm::Service').through(:task_services) }
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { is_expected.to have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }
+    it { is_expected.to have_many(:creds).class_name('Mdm::Cred').through(:task_creds) }
+    it { is_expected.to have_many(:task_sessions).class_name('Mdm::TaskSession').dependent(:destroy) }
+    it { is_expected.to have_many(:sessions).class_name('Mdm::Session').through(:task_sessions) }
+    it { is_expected.to have_many(:task_hosts).class_name('Mdm::TaskHost').dependent(:destroy) }
+    it { is_expected.to have_many(:hosts).class_name('Mdm::Host').through(:task_hosts) }
+    it { is_expected.to have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
+    it { is_expected.to have_many(:services).class_name('Mdm::Service').through(:task_services) }
+    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
 
   end
 
@@ -63,7 +61,7 @@ describe Mdm::Task do
     context 'before_destroy' do
       it 'should call #delete_file' do
         task = FactoryGirl.create(:mdm_task)
-        task.should_receive(:delete_file)
+        expect(task).to receive(:delete_file)
         task.destroy
       end
     end

data/spec/app/models/mdm/user_spec.rb

@@ -1,39 +1,37 @@
-require 'spec_helper'
-
-describe Mdm::User do
+RSpec.describe Mdm::User, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should have_many(:owned_workspaces).class_name('Mdm::Workspace') }
-    it { should have_many(:tags).class_name('Mdm::Tag') }
-    it { should have_and_belong_to_many(:workspaces).class_name('Mdm::Workspace') }
+    it { is_expected.to have_many(:owned_workspaces).class_name('Mdm::Workspace') }
+    it { is_expected.to have_many(:tags).class_name('Mdm::Tag') }
+    it { is_expected.to have_and_belong_to_many(:workspaces).class_name('Mdm::Workspace') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
     end
 
     context 'columns' do
-      it { should have_db_column(:username).of_type(:string) }
-      it { should have_db_column(:crypted_password).of_type(:string) }
-      it { should have_db_column(:password_salt).of_type(:string) }
-      it { should have_db_column(:persistence_token).of_type(:string) }
-      it { should have_db_column(:fullname).of_type(:string) }
-      it { should have_db_column(:email).of_type(:string) }
-      it { should have_db_column(:phone).of_type(:string) }
-      it { should have_db_column(:company).of_type(:string) }
-      it { should have_db_column(:prefs).of_type(:string) }
-      it { should have_db_column(:admin).of_type(:boolean).with_options(:null => false, :default =>true) }
+      it { is_expected.to have_db_column(:username).of_type(:string) }
+      it { is_expected.to have_db_column(:crypted_password).of_type(:string) }
+      it { is_expected.to have_db_column(:password_salt).of_type(:string) }
+      it { is_expected.to have_db_column(:persistence_token).of_type(:string) }
+      it { is_expected.to have_db_column(:fullname).of_type(:string) }
+      it { is_expected.to have_db_column(:email).of_type(:string) }
+      it { is_expected.to have_db_column(:phone).of_type(:string) }
+      it { is_expected.to have_db_column(:company).of_type(:string) }
+      it { is_expected.to have_db_column(:prefs).of_type(:string) }
+      it { is_expected.to have_db_column(:admin).of_type(:boolean).with_options(:null => false, :default =>true) }
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       user = FactoryGirl.build(:mdm_user)
-      user.should be_valid
+      expect(user).to be_valid
     end
   end
 

data/spec/app/models/mdm/vuln_attempt_spec.rb

@@ -1,42 +1,40 @@
-require 'spec_helper'
-
-describe Mdm::VulnAttempt do
+RSpec.describe Mdm::VulnAttempt, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'association' do
-    it { should belong_to(:vuln).class_name('Mdm::Vuln') }
+    it { is_expected.to belong_to(:vuln).class_name('Mdm::Vuln') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:attempted_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:attempted_at).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:vuln_id).of_type(:integer) }
-      it { should have_db_column(:exploited).of_type(:boolean) }
-      it { should have_db_column(:fail_reason).of_type(:string) }
-      it { should have_db_column(:username).of_type(:string) }
-      it { should have_db_column(:module).of_type(:text) }
-      it { should have_db_column(:session_id).of_type(:integer) }
-      it { should have_db_column(:loot_id).of_type(:integer) }
-      it { should have_db_column(:fail_detail).of_type(:text) }
+      it { is_expected.to have_db_column(:vuln_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:exploited).of_type(:boolean) }
+      it { is_expected.to have_db_column(:fail_reason).of_type(:string) }
+      it { is_expected.to have_db_column(:username).of_type(:string) }
+      it { is_expected.to have_db_column(:module).of_type(:text) }
+      it { is_expected.to have_db_column(:session_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:loot_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:fail_detail).of_type(:text) }
     end
   end
 
   context 'validations' do
     it 'should require a vuln_id' do
       orphan_detail = FactoryGirl.build(:mdm_vuln_detail, :vuln => nil)
-      orphan_detail.should_not be_valid
-      orphan_detail.errors[:vuln_id].should include("can't be blank")
+      expect(orphan_detail).not_to be_valid
+      expect(orphan_detail.errors[:vuln_id]).to include("can't be blank")
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       vuln_attempt = FactoryGirl.build(:mdm_vuln_attempt)
-      vuln_attempt.should be_valid
+      expect(vuln_attempt).to be_valid
     end
   end
 

data/spec/app/models/mdm/vuln_detail_spec.rb

@@ -1,54 +1,52 @@
-require 'spec_helper'
-
-describe Mdm::VulnDetail do
+RSpec.describe Mdm::VulnDetail, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'association' do
-    it { should belong_to(:vuln).class_name('Mdm::Vuln') }
+    it { is_expected.to belong_to(:vuln).class_name('Mdm::Vuln') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:nx_published).of_type(:datetime) }
-      it { should have_db_column(:nx_added).of_type(:datetime) }
-      it { should have_db_column(:nx_modified).of_type(:datetime) }
-      it { should have_db_column(:nx_vulnerable_since).of_type(:datetime) }
+      it { is_expected.to have_db_column(:nx_published).of_type(:datetime) }
+      it { is_expected.to have_db_column(:nx_added).of_type(:datetime) }
+      it { is_expected.to have_db_column(:nx_modified).of_type(:datetime) }
+      it { is_expected.to have_db_column(:nx_vulnerable_since).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:vuln_id).of_type(:integer)}
-      it { should have_db_column(:cvss_score).of_type(:float) }
-      it { should have_db_column(:cvss_vector).of_type(:string) }
-      it { should have_db_column(:title).of_type(:string) }
-      it { should have_db_column(:description).of_type(:text) }
-      it { should have_db_column(:solution).of_type(:text) }
-      it { should have_db_column(:proof).of_type(:binary) }
-      it { should have_db_column(:nx_console_id).of_type(:integer) }
-      it { should have_db_column(:nx_device_id).of_type(:integer) }
-      it { should have_db_column(:nx_severity).of_type(:float) }
-      it { should have_db_column(:nx_pci_severity).of_type(:float) }
-      it { should have_db_column(:nx_tags).of_type(:text) }
-      it { should have_db_column(:nx_vuln_status).of_type(:text) }
-      it { should have_db_column(:nx_proof_key).of_type(:text) }
-      it { should have_db_column(:src).of_type(:string) }
-      it { should have_db_column(:nx_scan_id).of_type(:integer) }
-      it { should have_db_column(:nx_pci_compliance_status).of_type(:string) }
+      it { is_expected.to have_db_column(:vuln_id).of_type(:integer)}
+      it { is_expected.to have_db_column(:cvss_score).of_type(:float) }
+      it { is_expected.to have_db_column(:cvss_vector).of_type(:string) }
+      it { is_expected.to have_db_column(:title).of_type(:string) }
+      it { is_expected.to have_db_column(:description).of_type(:text) }
+      it { is_expected.to have_db_column(:solution).of_type(:text) }
+      it { is_expected.to have_db_column(:proof).of_type(:binary) }
+      it { is_expected.to have_db_column(:nx_console_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:nx_device_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:nx_severity).of_type(:float) }
+      it { is_expected.to have_db_column(:nx_pci_severity).of_type(:float) }
+      it { is_expected.to have_db_column(:nx_tags).of_type(:text) }
+      it { is_expected.to have_db_column(:nx_vuln_status).of_type(:text) }
+      it { is_expected.to have_db_column(:nx_proof_key).of_type(:text) }
+      it { is_expected.to have_db_column(:src).of_type(:string) }
+      it { is_expected.to have_db_column(:nx_scan_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:nx_pci_compliance_status).of_type(:string) }
     end
   end
 
   context 'validations' do
     it 'should require a vuln_id' do
       orphan_detail = FactoryGirl.build(:mdm_vuln_detail, :vuln => nil)
-      orphan_detail.should_not be_valid
-      orphan_detail.errors[:vuln_id].should include("can't be blank")
+      expect(orphan_detail).not_to be_valid
+      expect(orphan_detail.errors[:vuln_id]).to include("can't be blank")
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       vuln_detail = FactoryGirl.build(:mdm_vuln_detail)
-      vuln_detail.should be_valid
+      expect(vuln_detail).to be_valid
     end
   end
 

data/spec/app/models/mdm/vuln_ref_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::VulnRef do
+RSpec.describe Mdm::VulnRef, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factories' do
@@ -9,27 +7,27 @@ describe Mdm::VulnRef do
         FactoryGirl.build(:mdm_vuln_ref)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:id).of_type(:integer) }
-      it { should have_db_column(:ref_id).of_type(:integer) }
-      it { should have_db_column(:vuln_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:id).of_type(:integer) }
+      it { is_expected.to have_db_column(:ref_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:vuln_id).of_type(:integer) }
     end
   end
 
   context 'associations' do
-    it { should belong_to(:vuln).class_name('Mdm::Vuln') }
-    it { should belong_to(:ref).class_name('Mdm::Ref') }
+    it { is_expected.to belong_to(:vuln).class_name('Mdm::Vuln') }
+    it { is_expected.to belong_to(:ref).class_name('Mdm::Ref') }
   end
 
   context 'factory' do
     it 'should be valid' do
       vuln_ref = FactoryGirl.build(:mdm_vuln_ref)
-      vuln_ref.should be_valid
+      expect(vuln_ref).to be_valid
     end
   end