Merge branch 'bug/wrong-file_changed-argument' of github.com:rapid7/metasploit-framework into bug/wrong-file_changed-argument

Author: egypt

lib/msf/core.rb

@@ -19,20 +19,6 @@
 
 module Msf
 	LogSource = "core"
-
-	# Returns Pathname of the root of the Metasploit Framework source
-	#
-	# @return [Pathname] root directory above lib, data, modules, etc.
-	def self.root
-		unless instance_variable_defined? :@root
-			msf_pathname = Pathname.new(__FILE__).dirname
-			lib_pathname = msf_pathname.parent
-
-			@root = lib_pathname.parent
-		end
-
-		@root
-	end
 end
 
 # General

spec/lib/msf/core/modules/loader/base_spec.rb

@@ -3,6 +3,10 @@
 require 'msf/core'
 
 describe Msf::Modules::Loader::Base do
+	let(:described_class_pathname) do
+		root_pathname.join('lib', 'msf', 'core', 'modules', 'loader', 'base.rb')
+	end
+
 	let(:malformed_module_content) do
 		<<-EOS
       class Metasploit3
@@ -38,17 +42,18 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	let(:parent_pathname) do
-		Msf.root.join('modules')
+		root_pathname.join('modules')
+	end
+
+	let(:root_pathname) do
+		Pathname.new(Msf::Config.install_root)
 	end
 
 	let(:type) do
 		Msf::MODULE_AUX
 	end
 
 	context 'CONSTANTS' do
-		let(:pathname) do
-			Msf.root.join('lib', 'msf', 'core', 'modules', 'loader', 'base.rb')
-		end
 
 		context 'DIRECTORY_BY_TYPE' do
 			let(:directory_by_type) do
@@ -88,7 +93,7 @@ class Metasploit3 < Msf::Auxiliary
 			it 'should be line number for first line of NAMESPACE_MODULE_CONTENT' do
 				file_lines = []
 
-				pathname.open do |f|
+				described_class_pathname.open do |f|
 					file_lines = f.to_a
 				end
 
@@ -820,7 +825,7 @@ class Metasploit3 < Msf::Auxiliary
 						:module_eval
 				).with(
 						anything,
-				    Msf.root.join('lib', 'msf', 'core', 'modules', 'loader', 'base.rb').to_s,
+				    described_class_pathname.to_s,
 				    anything
 				)