spec/arachni/rpc/server/modules/manager_spec.rb in arachni-0.4.2 vs spec/arachni/rpc/server/modules/manager_spec.rb in arachni-0.4.3

@@ -1,79 +1,47 @@
-require_relative '../../../../spec_helper'
+require 'spec_helper'
 
-require Arachni::Options.instance.dir['lib'] + 'rpc/client/instance'
-require Arachni::Options.instance.dir['lib'] + 'rpc/server/instance'
-
 describe Arachni::RPC::Server::Module::Manager do
-    before( :all ) do
-        @opts = Arachni::Options.instance
-        port1 = random_port
-        port2 = random_port
-        port3 = random_port
-
-        @token = 'secret!'
-
-        fork_em {
-            @opts.rpc_port = port1
-            Arachni::RPC::Server::Instance.new( @opts, @token )
-        }
-        fork_em {
-            @opts.rpc_port = port2
-            Arachni::RPC::Server::Instance.new( @opts, @token )
-        }
-        fork_em {
-            @opts.rpc_port = port3
-            Arachni::RPC::Server::Instance.new( @opts, @token )
-        }
-        sleep 1
-
-        @modules = Arachni::RPC::Client::Instance.new( @opts,
-            "#{@opts.rpc_address}:#{port1}", @token
-        ).modules
-
-        @modules_clean = Arachni::RPC::Client::Instance.new( @opts,
-            "#{@opts.rpc_address}:#{port2}", @token
-        ).modules
-
-        @modules_clean2 = Arachni::RPC::Client::Instance.new( @opts,
-            "#{@opts.rpc_address}:#{port3}", @token
-        ).modules
-    end
-
     describe '#available' do
         it 'returns an array of available modules' do
-            @modules.available.should be_any
+            instance_spawn.modules.available.should be_any
         end
     end
 
     describe '#loaded' do
         context 'when there are loaded modules' do
             it 'returns an empty array' do
-                @modules.loaded.should be_empty
+                instance_spawn.modules.loaded.should be_empty
             end
         end
         context 'when there are loaded modules' do
             it 'returns an array of loaded modules' do
-                @modules.loaded.should be_empty
-                @modules.load '*'
-                @modules.loaded.should be_any
+                modules = instance_spawn.modules
+
+                modules.loaded.should be_empty
+                modules.load '*'
+                modules.loaded.should be_any
             end
         end
     end
 
     describe '#load' do
         it 'loads modules by name' do
-            @modules_clean.loaded.should be_empty
-            @modules_clean.load 'test'
-            @modules_clean.loaded.should == ['test']
+            modules = instance_spawn.modules
+
+            modules.loaded.should be_empty
+            modules.load 'test'
+            modules.loaded.should == ['test']
         end
     end
 
     describe '#load_all' do
         it 'loads all modules' do
-            @modules_clean2.loaded.should be_empty
-            @modules_clean2.load_all
-            @modules_clean2.loaded.should == @modules_clean2.available
+            modules = instance_spawn.modules
+
+            modules.loaded.should be_empty
+            modules.load_all
+            modules.loaded.should == modules.available
         end
     end
 
 end