fix command dispatcher specs

Author: David Maloney

lib/msf/ui/console/command_dispatcher/core.rb

@@ -90,8 +90,7 @@ class Core
     "-h" => [ false, "Help banner."                                   ],
     "-e" => [ true,  "Expression to evaluate."                        ])
 
-  # Constant for disclosure date formatting in search functions
-  DISCLOSURE_DATE_FORMAT = "%Y-%m-%d"
+
 
   # Constant for a retry timeout on using modules before they're loaded
   CMD_USE_TIMEOUT = 3

lib/msf/ui/console/command_dispatcher/modules.rb

@@ -19,6 +19,9 @@ class Modules
 
           include Msf::Ui::Console::CommandDispatcher
 
+          # Constant for disclosure date formatting in search functions
+          DISCLOSURE_DATE_FORMAT = "%Y-%m-%d"
+
           @@search_opts = Rex::Parser::Arguments.new(
             "-h" => [ false, "Help banner."]
           )

spec/lib/msf/ui/console/command_dispatcher/core_spec.rb

@@ -12,90 +12,6 @@
     described_class.new(driver)
   end
 
-  context '#search_modules_sql' do
-    def search_modules_sql
-      core.search_modules_sql(match)
-    end
-
-    let(:match) do
-      ''
-    end
-
-    it 'should generate Matching Modules table' do
-      expect(core).to receive(:generate_module_table).with('Matching Modules').and_call_original
-
-      search_modules_sql
-    end
-
-    it 'should call Msf::DBManager#search_modules' do
-      expect(db_manager).to receive(:search_modules).with(match).and_return([])
-
-      search_modules_sql
-    end
-
-    context 'with matching Mdm::Module::Details' do
-      let(:match) do
-        module_detail.fullname
-      end
-
-      let!(:module_detail) do
-        FactoryGirl.create(:mdm_module_detail)
-      end
-
-      context 'printed table' do
-        def cell(table, row, column)
-          row_line_number = 6 + row
-          line_number     = 0
-
-          cell = nil
-
-          table.each_line do |line|
-            if line_number == row_line_number
-              # strip prefix and postfix
-              padded_cells = line[3...-1]
-              cells        = padded_cells.split(/\s{2,}/)
-
-              cell = cells[column]
-              break
-            end
-
-            line_number += 1
-          end
-
-          cell
-        end
-
-        let(:printed_table) do
-          table = ''
-
-          expect(core).to receive(:print_line) do |string|
-            table = string
-          end
-
-          search_modules_sql
-
-          table
-        end
-
-        it 'should have fullname in first column' do
-          expect(cell(printed_table, 0, 0)).to include(module_detail.fullname)
-        end
-
-        it 'should have disclosure date in second column' do
-          expect(cell(printed_table, 0, 1)).to include(module_detail.disclosure_date.strftime("%Y-%m-%d"))
-        end
-
-        it 'should have rank name in third column' do
-          expect(cell(printed_table, 0, 2)).to include(Msf::RankingName[module_detail.rank])
-        end
-
-        it 'should have name in fourth column' do
-          expect(cell(printed_table, 0, 3)).to include(module_detail.name)
-        end
-      end
-    end
-  end
-
   it { is_expected.to respond_to :cmd_get }
   it { is_expected.to respond_to :cmd_getg }
 

spec/lib/msf/ui/console/command_dispatcher/modules_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+require 'msf/ui'
+require 'msf/ui/console/module_command_dispatcher'
+require 'msf/ui/console/command_dispatcher/core'
+
+RSpec.describe Msf::Ui::Console::CommandDispatcher::Modules do
+  include_context 'Msf::DBManager'
+  include_context 'Msf::UIDriver'
+
+  subject(:core) do
+    described_class.new(driver)
+  end
+
+  context '#search_modules_sql' do
+    def search_modules_sql
+      core.search_modules_sql(match)
+    end
+
+    let(:match) do
+      ''
+    end
+
+    it 'should generate Matching Modules table' do
+      expect(core).to receive(:generate_module_table).with('Matching Modules').and_call_original
+
+      search_modules_sql
+    end
+
+    it 'should call Msf::DBManager#search_modules' do
+      expect(db_manager).to receive(:search_modules).with(match).and_return([])
+
+      search_modules_sql
+    end
+
+    context 'with matching Mdm::Module::Details' do
+      let(:match) do
+        module_detail.fullname
+      end
+
+      let!(:module_detail) do
+        FactoryGirl.create(:mdm_module_detail)
+      end
+
+      context 'printed table' do
+        def cell(table, row, column)
+          row_line_number = 6 + row
+          line_number     = 0
+
+          cell = nil
+
+          table.each_line do |line|
+            if line_number == row_line_number
+              # strip prefix and postfix
+              padded_cells = line[3...-1]
+              cells        = padded_cells.split(/\s{2,}/)
+
+              cell = cells[column]
+              break
+            end
+
+            line_number += 1
+          end
+
+          cell
+        end
+
+        let(:printed_table) do
+          table = ''
+
+          expect(core).to receive(:print_line) do |string|
+            table = string
+          end
+
+          search_modules_sql
+
+          table
+        end
+
+        it 'should have fullname in first column' do
+          expect(cell(printed_table, 0, 0)).to include(module_detail.fullname)
+        end
+
+        it 'should have disclosure date in second column' do
+          expect(cell(printed_table, 0, 1)).to include(module_detail.disclosure_date.strftime("%Y-%m-%d"))
+        end
+
+        it 'should have rank name in third column' do
+          expect(cell(printed_table, 0, 2)).to include(Msf::RankingName[module_detail.rank])
+        end
+
+        it 'should have name in fourth column' do
+          expect(cell(printed_table, 0, 3)).to include(module_detail.name)
+        end
+      end
+    end
+  end
+end