metasploit_data_models 2.0.17 → 3.0.0

data/spec/app/models/metasploit_data_models/search/visitor/joins_spec.rb

@@ -82,9 +82,9 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
             it { is_expected.to eq([]) }
           end
 
-          context 'with association and attribute' do
+          context 'with association and attribute', pending: 'FactoryBot update' do
             let(:association) do
-              FactoryGirl.generate :metasploit_model_search_operator_association_association
+              FactoryBot.generate :metasploit_model_search_operator_association_association
             end
 
             let(:association_operation) {
@@ -118,9 +118,9 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
             it { is_expected.to eq([]) }
           end
 
-          context 'with the same child join for all' do
+          context 'with the same child join for all', pending: "FactoryBot update" do
             let(:association) do
-              FactoryGirl.generate :metasploit_model_search_operator_association_association
+              FactoryBot.generate :metasploit_model_search_operator_association_association
             end
 
             let(:association_operation) {
@@ -147,10 +147,10 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
             end
           end
 
-          context 'with union of intersections' do
+          context 'with union of intersections', pending: "FactoryBot update" do
             let(:disjoint_associations) do
               Array.new(2) {
-                FactoryGirl.generate :metasploit_model_search_operator_association_association
+                FactoryBot.generate :metasploit_model_search_operator_association_association
               }
             end
 
@@ -207,7 +207,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
             context 'with a common subset of child join' do
               let(:common_associations) do
                 Array.new(2) {
-                  FactoryGirl.generate :metasploit_model_search_operator_association_association
+                  FactoryBot.generate :metasploit_model_search_operator_association_association
                 }
               end
 
@@ -316,9 +316,9 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
       end
     end
 
-    context 'with Metasploit::Model::Search::Operator::Association' do
+    context 'with Metasploit::Model::Search::Operator::Association', pending: "FactoryBot update" do
       let(:association) do
-        FactoryGirl.generate :metasploit_model_search_operator_association_association
+        FactoryBot.generate :metasploit_model_search_operator_association_association
       end
 
       let(:node) do
@@ -368,7 +368,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
 
           context 'with name' do
             let(:name) do
-              FactoryGirl.generate :mdm_host_name
+              FactoryBot.generate :mdm_host_name
             end
 
             let(:formatted) do
@@ -380,7 +380,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
 
           context 'with services.name' do
             let(:name) do
-              FactoryGirl.generate :mdm_service_name
+              FactoryBot.generate :mdm_service_name
             end
 
             let(:formatted) do
@@ -393,4 +393,4 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
       end
     end
   end
-end
+end

data/spec/app/models/metasploit_data_models/search/visitor/relation_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
   end
 
   let(:value) {
-    FactoryGirl.generate :mdm_host_name
+    FactoryBot.generate :mdm_host_name
   }
 
   it_should_behave_like 'Metasploit::Concern.run'
@@ -171,7 +171,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           #
 
           let(:non_matching_host) {
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_host,
                 address: non_matching_host_address,
                 name: non_matching_host_name,
@@ -179,7 +179,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
                 os_name: non_matching_host_os_name,
                 os_sp: non_matching_host_os_sp
             ).tap { |host|
-              FactoryGirl.create(
+              FactoryBot.create(
                   :mdm_host_tag,
                   host: host,
                   tag: non_matching_tag
@@ -224,7 +224,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           }
 
           let(:non_matching_tag) {
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_tag,
                 desc: non_matching_tag_desc,
                 name: non_matching_tag_name
@@ -244,7 +244,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           #
 
           let!(:non_matching_record) {
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_service,
                 host: non_matching_host,
                 info: non_matching_info,
@@ -276,7 +276,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
 
             let!(:matching_record_by_port) {
               matching_ports.each_with_object({}) { |matching_port, matching_record_by_port|
-                matching_record_by_port[matching_port] = FactoryGirl.create(
+                matching_record_by_port[matching_port] = FactoryBot.create(
                     :mdm_service,
                     port: matching_port
                 )
@@ -346,7 +346,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
             #
 
             let(:matching_host) {
-              FactoryGirl.create(
+              FactoryBot.create(
                   :mdm_host,
                   address: matching_host_address,
                   name: matching_host_name,
@@ -354,7 +354,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
                   os_name: matching_host_os_name,
                   os_sp: matching_host_os_sp
               ).tap { |host|
-                FactoryGirl.create(
+                FactoryBot.create(
                     :mdm_host_tag,
                     host: host,
                     tag: matching_tag
@@ -399,7 +399,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
             }
 
             let(:matching_tag) {
-              FactoryGirl.create(
+              FactoryBot.create(
                   :mdm_tag,
                   desc: matching_tag_desc,
                   name: matching_tag_name
@@ -419,7 +419,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
             #
 
             let!(:matching_record) {
-              FactoryGirl.create(
+              FactoryBot.create(
                   :mdm_service,
                   host: matching_host,
                   info: matching_info,
@@ -636,7 +636,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           #
 
           let!(:matching_record) do
-            FactoryGirl.build(
+            FactoryBot.build(
                 :mdm_host,
                 address: matching_record_address,
                 name: matching_record_name,
@@ -647,7 +647,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           end
 
           let!(:matching_service) do
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_service,
                 host: matching_record,
                 name: matching_service_name
@@ -655,7 +655,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           end
 
           let!(:non_matching_record) do
-            FactoryGirl.build(
+            FactoryBot.build(
                 :mdm_host,
                 address: non_matching_record_address,
                 name: non_matching_record_name,
@@ -666,7 +666,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           end
 
           let!(:non_matching_service) do
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_service,
                 host: non_matching_record,
                 name: non_matching_service_name
@@ -828,7 +828,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           #
 
           let!(:matching_record) {
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_tag,
                 desc: matching_desc,
                 name: matching_name
@@ -836,7 +836,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
           }
 
           let!(:non_matching_record) {
-            FactoryGirl.create(
+            FactoryBot.create(
                 :mdm_tag,
                 desc: non_matching_desc,
                 name: non_matching_name

data/spec/app/models/metasploit_data_models/search/visitor/where_spec.rb

@@ -155,7 +155,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Where, type: :model do
 
           context 'with name' do
             let(:name) do
-              FactoryGirl.generate :mdm_host_name
+              FactoryBot.generate :mdm_host_name
             end
 
             let(:formatted) do
@@ -169,7 +169,7 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Where, type: :model do
 
           context 'with services.name' do
             let(:name) do
-              FactoryGirl.generate :mdm_service_name
+              FactoryBot.generate :mdm_service_name
             end
 
             let(:formatted) do
@@ -184,4 +184,4 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Where, type: :model do
       end
     end
   end
-end
+end

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/db/structure.sql

@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.6.6
--- Dumped by pg_dump version 9.6.6
+-- Dumped from database version 9.6.1
+-- Dumped by pg_dump version 9.6.1
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;

data/spec/factories/mdm/addresses.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :mdm_ipv4_address do |n|
     max = 255
 
@@ -9,4 +9,4 @@ FactoryGirl.define do
     max = 65535
     n % max
   end
-end
+end

data/spec/factories/mdm/clients.rb

@@ -1,8 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_client, :class => Mdm::Client do
     #
     # Associations
     #
     association :host, :factory => :mdm_host
   end
-end
+end

data/spec/factories/mdm/creds.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_cred, :aliases => [:cred], :class => Mdm::Cred do
     #
     # Associations
@@ -14,4 +14,4 @@ FactoryGirl.define do
   sequence :mdm_cred_pass do |n|
     "mahp455w3rd!-#{n}"
   end
-end
+end

data/spec/factories/mdm/events.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_event, :aliases => [:event], :class => Mdm::Event do
-    name { FactoryGirl.generate :mdm_event_name }
+    name { FactoryBot.generate :mdm_event_name }
 
     trait :workspace do
       association :workspace, :factory => :mdm_workspace
@@ -12,4 +12,4 @@ FactoryGirl.define do
   sequence :mdm_event_name do |n|
     "Event #{n}"
   end
-end
+end

data/spec/factories/mdm/exploit_attempts.rb

@@ -1,8 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_exploit_attempt,  :class => Mdm::ExploitAttempt do
     #
     # Associations
     #
     association :host, :factory => :mdm_host
   end
-end
+end

data/spec/factories/mdm/exploited_hosts.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_exploited_host, :class => Mdm::ExploitedHost do
 
     association :host, :factory => :mdm_host

data/spec/factories/mdm/fingerprints/nessus_fingerprints.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_nessus_fingerprint, :parent => :mdm_note do
     ntype { 'host.os.nessus_fingerprint' }
     data { {:os=>"Microsoft Windows XP SP3"} }
   end
-end
+end

data/spec/factories/mdm/fingerprints/nexpose_fingerprints.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_nexpose_fingerprint, :parent => :mdm_note do
     ntype { 'host.os.nexpose_fingerprint' }
     data { {:family=>"Windows", :certainty=>"0.67", :vendor=>"Microsoft", :arch=>"x86"} }
   end
-end
+end

data/spec/factories/mdm/fingerprints/nmap_fingerprints.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_nmap_fingerprint, :parent => :mdm_note do
     ntype { 'host.os.nmap_fingerprint' }
     data { { :os_accuracy => 100, :os_family=> 'Windows',  :os_vendor=> 'Microsoft', :os_version => 'XP' } }
   end
-end
+end

data/spec/factories/mdm/fingerprints/retina_fingerprints.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_retina_fingerprint, :parent => :mdm_note do
     ntype { 'host.os.retina_fingerprint' }
     data { { :os=>"Windows Server 2003 (X64), Service Pack 2"} }
   end
-end
+end

data/spec/factories/mdm/fingerprints/session_fingerprints.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_session_fingerprint, :parent => :mdm_note do
     ntype { 'host.os.session_fingerprint' }
     data { { :os   => "Microsoft Windows XP SP3", :arch => 'x86' } }
   end
-end
+end

data/spec/factories/mdm/host_details.rb

@@ -1,8 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_host_detail, :class => Mdm::HostDetail do
     #
     # Associations
     #
     association :host, :factory => :mdm_host
   end
-end
+end

data/spec/factories/mdm/host_tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_host_tag, :class => Mdm::HostTag do
     #
     # Associations
@@ -6,4 +6,4 @@ FactoryGirl.define do
     association :host, :factory => :mdm_host
     association :tag, :factory => :mdm_tag
   end
-end
+end

data/spec/factories/mdm/hosts.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_host, :class => Mdm::Host do
     #
     # Associations
@@ -82,4 +82,4 @@ FactoryGirl.define do
 
   virtual_hosts = ['VMWare', 'QEMU', 'XEN']
   sequence :mdm_host_virtual_host, virtual_hosts.cycle
-end
+end

data/spec/factories/mdm/listeners.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_listener, :aliases => [:listener], :class => Mdm::Listener do
     #
     # Associations
@@ -9,4 +9,4 @@ FactoryGirl.define do
     address { generate :mdm_ipv4_address }
     port { generate :mdm_tcp_port }
   end
-end
+end

data/spec/factories/mdm/loots.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_loot, :aliases => [:loot], :class => Mdm::Loot do
     #
     # Associations
@@ -8,4 +8,4 @@ FactoryGirl.define do
     association :host, :factory => :mdm_host
 
   end
-end
+end

data/spec/factories/mdm/module/actions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_action, :class => Mdm::Module::Action do
     name { generate :mdm_module_action_name }
 
@@ -11,4 +11,4 @@ FactoryGirl.define do
   sequence :mdm_module_action_name do |n|
     "Mdm::Module::Action#name #{n}"
   end
-end
+end

data/spec/factories/mdm/module/archs.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_arch, :class => Mdm::Module::Arch do
     name { generate :mdm_module_arch_name }
 
@@ -11,4 +11,4 @@ FactoryGirl.define do
   sequence :mdm_module_arch_name do |n|
     "Mdm::Module::Arch#name #{n}"
   end
-end
+end

data/spec/factories/mdm/module/authors.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_author, :class => Mdm::Module::Author do
     name { generate :mdm_module_author_name }
 
@@ -19,4 +19,4 @@ FactoryGirl.define do
   sequence :mdm_module_author_email do |n|
     "Mdm::Module::Author#email #{n}"
   end
-end
+end

data/spec/factories/mdm/module/details.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_detail, :class => Mdm::Module::Detail do
     transient do
       root {

data/spec/factories/mdm/module/mixins.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_mixin, :class => Mdm::Module::Mixin do
     name { generate :mdm_module_mixin_name }
 
@@ -11,4 +11,4 @@ FactoryGirl.define do
   sequence :mdm_module_mixin_name do |n|
     "Mdm::Module::Mixin#name #{n}"
   end
-end
+end

data/spec/factories/mdm/module/platforms.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_platform, :class => Mdm::Module::Platform do
     name { generate :mdm_module_platform_name }
 
@@ -11,4 +11,4 @@ FactoryGirl.define do
   sequence :mdm_module_platform_name do |n|
     "Mdm::Module::Platform#name #{n}"
   end
-end
+end

data/spec/factories/mdm/module/refs.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_ref, :class => Mdm::Module::Ref do
     name { generate :mdm_module_ref_name }
 
@@ -11,4 +11,4 @@ FactoryGirl.define do
   sequence :mdm_module_ref_name do |n|
     "Mdm::Module::Ref#name #{n}"
   end
-end
+end

data/spec/factories/mdm/module/targets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_module_target, :class => Mdm::Module::Target do
     index { generate :mdm_module_target_index }
     name { generate :mdm_module_target_name }
@@ -16,4 +16,4 @@ FactoryGirl.define do
   sequence :mdm_module_target_name do |n|
     "Mdm::Module::Target#name #{n}"
   end
-end
+end

data/spec/factories/mdm/nexpose_consoles.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_nexpose_console, :aliases => [:nexpose_console], :class => Mdm::NexposeConsole do
     name { generate :mdm_nexpose_console_name }
     port { generate :mdm_tcp_port }
@@ -12,4 +12,4 @@ FactoryGirl.define do
   end
 
 
-end
+end

data/spec/factories/mdm/notes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_note, :aliases => [:note], :class => Mdm::Note do
     #
     # Associations
@@ -9,4 +9,4 @@ FactoryGirl.define do
 
 
   end
-end
+end

data/spec/factories/mdm/refs.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_ref, :class => Mdm::Ref do
     name { generate :mdm_ref_name }
   end
@@ -6,4 +6,4 @@ FactoryGirl.define do
   sequence :mdm_ref_name do |n|
     "Mdm::Ref#name #{n}"
   end
-end
+end

data/spec/factories/mdm/routes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_route, :aliases => [:route], :class => Mdm::Route do
     #
     # Associations
@@ -33,4 +33,4 @@ FactoryGirl.define do
   end
 
 
-end
+end

data/spec/factories/mdm/services.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_service, :class => Mdm::Service do
     #
     # Associations
@@ -15,7 +15,7 @@ FactoryGirl.define do
 
     factory :web_service do
       proto 'tcp'
-      name { FactoryGirl.generate(:web_service_name) }
+      name { FactoryBot.generate(:web_service_name) }
     end
   end
 
@@ -38,4 +38,4 @@ FactoryGirl.define do
   sequence :web_service_name do |n|
     web_service_names[n % web_service_name_count]
   end
-end
+end

data/spec/factories/mdm/session_events.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_session_event, :aliases => [:session_event], :class => Mdm::SessionEvent do
     #
     # Associations

data/spec/factories/mdm/sessions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_session, :aliases => [:session], :class => Mdm::Session do
     #
     # Associations
@@ -10,4 +10,4 @@ FactoryGirl.define do
     #
     opened_at { DateTime.now }
   end
-end
+end

data/spec/factories/mdm/tags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_tag, :class => Mdm::Tag do
     desc { generate :mdm_tag_desc }
     name { generate :mdm_tag_name }
@@ -11,4 +11,4 @@ FactoryGirl.define do
   sequence :mdm_tag_name do |n|
     "mdm_tag_name#{n}"
   end
-end
+end

data/spec/factories/mdm/task.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :mdm_task, :aliases => [:task], :class => 'Mdm::Task' do
     #
     # Associations
@@ -13,4 +13,4 @@ FactoryGirl.define do
 
 
   end
-end
+end