arachni 1.2.1 → 1.3

data/spec/arachni/rpc/server/dispatcher/service_spec.rb

@@ -14,32 +14,33 @@ describe Arachni::RPC::Server::Dispatcher::Service do
 
     describe '#dispatcher' do
         it 'provides access to the parent Dispatcher' do
-            @dispatcher.echo.test_dispatcher.should be_true
+            expect(@dispatcher.echo.test_dispatcher).to be_truthy
         end
     end
 
     describe '#opts' do
         it 'provides access to the Dispatcher\'s options' do
-            @dispatcher.echo.test_opts.should be_true
+            expect(@dispatcher.echo.test_opts).to be_truthy
         end
     end
 
     describe '#node' do
         it 'provides access to the Dispatcher\'s node' do
-            @dispatcher.echo.test_node.should be_true
+            expect(@dispatcher.echo.test_node).to be_truthy
         end
     end
 
     describe '#instances' do
         it 'provides access to the running instances' do
-            @dispatcher.echo.instances.map{ |i| i['pid'] }.should == @dispatcher.jobs.map{ |j| j['pid'] }
+            expect(@dispatcher.echo.instances.map{ |i| i['pid'] }).to eq(@dispatcher.jobs.map{ |j| j['pid'] })
         end
     end
 
     describe '#map_instances' do
         it 'asynchronously maps all running instances' do
-            @dispatcher.echo.test_map_instances.should ==
+            expect(@dispatcher.echo.test_map_instances).to eq(
                 Hash[@dispatcher.jobs.map { |j| [j['url'], j['token']] }]
+            )
         end
     end
 
@@ -51,11 +52,11 @@ describe Arachni::RPC::Server::Dispatcher::Service do
                     new( Arachni::Options, j['url'], j['token'] ).options.url
             end
 
-            urls.size.should == @instance_count
+            expect(urls.size).to eq(@instance_count)
             urls.sort!
 
             1.upto( @instance_count ).each do |i|
-                urls[i-1].should == "http://stuff.com/#{i}"
+                expect(urls[i-1]).to eq("http://stuff.com/#{i}")
             end
         end
     end
@@ -63,26 +64,26 @@ describe Arachni::RPC::Server::Dispatcher::Service do
     describe '#defer' do
         it 'defers execution of the given block' do
             args = [1, 'stuff']
-            @dispatcher.echo.test_defer( *args ).should == args
+            expect(@dispatcher.echo.test_defer( *args )).to eq(args)
         end
     end
 
     describe '#run_asap' do
         it 'runs the given block as soon as possible' do
             args = [1, 'stuff']
-            @dispatcher.echo.test_run_asap( *args ).should == args
+            expect(@dispatcher.echo.test_run_asap( *args )).to eq(args)
         end
     end
 
     describe '#iterator_for' do
         it 'provides an asynchronous iterator' do
-            @dispatcher.echo.test_iterator_for.should be_true
+            expect(@dispatcher.echo.test_iterator_for).to be_truthy
         end
     end
 
     describe '#connect_to_dispatcher' do
         it 'connects to the a dispatcher by url' do
-            @dispatcher.echo.test_connect_to_dispatcher.should be_true
+            expect(@dispatcher.echo.test_connect_to_dispatcher).to be_truthy
         end
     end
 
@@ -90,9 +91,9 @@ describe Arachni::RPC::Server::Dispatcher::Service do
         it 'connects to an instance' do
             instance = @dispatcher.jobs.first
 
-            @dispatcher.echo.test_connect_to_instance( instance ).should be_false
-            @dispatcher.echo.test_connect_to_instance( instance['url'], instance['token'] ).should be_false
-            @dispatcher.echo.test_connect_to_instance( url: instance['url'], token: instance['token'] ).should be_false
+            expect(@dispatcher.echo.test_connect_to_instance( instance )).to be_falsey
+            expect(@dispatcher.echo.test_connect_to_instance( instance['url'], instance['token'] )).to be_falsey
+            expect(@dispatcher.echo.test_connect_to_instance( url: instance['url'], token: instance['token'] )).to be_falsey
         end
     end
 

data/spec/arachni/rpc/server/dispatcher_spec.rb

@@ -16,7 +16,7 @@ describe Arachni::RPC::Server::Dispatcher do
 
     describe '#alive?' do
         it 'returns true' do
-            dispatcher_light_spawn.alive?.should == true
+            expect(dispatcher_light_spawn.alive?).to eq(true)
         end
     end
 
@@ -27,14 +27,14 @@ describe Arachni::RPC::Server::Dispatcher do
                 dispatcher_light_spawn( weight: 2, neighbour: dispatcher.url )
                 dispatcher_light_spawn( weight: 3, neighbour: dispatcher.url )
 
-                dispatcher.preferred.should == dispatcher.url
+                expect(dispatcher.preferred).to eq(dispatcher.url)
             end
         end
 
         context 'when the dispatcher is not a grid member' do
             it 'returns the URL of the Dispatcher' do
                 dispatcher = dispatcher_light_spawn
-                dispatcher.preferred.should == dispatcher.url
+                expect(dispatcher.preferred).to eq(dispatcher.url)
             end
         end
     end
@@ -42,7 +42,7 @@ describe Arachni::RPC::Server::Dispatcher do
     describe '#handlers' do
         it 'returns an array of loaded handlers' do
             Arachni::Options.paths.services = "#{fixtures_path}services/"
-            dispatcher_light_spawn.services.include?( 'echo' ).should be_true
+            expect(dispatcher_light_spawn.services.include?( 'echo' )).to be_truthy
         end
     end
 
@@ -55,14 +55,14 @@ describe Arachni::RPC::Server::Dispatcher do
                 sleep 0.1 while !dispatcher.dispatch
             end
 
-            dispatcher.jobs.size.should == times
+            expect(dispatcher.jobs.size).to eq(times)
         end
 
         context 'when Options#dispatcher_external_address has been set' do
             it 'advertises that address' do
                 address = '127.0.0.1'
                 dispatcher = dispatcher_light_spawn( external_address: address )
-                dispatcher.dispatch['url'].should start_with "#{address}:"
+                expect(dispatcher.dispatch['url']).to start_with "#{address}:"
             end
         end
         context 'when not a Grid member' do
@@ -70,27 +70,27 @@ describe Arachni::RPC::Server::Dispatcher do
                 info = dispatcher_light_spawn.dispatch
 
                 %w(token pid port url owner birthdate starttime helpers).each do |k|
-                    info[k].should be_true
+                    expect(info[k]).to be_truthy
                 end
 
                 instance = instance_connect( info['url'], info['token'] )
-                instance.service.alive?.should be_true
+                expect(instance.service.alive?).to be_truthy
             end
             it 'assigns an optional owner' do
                 owner = 'blah'
-                dispatcher_light_spawn.dispatch( owner )['owner'].should == owner
+                expect(dispatcher_light_spawn.dispatch( owner )['owner']).to eq(owner)
             end
             context 'when the pool is empty' do
                 it 'returns false' do
                     dispatcher = dispatcher_light_spawn
-                    dispatcher.dispatch.should be_kind_of Hash
-                    dispatcher.dispatch.should be_false
+                    expect(dispatcher.dispatch).to be_kind_of Hash
+                    expect(dispatcher.dispatch).to be_falsey
                 end
 
                 it 'replenishes the pool' do
                     dispatcher = dispatcher_light_spawn
-                    dispatcher.dispatch.should be_kind_of Hash
-                    dispatcher.dispatch.should be_false
+                    expect(dispatcher.dispatch).to be_kind_of Hash
+                    expect(dispatcher.dispatch).to be_falsey
 
                     hash = nil
                     Timeout.timeout 10 do
@@ -99,7 +99,7 @@ describe Arachni::RPC::Server::Dispatcher do
                         end
                     end
 
-                    hash.should be_kind_of Hash
+                    expect(hash).to be_kind_of Hash
                 end
             end
         end
@@ -124,12 +124,12 @@ describe Arachni::RPC::Server::Dispatcher do
                 )
                 preferred = d3.url.split( ':' ).first
 
-                d3.dispatch['url'].split( ':' ).first.should == preferred
-                %W{127.0.0.3 127.0.0.2}.should include d1.dispatch['url'].split( ':' ).first
-                d2.dispatch['url'].split( ':' ).first.should == preferred
-                %W{127.0.0.1 127.0.0.3}.should include d3.dispatch['url'].split( ':' ).first
-                %W{127.0.0.2 127.0.0.3}.should include d3.dispatch['url'].split( ':' ).first
-                %W{127.0.0.2 127.0.0.3}.should include d1.dispatch['url'].split( ':' ).first
+                expect(d3.dispatch['url'].split( ':' ).first).to eq(preferred)
+                expect(%W{127.0.0.3 127.0.0.2}).to include d1.dispatch['url'].split( ':' ).first
+                expect(d2.dispatch['url'].split( ':' ).first).to eq(preferred)
+                expect(%W{127.0.0.1 127.0.0.3}).to include d3.dispatch['url'].split( ':' ).first
+                expect(%W{127.0.0.2 127.0.0.3}).to include d3.dispatch['url'].split( ':' ).first
+                expect(%W{127.0.0.2 127.0.0.3}).to include d1.dispatch['url'].split( ':' ).first
             end
 
             context 'when the load-balance option is set to false' do
@@ -151,8 +151,8 @@ describe Arachni::RPC::Server::Dispatcher do
                         neighbour: d1.url
                     )
 
-                    d3.dispatch( nil, {}, false )['url'].
-                        split( ':' ).first.should == '127.0.0.3'
+                    expect(d3.dispatch( nil, {}, false )['url'].
+                        split( ':' ).first).to eq('127.0.0.3')
                 end
             end
         end
@@ -165,7 +165,7 @@ describe Arachni::RPC::Server::Dispatcher do
             job = dispatcher.dispatch
             info = dispatcher.job( job['pid'] )
             @job_info_keys.each do |k|
-                info[k].should be_true
+                expect(info[k]).to be_truthy
             end
         end
     end
@@ -176,7 +176,7 @@ describe Arachni::RPC::Server::Dispatcher do
 
             dispatcher.jobs.each do |job|
                 @job_info_keys.each do |k|
-                    job[k].should be_true
+                    expect(job[k]).to be_truthy
                 end
             end
         end
@@ -188,7 +188,7 @@ describe Arachni::RPC::Server::Dispatcher do
 
             3.times { dispatcher.dispatch }
 
-            dispatcher.running_jobs.size.should == 3
+            expect(dispatcher.running_jobs.size).to eq(3)
         end
     end
 
@@ -198,7 +198,7 @@ describe Arachni::RPC::Server::Dispatcher do
 
             3.times { Arachni::Processes::Manager.kill dispatcher.dispatch['pid'] }
 
-            dispatcher.finished_jobs.size.should == 3
+            expect(dispatcher.finished_jobs.size).to eq(3)
         end
     end
 
@@ -206,8 +206,9 @@ describe Arachni::RPC::Server::Dispatcher do
         it 'returns a float signifying the amount of workload' do
             dispatcher = dispatcher_light_spawn( weight: 4 )
 
-            dispatcher.workload_score.should ==
+            expect(dispatcher.workload_score).to eq(
                 ((dispatcher.running_jobs.size + 1) * 4).to_f
+            )
         end
     end
 
@@ -223,16 +224,16 @@ describe Arachni::RPC::Server::Dispatcher do
 
             %w(running_jobs finished_jobs init_pool_size node consumed_pids
                 neighbours snapshots).each do |k|
-                stats[k].should be_true
+                expect(stats[k]).to be_truthy
             end
 
             finished = stats['finished_jobs']
-            finished.size.should == 1
+            expect(finished.size).to eq(1)
 
-            stats['neighbours'].is_a?( Array ).should be_true
+            expect(stats['neighbours'].is_a?( Array )).to be_truthy
 
-            stats['node'].delete( 'score' ).should == dispatcher.workload_score
-            stats['node'].keys.should == @node_info_keys
+            expect(stats['node'].delete( 'score' )).to eq(dispatcher.workload_score)
+            expect(stats['node'].keys).to eq(@node_info_keys)
         end
 
         context 'when there are scan snapshots' do
@@ -249,7 +250,7 @@ describe Arachni::RPC::Server::Dispatcher do
                 sleep 1 while !instance.service.suspended?
                 instance.service.shutdown
 
-                dispatcher.statistics['snapshots'].should include instance.service.snapshot_path
+                expect(dispatcher.statistics['snapshots']).to include instance.service.snapshot_path
             end
         end
 
@@ -257,14 +258,14 @@ describe Arachni::RPC::Server::Dispatcher do
             it 'advertises that address' do
                 address = '127.0.0.1'
                 dispatcher = dispatcher_light_spawn( external_address: address )
-                dispatcher.statistics['node']['url'].should start_with "#{address}:"
+                expect(dispatcher.statistics['node']['url']).to start_with "#{address}:"
             end
         end
     end
 
     describe '#log' do
         it 'returns the contents of the log file' do
-            dispatcher_light_spawn.log.should be_true
+            expect(dispatcher_light_spawn.log).to be_truthy
         end
     end
 

data/spec/arachni/rpc/server/framework/distributor_spec.rb

@@ -112,18 +112,18 @@ describe Arachni::RPC::Server::Framework::Distributor do
 
     describe '#calculate_workload_size' do
         it 'returns the amount of workload to gather for distribution' do
-            @distributor.calculate_workload_size( 99999 ).should == 30
+            expect(@distributor.calculate_workload_size( 99999 )).to eq(30)
         end
 
         it 'bases it on the amount of idle instances' do
             distributor = get_distributor
             distributor.done_slaves << distributor.slaves.first[:url]
-            distributor.calculate_workload_size( 99999 ).should == 20
+            expect(distributor.calculate_workload_size( 99999 )).to eq(20)
         end
 
         context 'when the calculated size exceeds the maximum' do
             it 'returns the maximum' do
-                @distributor.calculate_workload_size( 20 ).should == 20
+                expect(@distributor.calculate_workload_size( 20 )).to eq(20)
             end
         end
     end
@@ -207,7 +207,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                     distributor.split_page_workload( pages ).map do |page_chunks|
                         workload << Hash[page_chunks.map { |p| [p.url, p.element_audit_whitelist.to_a] }]
                     end
-                    workload.should == [
+                    expect(workload).to eq([
                         {
                             "#{@url}1" => [2720541242, 3706493238],
                             "#{@url}2" => [2299786370]
@@ -219,7 +219,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                             "#{@url}4" => [2195342275],
                             "#{@url}5" => [659674061]
                         }
-                    ]
+                    ])
 
                     Arachni::State.clear
                     Arachni::Data.clear
@@ -232,7 +232,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                     distributor.split_page_workload( pages ).map do |page_chunks|
                         workload << Hash[page_chunks.map { |p| [p.url, p.element_audit_whitelist.to_a] }]
                     end
-                    workload.should == [
+                    expect(workload).to eq([
                         {
                             'http://test.com/1' => [2720541242, 3706493238],
                             'http://test.com/2' => [2299786370],
@@ -243,7 +243,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                             'http://test.com/4' => [2444203185, 2195342275],
                             'http://test.com/5' => [659674061]
                         }
-                    ]
+                    ])
                 end
             end
 
@@ -260,11 +260,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
                     distributor.split_page_workload( pages ).map do |page_chunks|
                         workload << page_chunks.map(&:url)
                     end
-                    workload.should == [
+                    expect(workload).to eq([
                         ['http://test.com/1', 'http://test.com/2'],
                         ['http://test.com/3', 'http://test.com/4'],
                         ['http://test.com/5']
-                    ]
+                    ])
                 end
 
                 it 'does not audit them' do
@@ -280,11 +280,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
                         workload << page_chunks
                     end
                     workload.flatten!
-                    workload.size.should == 5
+                    expect(workload.size).to eq(5)
 
                     workload.each do |page|
-                        page.elements.should be_any
-                        page.elements.each { |e| page.audit_element?(e).should be_false }
+                        expect(page.elements).to be_any
+                        page.elements.each { |e| expect(page.audit_element?(e)).to be_falsey }
                     end
                 end
             end
@@ -301,7 +301,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                     get_distributor.split_page_workload( pages ).map do |page_chunks|
                         workload << page_chunks.map(&:url)
                     end
-                    workload.should == [
+                    expect(workload).to eq([
                         [
                             'http://test.com/0',
                             'http://test.com/1',
@@ -328,7 +328,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                             'http://test.com/18',
                             'http://test.com/19'
                         ]
-                    ]
+                    ])
                 end
             end
         end
@@ -360,10 +360,10 @@ describe Arachni::RPC::Server::Framework::Distributor do
                         workload << Hash[page_chunks.map { |p| [p.url, p.element_audit_whitelist.to_a] }]
                     end
 
-                    workload.should == [
+                    expect(workload).to eq([
                         { 'http://test.com/1' => [2835048516] },
                         { 'http://test.com/5' => [1397105343] }
-                    ]
+                    ])
                 end
             end
 
@@ -377,7 +377,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
                     distributor.split_page_workload( pages ).map do |page_chunks|
                         workload << Hash[page_chunks.map { |p| [p.url, p.audit_whitelist.to_a] }]
                     end
-                    workload.should == []
+                    expect(workload).to eq([])
                 end
             end
         end
@@ -396,7 +396,7 @@ describe Arachni::RPC::Server::Framework::Distributor do
     describe '#prepare_slave_options' do
         it 'returns a hash with options suitable for passing to slaves' do
             h = @distributor.prepare_slave_options
-            h['datastore'].should == { 'master_priv_token' => 'secret' }
+            expect(h['datastore']).to eq({ 'master_priv_token' => 'secret' })
         end
 
         it 'removes plugins which are not distributable'
@@ -413,11 +413,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
 
             raised = false
             begin
-                Timeout::timeout( 5 ) { q.pop.should == [true, true] }
+                Timeout::timeout( 5 ) { expect(q.pop).to eq([true, true]) }
             rescue Timeout::Error
                 raised = true
             end
-            raised.should be_false
+            expect(raised).to be_falsey
         end
     end
 
@@ -435,11 +435,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
 
             raised = false
             begin
-                Timeout::timeout( 5 ) { [q.pop, q.pop].should == [true, true] }
+                Timeout::timeout( 5 ) { expect([q.pop, q.pop]).to eq([true, true]) }
             rescue Timeout::Error
                 raised = true
             end
-            raised.should be_false
+            expect(raised).to be_falsey
         end
 
         context 'when passed an "after" block' do
@@ -458,11 +458,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
 
                 raised = false
                 begin
-                    Timeout::timeout( 5 ) { [q.pop, q.pop, q.pop].should == [true, true, :after] }
+                    Timeout::timeout( 5 ) { expect([q.pop, q.pop, q.pop]).to eq([true, true, :after]) }
                 rescue Timeout::Error
                     raised = true
                 end
-                raised.should be_false
+                expect(raised).to be_falsey
             end
 
         end
@@ -482,11 +482,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
 
             raised = false
             begin
-                Timeout::timeout( 5 ) { [q.pop, q.pop].sort.should == urls }
+                Timeout::timeout( 5 ) { expect([q.pop, q.pop].sort).to eq(urls) }
             rescue Timeout::Error
                 raised = true
             end
-            raised.should be_false
+            expect(raised).to be_falsey
         end
     end
 
@@ -504,11 +504,11 @@ describe Arachni::RPC::Server::Framework::Distributor do
 
             raised = false
             begin
-                Timeout::timeout( 5 ) { [q.pop, q.pop].sort.should == urls }
+                Timeout::timeout( 5 ) { expect([q.pop, q.pop].sort).to eq(urls) }
             rescue Timeout::Error
                 raised = true
             end
-            raised.should be_false
+            expect(raised).to be_falsey
         end
     end
 
@@ -567,10 +567,10 @@ describe Arachni::RPC::Server::Framework::Distributor do
                 raised = true
             end
 
-            raised.should be_false
+            expect(raised).to be_falsey
 
-            pref_dispatchers.size.should == 4
-            pref_dispatchers.should == dispatchers
+            expect(pref_dispatchers.size).to eq(4)
+            expect(pref_dispatchers).to eq(dispatchers)
         end
     end
 
@@ -582,18 +582,18 @@ describe Arachni::RPC::Server::Framework::Distributor do
             dispatchers << { 'node' => { 'score' => 2 } }
             dispatchers << { 'node' => { 'score' => 1 } }
 
-            @distributor.pick_dispatchers( dispatchers ).
-                map { |d| d['node']['score'] }.should == [0, 1, 2, 3]
+            expect(@distributor.pick_dispatchers( dispatchers ).
+                map { |d| d['node']['score'] }).to eq([0, 1, 2, 3])
 
             @opts.spawns = 2
-            @distributor.pick_dispatchers( dispatchers ).
-                map { |d| d['node']['score'] }.should == [0, 1]
+            expect(@distributor.pick_dispatchers( dispatchers ).
+                map { |d| d['node']['score'] }).to eq([0, 1])
         end
     end
 
     describe '#initialize_slaves' do
         #before( :all ) do
-        #    @opts.paths.checks = fixtures_path + 'taint_check/'
+        #    @opts.paths.checks = fixtures_path + 'signature_check/'
         #
         #    @dispatcher_url = dispatcher_light_spawn.url
         #