arachni 1.2.1 → 1.3

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

@@ -20,7 +20,7 @@ describe 'Arachni::RPC::Server::Framework' do
             it 'returns all logged errors' do
                 test = 'Test'
                 @instance.framework.error_test test
-                @instance.framework.errors.last.should end_with test
+                expect(@instance.framework.errors.last).to end_with test
             end
         end
         context 'when a start line-range has been provided' do
@@ -28,7 +28,7 @@ describe 'Arachni::RPC::Server::Framework' do
                 initial_errors = @instance.framework.errors
                 errors = @instance.framework.errors( 10 )
 
-                initial_errors[10..-1].should == errors
+                expect(initial_errors[10..-1]).to eq(errors)
             end
         end
     end
@@ -36,77 +36,77 @@ describe 'Arachni::RPC::Server::Framework' do
     describe '#busy?' do
         context 'when the scan is not running' do
             it 'returns false' do
-                @framework_clean.busy?.should be_false
+                expect(@framework_clean.busy?).to be_falsey
             end
         end
         context 'when the scan is running' do
             it 'returns true' do
                 @instance.options.url = web_server_url_for( :auditor ) + '/sleep'
                 @checks.load( 'test' )
-                @framework.run.should be_true
-                @framework.busy?.should be_true
+                expect(@framework.run).to be_truthy
+                expect(@framework.busy?).to be_truthy
             end
         end
     end
     describe '#version' do
         it 'returns the system version' do
-            @framework_clean.version.should == Arachni::VERSION
+            expect(@framework_clean.version).to eq(Arachni::VERSION)
         end
     end
     describe '#master?' do
         it 'returns false' do
-            @framework_clean.master?.should be_false
+            expect(@framework_clean.master?).to be_falsey
         end
     end
     describe '#slave?' do
         it 'returns false' do
-            @framework_clean.slave?.should be_false
+            expect(@framework_clean.slave?).to be_falsey
         end
     end
     describe '#solo?' do
         it 'returns true' do
-            @framework_clean.solo?.should be_true
+            expect(@framework_clean.solo?).to be_truthy
         end
     end
     describe '#list_plugins' do
         it 'lists all available plugins' do
             plugins = @framework_clean.list_plugins
-            plugins.size.should == 7
+            expect(plugins.size).to eq(7)
             plugin = plugins.select { |i| i[:name] =~ /default/i }.first
-            plugin[:name].should == 'Default'
-            plugin[:description].should == 'Some description'
-            plugin[:author].size.should == 1
-            plugin[:author].first.should == 'Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>'
-            plugin[:version].should == '0.1'
-            plugin[:shortname].should == 'default'
-            plugin[:options].size.should== 1
+            expect(plugin[:name]).to eq('Default')
+            expect(plugin[:description]).to eq('Some description')
+            expect(plugin[:author].size).to eq(1)
+            expect(plugin[:author].first).to eq('Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>')
+            expect(plugin[:version]).to eq('0.1')
+            expect(plugin[:shortname]).to eq('default')
+            expect(plugin[:options].size).to eq(1)
 
             opt = plugin[:options].first
-            opt[:name].should == :int_opt
-            opt[:required].should == false
-            opt[:description].should == 'An integer.'
-            opt[:default].should == 4
-            opt[:type].should == :integer
+            expect(opt[:name]).to eq(:int_opt)
+            expect(opt[:required]).to eq(false)
+            expect(opt[:description]).to eq('An integer.')
+            expect(opt[:default]).to eq(4)
+            expect(opt[:type]).to eq(:integer)
         end
     end
     describe '#list_reporters' do
         it 'lists all available reporters' do
             reporters = @framework_clean.list_reporters
-            reporters.should be_any
+            expect(reporters).to be_any
             report_with_opts = reporters.select{ |r| r[:options].any? }.first
-            report_with_opts[:options].first.should be_kind_of( Hash )
+            expect(report_with_opts[:options].first).to be_kind_of( Hash )
         end
     end
 
     describe '#list_checks' do
         it 'lists all available checks' do
-            @framework_clean.list_checks.should be_any
+            expect(@framework_clean.list_checks).to be_any
         end
     end
 
     describe '#list_platforms' do
         it 'lists all available platforms' do
-            @framework_clean.list_platforms.should == Arachni::Framework.new.list_platforms
+            expect(@framework_clean.list_platforms).to eq(Arachni::Framework.new.list_platforms)
         end
     end
 
@@ -117,38 +117,38 @@ describe 'Arachni::RPC::Server::Framework' do
             instance.checks.load( 'test' )
             instance.framework.run
             sleep( 1 ) while instance.framework.busy?
-            instance.framework.issues.should be_any
+            expect(instance.framework.issues).to be_any
         end
 
         it 'handles pages with JavaScript code' do
-            @opts.paths.checks = fixtures_path + '/taint_check/'
+            @opts.paths.checks = fixtures_path + '/signature_check/'
 
             instance = instance_spawn
             instance.options.url = web_server_url_for( :auditor ) + '/with_javascript'
             instance.options.set audit: { elements: [:links, :forms, :cookies] }
-            instance.checks.load :taint
+            instance.checks.load :signature
 
             instance.framework.run
             sleep 0.1 while instance.framework.busy?
 
-            instance.framework.issues.
-                map { |i| i.vector.affected_input_name }.uniq.should be
+            expect(instance.framework.issues.
+                map { |i| i.vector.affected_input_name }.uniq).to be
                 %w(link_input form_input cookie_input).sort
         end
 
         it 'handles AJAX' do
-            @opts.paths.checks = fixtures_path + '/taint_check/'
+            @opts.paths.checks = fixtures_path + '/signature_check/'
 
             instance = instance_spawn
             instance.options.url = web_server_url_for( :auditor ) + '/with_ajax'
             instance.options.set audit: { elements: [:links, :forms, :cookies] }
-            instance.checks.load :taint
+            instance.checks.load :signature
 
             instance.framework.run
             sleep 0.1 while instance.framework.busy?
 
-            instance.framework.issues.
-                map { |i| i.vector.affected_input_name }.uniq.should be
+            expect(instance.framework.issues.
+                map { |i| i.vector.affected_input_name }.uniq).to be
                 %w(link_input form_input cookie_taint).sort
         end
 
@@ -156,8 +156,8 @@ describe 'Arachni::RPC::Server::Framework' do
     describe '#report' do
         it 'returns an report object' do
             report = @instance_clean.framework.report
-            report.is_a?( Arachni::Report ).should be_true
-            report.issues.should be_any
+            expect(report.is_a?( Arachni::Report )).to be_truthy
+            expect(report.issues).to be_any
         end
     end
     describe '#statistics' do
@@ -165,9 +165,9 @@ describe 'Arachni::RPC::Server::Framework' do
             instance = @instance_clean
             instance.options.url = web_server_url_for( :framework )
             instance.checks.load( 'test' )
-            instance.framework.run.should be_true
+            expect(instance.framework.run).to be_truthy
 
-            instance.framework.statistics.should be_kind_of Hash
+            expect(instance.framework.statistics).to be_kind_of Hash
         end
     end
     describe '#status' do
@@ -178,14 +178,14 @@ describe 'Arachni::RPC::Server::Framework' do
         end
         context 'after initialization' do
             it 'returns :ready' do
-                @instance.framework.status.should == :ready
+                expect(@instance.framework.status).to eq(:ready)
             end
         end
         context 'after #run has been called' do
             it 'returns :scanning' do
-                @instance.framework.run.should be_true
+                expect(@instance.framework.run).to be_truthy
                 sleep 2
-                @instance.framework.status.should == :scanning
+                expect(@instance.framework.status).to eq(:scanning)
             end
         end
         context 'once the scan had completed' do
@@ -195,7 +195,7 @@ describe 'Arachni::RPC::Server::Framework' do
                 instance.checks.load( 'test' )
                 instance.framework.run
                 sleep 1 while instance.framework.busy?
-                instance.framework.status.should == :done
+                expect(instance.framework.status).to eq(:done)
             end
         end
     end
@@ -205,32 +205,33 @@ describe 'Arachni::RPC::Server::Framework' do
             instance.options.url = web_server_url_for( :framework_multi )
             instance.checks.load( 'test' )
             instance.plugins.load( { 'wait' => {} } )
-            instance.framework.run.should be_true
-            instance.framework.busy?.should be_true
-            instance.framework.report.plugins.should be_empty
-            instance.framework.clean_up.should be_true
+            expect(instance.framework.run).to be_truthy
+            expect(instance.framework.busy?).to be_truthy
+            expect(instance.framework.report.plugins).to be_empty
+            expect(instance.framework.clean_up).to be_truthy
             results = instance.framework.report.plugins
-            results.should be_any
-            results[:wait].should be_any
-            results[:wait][:results].should == { 'stuff' => true }
+            expect(results).to be_any
+            expect(results[:wait]).to be_any
+            expect(results[:wait][:results]).to eq({ 'stuff' => true })
         end
     end
     describe '#progress' do
-        before { @progress_keys = %W(statistics status busy messages issues).sort.map(&:to_sym) }
+        before { @progress_keys = %W(seed statistics status busy messages issues).sort.map(&:to_sym) }
 
         context 'when called without options' do
             it 'returns all progress data' do
                 instance = @instance_clean
 
                 data = instance.framework.progress
-                data.keys.sort.should == @progress_keys
-
-                data[:statistics].keys.should == instance.framework.statistics.keys
-                data[:messages].should be_empty
-                data[:status].should be_true
-                data[:busy].nil?.should be_false
-                data[:issues].should be_any
-                data.should_not include :errors
+                expect(data.keys.sort).to eq(@progress_keys)
+
+                expect(data[:statistics].keys).to eq(instance.framework.statistics.keys)
+                expect(data[:messages]).to be_empty
+                expect(data[:status]).to be_truthy
+                expect(data[:busy].nil?).to be_falsey
+                expect(data[:issues]).to be_any
+                expect(data[:seed]).not_to be_empty
+                expect(data).not_to include :errors
             end
         end
 
@@ -238,15 +239,15 @@ describe 'Arachni::RPC::Server::Framework' do
             describe :errors do
                 context 'when set to true' do
                     it 'includes all error messages' do
-                        @instance_clean.framework.
-                            progress( errors: true )[:errors].should be_empty
+                        expect(@instance_clean.framework.
+                            progress( errors: true )[:errors]).to be_empty
 
                         test = 'Test'
                         @instance_clean.framework.error_test test
 
-                        @instance_clean.framework.
-                            progress( errors: true )[:errors].last.
-                                should end_with test
+                        expect(@instance_clean.framework.
+                            progress( errors: true )[:errors].last).
+                                to end_with test
                     end
                 end
                 context 'when set to an Integer' do
@@ -259,7 +260,7 @@ describe 'Arachni::RPC::Server::Framework' do
                         errors = @instance_clean.framework.
                             progress( errors: 10 )[:errors]
 
-                        errors.should == initial_errors[10..-1]
+                        expect(errors).to eq(initial_errors[10..-1])
                     end
                 end
             end
@@ -267,9 +268,10 @@ describe 'Arachni::RPC::Server::Framework' do
             describe :sitemap do
                 context 'when set to true' do
                     it 'returns entire sitemap' do
-                        @instance_clean.framework.
-                            progress( sitemap: true )[:sitemap].should ==
+                        expect(@instance_clean.framework.
+                            progress( sitemap: true )[:sitemap]).to eq(
                             @instance_clean.framework.sitemap
+                        )
                     end
                 end
 
@@ -285,8 +287,9 @@ describe 'Arachni::RPC::Server::Framework' do
                         instance.framework.run
                         sleep 0.1 while instance.framework.busy?
 
-                        instance.framework.progress( sitemap: 10 )[:sitemap].should ==
+                        expect(instance.framework.progress( sitemap: 10 )[:sitemap]).to eq(
                             instance.framework.sitemap_entries( 10 )
+                        )
                     end
                 end
             end
@@ -294,18 +297,18 @@ describe 'Arachni::RPC::Server::Framework' do
             describe :issue do
                 context 'when set to false' do
                     it 'excludes issues' do
-                        @instance_clean.framework.progress(
+                        expect(@instance_clean.framework.progress(
                             issues: false
-                        ).should_not include :issues
+                        )).not_to include :issues
                     end
                 end
             end
             describe :as_hash do
                 context 'when set to true' do
                     it 'includes issues as a hash' do
-                        @instance_clean.framework.progress(
+                        expect(@instance_clean.framework.progress(
                             as_hash: true
-                        )[:issues].first.is_a?( Hash ).should be_true
+                        )[:issues].first.is_a?( Hash )).to be_truthy
                     end
                 end
             end
@@ -315,8 +318,9 @@ describe 'Arachni::RPC::Server::Framework' do
     describe '#sitemap_entries' do
         context 'when no argument has been provided' do
             it 'returns entire sitemap' do
-                @instance_clean.framework.sitemap_entries.should ==
+                expect(@instance_clean.framework.sitemap_entries).to eq(
                     @instance_clean.framework.sitemap
+                )
             end
         end
 
@@ -333,21 +337,22 @@ describe 'Arachni::RPC::Server::Framework' do
                 sleep 0.1 while instance.framework.busy?
 
                 sitemap = instance.framework.sitemap
-                instance.framework.sitemap_entries( 10 ).should ==
+                expect(instance.framework.sitemap_entries( 10 )).to eq(
                     Hash[sitemap.to_a[10..-1]]
+                )
             end
         end
     end
 
     describe '#self_url' do
         it 'returns the RPC URL' do
-            @instance_clean.framework.self_url.should == @instance_clean.url
+            expect(@instance_clean.framework.self_url).to eq(@instance_clean.url)
         end
     end
 
     describe '#token' do
         it 'returns the RPC token' do
-            @instance_clean.framework.token.should == instance_token_for( @instance_clean )
+            expect(@instance_clean.framework.token).to eq(instance_token_for( @instance_clean ))
         end
     end
 
@@ -355,8 +360,9 @@ describe 'Arachni::RPC::Server::Framework' do
         context 'when passed a valid reporter name' do
             it 'returns the report as a string' do
                 json = @instance_clean.framework.report_as( :json )
-                JSON.load( json )['issues'].size.should ==
+                expect(JSON.load( json )['issues'].size).to eq(
                     @instance_clean.framework.report.issues.size
+                )
             end
 
             context 'which does not support the \'outfile\' option' do
@@ -374,23 +380,22 @@ describe 'Arachni::RPC::Server::Framework' do
     end
 
     describe '#issues' do
-        it 'returns an array of issues without variations' do
+        it 'returns an array of issues' do
             issues = @instance_clean.framework.issues
-            issues.should be_any
+            expect(issues).to be_any
 
             issue = issues.first
-            issue.is_a?( Arachni::Issue ).should be_true
-            issue.variations.should be_empty
+            expect(issue.is_a?( Arachni::Issue )).to be_truthy
         end
     end
+
     describe '#issues_as_hash' do
-        it 'returns an array of issues (as hash) without variations' do
+        it 'returns an array of issues as hash' do
             issues = @instance_clean.framework.issues_as_hash
-            issues.should be_any
+            expect(issues).to be_any
 
             issue = issues.first
-            issue.is_a?( Hash ).should be_true
-            issue['variations'].should be_empty
+            expect(issue.is_a?( Hash )).to be_truthy
         end
     end
 end

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

@@ -25,14 +25,14 @@ describe 'Arachni::RPC::Server::Instance' do
     it 'supports UNIX sockets', if: Arachni::Reactor.supports_unix_sockets? do
         socket = "#{Dir.tmpdir}/arachni-instance-#{@utils.generate_token}"
         @instance = instance_spawn( socket: socket )
-        @instance.framework.multi_self_url.should == socket
-        @instance.service.alive?.should be_true
+        expect(@instance.framework.multi_self_url).to eq(socket)
+        expect(@instance.service.alive?).to be_truthy
     end
 
     describe '#snapshot_path' do
         context 'when the scan has not been suspended' do
             it 'returns nil' do
-                @shared_instance.service.snapshot_path.should be_nil
+                expect(@shared_instance.service.snapshot_path).to be_nil
             end
         end
 
@@ -56,7 +56,7 @@ describe 'Arachni::RPC::Server::Instance' do
                     sleep 1 while @instance.service.status != :suspended
                 end
 
-                File.exists?( @instance.service.snapshot_path ).should be_true
+                expect(File.exists?( @instance.service.snapshot_path )).to be_truthy
             end
         end
     end
@@ -81,7 +81,7 @@ describe 'Arachni::RPC::Server::Instance' do
                 sleep 1 while @instance.service.status != :suspended
             end
 
-            File.exists?( @instance.service.snapshot_path ).should be_true
+            expect(File.exists?( @instance.service.snapshot_path )).to be_truthy
         end
 
         context 'when performing a multi-Instance scan' do
@@ -107,7 +107,7 @@ describe 'Arachni::RPC::Server::Instance' do
     describe '#suspended?' do
         context 'when the scan has not been suspended' do
             it 'returns false' do
-                @shared_instance.service.should_not be_suspended
+                expect(@shared_instance.service).not_to be_suspended
             end
         end
 
@@ -131,7 +131,7 @@ describe 'Arachni::RPC::Server::Instance' do
                     sleep 1 while @instance.service.status != :suspended
                 end
 
-                @instance.service.should be_suspended
+                expect(@instance.service).to be_suspended
             end
         end
     end
@@ -168,7 +168,7 @@ describe 'Arachni::RPC::Server::Instance' do
 
             sleep 1 while @instance.service.busy?
 
-            @instance.service.report[:options].should == options
+            expect(@instance.service.report[:options]).to eq(options)
         end
     end
 
@@ -178,7 +178,7 @@ describe 'Arachni::RPC::Server::Instance' do
                 it 'returns all logged errors' do
                     test = 'Test'
                     @shared_instance.service.error_test test
-                    @shared_instance.service.errors.last.should end_with test
+                    expect(@shared_instance.service.errors.last).to end_with test
                 end
             end
             context 'when a start line-range has been provided' do
@@ -186,7 +186,7 @@ describe 'Arachni::RPC::Server::Instance' do
                     initial_errors = @shared_instance.service.errors
                     errors = @shared_instance.service.errors( 10 )
 
-                    initial_errors[10..-1].should == errors
+                    expect(initial_errors[10..-1]).to eq(errors)
                 end
             end
         end
@@ -194,19 +194,19 @@ describe 'Arachni::RPC::Server::Instance' do
         describe '#error_logfile' do
             it 'returns the path to the error logfile' do
                 errors = IO.read( @shared_instance.service.error_logfile ).split( "\n" )
-                errors.should == @shared_instance.service.errors
+                expect(errors).to eq(@shared_instance.service.errors)
             end
         end
         describe '#alive?' do
             it 'returns true' do
-                @shared_instance.service.alive?.should == true
+                expect(@shared_instance.service.alive?).to eq(true)
             end
         end
         describe '#paused?' do
             context 'when not paused' do
                 it 'returns false' do
                     @instance = instance_spawn
-                    @instance.service.paused?.should be_false
+                    expect(@instance.service.paused?).to be_falsey
                 end
             end
             context 'when paused' do
@@ -218,13 +218,13 @@ describe 'Arachni::RPC::Server::Instance' do
                     )
 
                     instance.service.pause
-                    instance.service.status.should == :pausing
+                    expect(instance.service.status).to eq(:pausing)
 
                     Timeout.timeout 20 do
                         sleep 1 while !instance.service.paused?
                     end
 
-                    instance.service.paused?.should be_true
+                    expect(instance.service.paused?).to be_truthy
                 end
             end
         end
@@ -237,27 +237,27 @@ describe 'Arachni::RPC::Server::Instance' do
                 )
 
                 instance.service.pause
-                instance.service.status.should == :pausing
+                expect(instance.service.status).to eq(:pausing)
 
                 Timeout.timeout 20 do
                     sleep 1 while !instance.service.paused?
                 end
 
-                instance.service.paused?.should be_true
-                instance.service.resume.should be_true
+                expect(instance.service.paused?).to be_truthy
+                expect(instance.service.resume).to be_truthy
 
                 Timeout.timeout 20 do
                     sleep 1 while instance.service.paused?
                 end
 
-                instance.service.paused?.should be_false
+                expect(instance.service.paused?).to be_falsey
             end
         end
 
         [:list_platforms, :list_checks, :list_plugins, :list_reporters, :busy?].each do |m|
             describe "##{m}" do
                 it "delegates to Framework##{m}" do
-                    @shared_instance.service.send(m).should == @shared_instance.framework.send(m)
+                    expect(@shared_instance.service.send(m)).to eq(@shared_instance.framework.send(m))
                 end
             end
         end
@@ -274,41 +274,43 @@ describe 'Arachni::RPC::Server::Instance' do
                     framework_report.delete k
                 end
 
-                instance_report.should == framework_report
+                expect(instance_report).to eq(framework_report)
             end
         end
 
         describe '#abort_and_report' do
             it 'cleans-up and returns the report as a Hash' do
-                @shared_instance.service.abort_and_report.should ==
+                expect(@shared_instance.service.abort_and_report).to eq(
                     Arachni::RPC::Serializer.load(
                         Arachni::RPC::Serializer.dump( @shared_instance.framework.report.to_h )
                     )
+                )
             end
         end
 
         describe '#native_abort_and_report' do
             it "cleans-up and returns the report as #{Arachni::Report}" do
-                @shared_instance.service.native_abort_and_report.should ==
+                expect(@shared_instance.service.native_abort_and_report).to eq(
                     @shared_instance.framework.report
+                )
             end
         end
 
         describe '#abort_and_report_as' do
             it 'cleans-up and delegate to #report_as' do
-                JSON.load( @shared_instance.service.abort_and_report_as( :json ) ).should include 'issues'
+                expect(JSON.load( @shared_instance.service.abort_and_report_as( :json ) )).to include 'issues'
             end
         end
 
         describe '#report_as' do
             it 'delegates to Framework#report_as' do
-                JSON.load( @shared_instance.service.report_as( :json ) ).should include 'issues'
+                expect(JSON.load( @shared_instance.service.report_as( :json ) )).to include 'issues'
             end
         end
 
         describe '#status' do
             it 'delegate to Framework#status' do
-                @shared_instance.service.status.should == @shared_instance.framework.status
+                expect(@shared_instance.service.status).to eq(@shared_instance.framework.status)
             end
         end
 
@@ -318,8 +320,8 @@ describe 'Arachni::RPC::Server::Instance' do
 
                 slave = instance_spawn
 
-                instance.service.busy?.should  == instance.framework.busy?
-                instance.service.status.should == instance.framework.status
+                expect(instance.service.busy?).to  eq(instance.framework.busy?)
+                expect(instance.service.status).to eq(instance.framework.status)
 
                 instance.service.scan(
                     url:    web_server_url_for( :framework ),
@@ -332,15 +334,15 @@ describe 'Arachni::RPC::Server::Instance' do
                 )
 
                 # if a scan in already running it should just bail out early
-                instance.service.scan.should be_false
+                expect(instance.service.scan).to be_falsey
 
                 sleep 1 while instance.service.busy?
 
-                instance.framework.progress[:instances].size.should == 2
+                expect(instance.framework.progress[:instances].size).to eq(2)
 
-                instance.service.busy?.should  == instance.framework.busy?
-                instance.service.status.should == instance.framework.status
-                instance.service.report['issues'].should be_any
+                expect(instance.service.busy?).to  eq(instance.framework.busy?)
+                expect(instance.service.status).to eq(instance.framework.status)
+                expect(instance.service.report['issues']).to be_any
             end
 
             context 'with invalid :platforms' do
@@ -372,16 +374,16 @@ describe 'Arachni::RPC::Server::Instance' do
                                     )
 
                                     # if a scan in already running it should just bail out early
-                                    instance.service.scan.should be_false
+                                    expect(instance.service.scan).to be_falsey
 
                                     sleep 1 while instance.service.busy?
 
                                     # Since we've only got 3 Dispatchers in the Grid.
-                                    instance.framework.progress[:instances].size.should == 3
+                                    expect(instance.framework.progress[:instances].size).to eq(3)
 
-                                    instance.service.busy?.should  == instance.framework.busy?
-                                    instance.service.status.should == instance.framework.status
-                                    instance.service.report['issues'].should be_any
+                                    expect(instance.service.busy?).to  eq(instance.framework.busy?)
+                                    expect(instance.service.status).to eq(instance.framework.status)
+                                    expect(instance.service.report['issues']).to be_any
                                 end
                             end
                             context :balance do
@@ -397,17 +399,17 @@ describe 'Arachni::RPC::Server::Instance' do
                                     )
 
                                     # if a scan in already running it should just bail out early
-                                    instance.service.scan.should be_false
+                                    expect(instance.service.scan).to be_falsey
 
                                     sleep 1 while instance.service.busy?
 
                                     # No matter how many grid members with unique Pipe-IDs there are
                                     # since we're in balance mode.
-                                    instance.framework.progress[:instances].size.should == 5
+                                    expect(instance.framework.progress[:instances].size).to eq(5)
 
-                                    instance.service.busy?.should  == instance.framework.busy?
-                                    instance.service.status.should == instance.framework.status
-                                    instance.service.report['issues'].should be_any
+                                    expect(instance.service.busy?).to  eq(instance.framework.busy?)
+                                    expect(instance.service.status).to eq(instance.framework.status)
+                                    expect(instance.service.report['issues']).to be_any
                                 end
                             end
 
@@ -442,17 +444,17 @@ describe 'Arachni::RPC::Server::Instance' do
                                     )
 
                                     # if a scan in already running it should just bail out early
-                                    instance.service.scan.should be_false
+                                    expect(instance.service.scan).to be_falsey
 
                                     sleep 1 while instance.service.busy?
 
                                     # No matter how many grid members with unique Pipe-IDs there are
                                     # since we're in balance mode.
-                                    instance.framework.progress[:instances].size.should == 5
+                                    expect(instance.framework.progress[:instances].size).to eq(5)
 
-                                    instance.service.busy?.should  == instance.framework.busy?
-                                    instance.service.status.should == instance.framework.status
-                                    instance.service.report['issues'].should be_any
+                                    expect(instance.service.busy?).to  eq(instance.framework.busy?)
+                                    expect(instance.service.status).to eq(instance.framework.status)
+                                    expect(instance.service.report['issues']).to be_any
                                 end
                             end
                         end
@@ -471,7 +473,7 @@ describe 'Arachni::RPC::Server::Instance' do
                                     raised = e.rpc_exception?
                                 end
 
-                                raised.should be_true
+                                expect(raised).to be_truthy
                             end
                         end
 
@@ -492,7 +494,7 @@ describe 'Arachni::RPC::Server::Instance' do
                                     raised = e.rpc_exception?
                                 end
 
-                                raised.should be_true
+                                expect(raised).to be_truthy
                             end
                         end
 
@@ -512,11 +514,11 @@ describe 'Arachni::RPC::Server::Instance' do
 
                         sleep 1 while instance.service.busy?
 
-                        instance.framework.progress[:instances].size.should == 5
+                        expect(instance.framework.progress[:instances].size).to eq(5)
 
-                        instance.service.busy?.should  == instance.framework.busy?
-                        instance.service.status.should == instance.framework.status
-                        instance.service.report['issues'].should be_any
+                        expect(instance.service.busy?).to  eq(instance.framework.busy?)
+                        expect(instance.service.status).to eq(instance.framework.status)
+                        expect(instance.service.report['issues']).to be_any
                     end
                 end
             end
@@ -545,20 +547,21 @@ describe 'Arachni::RPC::Server::Instance' do
                 instance = @progress_instance
 
                 p = instance.service.progress
-                p[:busy].should   == instance.framework.busy?
-                p[:status].should == instance.framework.status
-                p[:statistics].should  be_any
+                expect(p[:busy]).to   eq(instance.framework.busy?)
+                expect(p[:status]).to eq(instance.framework.status)
+                expect(p[:statistics]).to  be_any
 
-                p[:instances].should be_nil
-                p[:issues].should be_nil
+                expect(p[:instances]).to be_nil
+                expect(p[:issues]).to be_nil
+                expect(p[:seed]).not_to be_empty
             end
 
             describe :without do
                 describe :statistics do
                     it 'includes statistics' do
-                        @progress_instance.service.progress(
+                        expect(@progress_instance.service.progress(
                             without: :statistics
-                        ).should_not include :statistics
+                        )).not_to include :statistics
                     end
                 end
                 describe :issues do
@@ -572,7 +575,7 @@ describe 'Arachni::RPC::Server::Instance' do
                             without: { issues: [digest] }
                         )
 
-                        p[:issues].include?( issue ).should be_false
+                        expect(p[:issues].include?( issue )).to be_falsey
                     end
                 end
                 context 'with an array of things to be excluded'  do
@@ -587,8 +590,8 @@ describe 'Arachni::RPC::Server::Instance' do
                             with:    [ :issues, :instances ],
                             without: [ :statistics,  issues: [digest] ]
                         )
-                        p.should_not include :statistics
-                        p[:issues].include?( issue ).should be_false
+                        expect(p).not_to include :statistics
+                        expect(p[:issues].include?( issue )).to be_falsey
                     end
                 end
             end
@@ -599,9 +602,9 @@ describe 'Arachni::RPC::Server::Instance' do
                         instance = @progress_instance
 
                         issues = instance.service.progress( with: :issues )[:issues]
-                        issues.should be_any
-                        issues.first.class.should == Hash
-                        issues.should == instance.framework.progress( as_hash: true )[:issues]
+                        expect(issues).to be_any
+                        expect(issues.first.class).to eq(Hash)
+                        expect(issues).to eq(instance.framework.progress( as_hash: true )[:issues])
                     end
                 end
 
@@ -612,11 +615,18 @@ describe 'Arachni::RPC::Server::Instance' do
                         stats1 = instance.service.progress( with: :instances )[:instances]
                         stats2 = instance.framework.progress[:instances]
 
-                        stats1.each { |h| h[:statistics].delete :runtime }
-                        stats2.each { |h| h[:statistics].delete :runtime }
+                        stats1.each do |h|
+                            h[:statistics][:http].delete :burst_responses_per_second
+                            h[:statistics].delete :runtime
+                        end
+
+                        stats2.each do |h|
+                            h[:statistics][:http].delete :burst_responses_per_second
+                            h[:statistics].delete :runtime
+                        end
 
-                        stats1.size.should == 2
-                        stats1.should == stats2
+                        expect(stats1.size).to eq(2)
+                        expect(stats1).to eq(stats2)
                     end
                 end
 
@@ -625,9 +635,10 @@ describe 'Arachni::RPC::Server::Instance' do
                         it 'returns entire sitemap' do
                             instance = @progress_instance
 
-                            instance.service.
-                                progress( with: { sitemap: true } )[:sitemap].should ==
+                            expect(instance.service.
+                                progress( with: { sitemap: true } )[:sitemap]).to eq(
                                     instance.service.sitemap
+                            )
                         end
                     end
 
@@ -635,9 +646,10 @@ describe 'Arachni::RPC::Server::Instance' do
                         it 'returns all entries after that line' do
                             instance = @progress_instance
 
-                            instance.service.
-                                progress( with: { sitemap: 10 } )[:sitemap].should ==
+                            expect(instance.service.
+                                progress( with: { sitemap: 10 } )[:sitemap]).to eq(
                                     instance.service.sitemap( 10 )
+                            )
                         end
                     end
                 end
@@ -650,12 +662,12 @@ describe 'Arachni::RPC::Server::Instance' do
                             with:    [ :issues, :instances ],
                             without: :statistics
                         )
-                        p[:busy].should   == instance.framework.busy?
-                        p[:status].should == instance.framework.status
-                        p[:statistics].should  be_nil
+                        expect(p[:busy]).to   eq(instance.framework.busy?)
+                        expect(p[:status]).to eq(instance.framework.status)
+                        expect(p[:statistics]).to  be_nil
 
-                        p[:instances].size.should == 2
-                        p[:issues].should be_any
+                        expect(p[:instances].size).to eq(2)
+                        expect(p[:issues]).to be_any
                     end
                 end
             end
@@ -680,20 +692,20 @@ describe 'Arachni::RPC::Server::Instance' do
                 instance = @progress_instance
 
                 p = instance.service.native_progress
-                p[:busy].should   == instance.framework.busy?
-                p[:status].should == instance.framework.status
-                p[:statistics].should  be_any
+                expect(p[:busy]).to   eq(instance.framework.busy?)
+                expect(p[:status]).to eq(instance.framework.status)
+                expect(p[:statistics]).to  be_any
 
-                p[:instances].should be_nil
-                p[:issues].should be_nil
+                expect(p[:instances]).to be_nil
+                expect(p[:issues]).to be_nil
             end
 
             describe :without do
                 describe :statistics do
                     it 'includes statistics' do
-                        @progress_instance.service.native_progress(
+                        expect(@progress_instance.service.native_progress(
                             without: :statistics
-                        ).should_not include :statistics
+                        )).not_to include :statistics
                     end
                 end
                 describe :issues do
@@ -707,7 +719,7 @@ describe 'Arachni::RPC::Server::Instance' do
                             without: { issues: [digest] }
                         )
 
-                        p[:issues].include?( issue ).should be_false
+                        expect(p[:issues].include?( issue )).to be_falsey
                     end
                 end
                 context 'with an array of things to be excluded'  do
@@ -722,8 +734,8 @@ describe 'Arachni::RPC::Server::Instance' do
                             with:    [ :issues, :instances ],
                             without: [ :statistics,  issues: [digest] ]
                         )
-                        p.should_not include :statistics
-                        p[:issues].include?( issue ).should be_false
+                        expect(p).not_to include :statistics
+                        expect(p[:issues].include?( issue )).to be_falsey
                     end
                 end
             end
@@ -734,8 +746,8 @@ describe 'Arachni::RPC::Server::Instance' do
                         instance = @progress_instance
 
                         issues = instance.service.native_progress( with: :issues )[:issues]
-                        issues.should be_any
-                        issues.first.class.should == Arachni::Issue
+                        expect(issues).to be_any
+                        expect(issues.first.class).to eq(Arachni::Issue)
                     end
                 end
 
@@ -746,11 +758,18 @@ describe 'Arachni::RPC::Server::Instance' do
                         stats1 = instance.service.native_progress( with: :instances )[:instances]
                         stats2 = instance.framework.progress[:instances]
 
-                        stats1.each { |h| h[:statistics].delete :runtime }
-                        stats2.each { |h| h[:statistics].delete :runtime }
+                        stats1.each do |h|
+                            h[:statistics][:http].delete :burst_responses_per_second
+                            h[:statistics].delete :runtime
+                        end
+
+                        stats2.each do |h|
+                            h[:statistics][:http].delete :burst_responses_per_second
+                            h[:statistics].delete :runtime
+                        end
 
-                        stats1.size.should == 2
-                        stats1.should == stats2
+                        expect(stats1.size).to eq(2)
+                        expect(stats1).to eq(stats2)
                     end
                 end
 
@@ -762,12 +781,12 @@ describe 'Arachni::RPC::Server::Instance' do
                             with:    [ :issues, :instances ],
                             without: :statistics
                         )
-                        p[:busy].should   == instance.framework.busy?
-                        p[:status].should == instance.framework.status
-                        p[:statistics].should  be_nil
+                        expect(p[:busy]).to   eq(instance.framework.busy?)
+                        expect(p[:status]).to eq(instance.framework.status)
+                        expect(p[:statistics]).to  be_nil
 
-                        p[:instances].size.should == 2
-                        p[:issues].should be_any
+                        expect(p[:instances].size).to eq(2)
+                        expect(p[:issues]).to be_any
                     end
                 end
             end
@@ -776,7 +795,7 @@ describe 'Arachni::RPC::Server::Instance' do
         describe '#shutdown' do
             it 'shuts-down the instance' do
                 instance = instance_spawn
-                instance.service.shutdown.should be_true
+                expect(instance.service.shutdown).to be_truthy
                 sleep 4
 
                 expect { instance.service.alive? }.to raise_error
@@ -786,7 +805,7 @@ describe 'Arachni::RPC::Server::Instance' do
 
     describe '#framework' do
         it 'provides access to the Framework' do
-            @shared_instance.framework.busy?.should be_false
+            expect(@shared_instance.framework.busy?).to be_falsey
         end
     end
 
@@ -794,20 +813,20 @@ describe 'Arachni::RPC::Server::Instance' do
         it 'provides access to the Options' do
             url = 'http://blah.com'
             @shared_instance.options.url = url
-            @shared_instance.options.url.to_s.should == @utils.normalize_url( url )
+            expect(@shared_instance.options.url.to_s).to eq(@utils.normalize_url( url ))
         end
     end
 
     describe '#checks' do
         it 'provides access to the checks manager' do
-            @shared_instance.checks.available.sort.should == %w(test test2 test3).sort
+            expect(@shared_instance.checks.available.sort).to eq(%w(test test2 test3).sort)
         end
     end
 
     describe '#plugins' do
         it 'provides access to the plugin manager' do
-            @shared_instance.plugins.available.sort.should == %w(wait bad distributable
-                loop default with_options suspendable).sort
+            expect(@shared_instance.plugins.available.sort).to eq(%w(wait bad distributable
+                loop default with_options suspendable).sort)
         end
     end
 end