arachni 1.2.1 → 1.3

data/spec/arachni/framework/parts/browser_spec.rb

@@ -7,21 +7,21 @@ describe Arachni::Framework::Parts::Browser do
         context 'when #use_browsers? is' do
             context true do
                 before do
-                    subject.stub(:use_browsers?) { true }
+                    allow(subject).to receive(:use_browsers?) { true }
                 end
 
                 it "returns #{Arachni::BrowserCluster}" do
-                    subject.browser_cluster.should be_kind_of Arachni::BrowserCluster
+                    expect(subject.browser_cluster).to be_kind_of Arachni::BrowserCluster
                 end
             end
 
             context false do
                 before do
-                    subject.stub(:use_browsers?) { false }
+                    allow(subject).to receive(:use_browsers?) { false }
                 end
 
                 it 'returns nil' do
-                    subject.browser_cluster.should be_nil
+                    expect(subject.browser_cluster).to be_nil
                 end
             end
         end
@@ -35,7 +35,7 @@ describe Arachni::Framework::Parts::Browser do
                 end
 
                 it 'returns false' do
-                    subject.use_browsers?.should be_false
+                    expect(subject.use_browsers?).to be_falsey
                 end
             end
 
@@ -45,7 +45,7 @@ describe Arachni::Framework::Parts::Browser do
                 end
 
                 it 'returns true' do
-                    subject.use_browsers?.should be_true
+                    expect(subject.use_browsers?).to be_truthy
                 end
             end
         end
@@ -57,7 +57,7 @@ describe Arachni::Framework::Parts::Browser do
                 end
 
                 it 'returns false' do
-                    subject.use_browsers?.should be_false
+                    expect(subject.use_browsers?).to be_falsey
                 end
             end
 
@@ -67,7 +67,7 @@ describe Arachni::Framework::Parts::Browser do
                 end
 
                 it 'returns true' do
-                    subject.use_browsers?.should be_true
+                    expect(subject.use_browsers?).to be_truthy
                 end
             end
         end
@@ -75,21 +75,21 @@ describe Arachni::Framework::Parts::Browser do
         context 'when #host_has_browser? is' do
             context true do
                 before do
-                    subject.stub(:use_browsers?) { true }
+                    allow(subject).to receive(:use_browsers?) { true }
                 end
 
                 it 'returns true' do
-                    subject.use_browsers?.should be_true
+                    expect(subject.use_browsers?).to be_truthy
                 end
             end
 
             context false do
                 before do
-                    subject.stub(:host_has_browser?) { false }
+                    allow(subject).to receive(:host_has_browser?) { false }
                 end
 
                 it 'returns false' do
-                    subject.use_browsers?.should be_false
+                    expect(subject.use_browsers?).to be_falsey
                 end
             end
         end
@@ -99,21 +99,21 @@ describe Arachni::Framework::Parts::Browser do
         context "when #{Arachni::Browser}.has_executable? is" do
             context true do
                 before do
-                    Arachni::Browser.stub(:has_executable?) { true }
+                    allow(Arachni::Browser).to receive(:has_executable?) { true }
                 end
 
                 it 'returns true' do
-                    subject.host_has_browser?.should be_true
+                    expect(subject.host_has_browser?).to be_truthy
                 end
             end
 
             context false do
                 before do
-                    Arachni::Browser.stub(:has_executable?) { false }
+                    allow(Arachni::Browser).to receive(:has_executable?) { false }
                 end
 
                 it 'returns false' do
-                    subject.host_has_browser?.should be_false
+                    expect(subject.host_has_browser?).to be_falsey
                 end
             end
         end

data/spec/arachni/framework/parts/check_spec.rb

@@ -5,8 +5,8 @@ describe Arachni::Framework::Parts::Check do
 
     describe '#checks' do
         it 'provides access to the check manager' do
-            subject.checks.is_a?( Arachni::Check::Manager ).should be_true
-            subject.checks.available.should == %w(taint)
+            expect(subject.checks.is_a?( Arachni::Check::Manager )).to be_truthy
+            expect(subject.checks.available).to eq(%w(signature))
         end
     end
 
@@ -15,7 +15,7 @@ describe Arachni::Framework::Parts::Check do
             it 'uses it to filter out checks that do not match it' do
                 subject.list_checks( 'boo' ).size == 0
 
-                subject.list_checks( 'taint' ).should == subject.list_checks
+                expect(subject.list_checks( 'signature' )).to eq(subject.list_checks)
                 subject.list_checks.size == 1
             end
         end

data/spec/arachni/framework/parts/data_spec.rb

@@ -5,7 +5,7 @@ describe Arachni::Framework::Parts::Data do
 
     describe '#data' do
         it "returns #{Arachni::Data::Framework}" do
-            subject.data.should be_kind_of Arachni::Data::Framework
+            expect(subject.data).to be_kind_of Arachni::Data::Framework
         end
     end
 
@@ -14,10 +14,10 @@ describe Arachni::Framework::Parts::Data do
             Arachni::Framework.new do |f|
                 f.options.url = "#{@url}/"
                 f.options.audit.elements :links, :forms, :cookies
-                f.checks.load :taint
+                f.checks.load :signature
 
                 f.run
-                f.sitemap.should == { "#{@url}/" => 200 }
+                expect(f.sitemap).to eq({ "#{@url}/" => 200 })
             end
         end
     end
@@ -27,33 +27,33 @@ describe Arachni::Framework::Parts::Data do
 
         it 'pushes it to the page audit queue and returns true' do
             subject.options.audit.elements :links, :forms, :cookies
-            subject.checks.load :taint
+            subject.checks.load :signature
 
-            subject.page_queue_total_size.should == 0
-            subject.push_to_page_queue( page ).should be_true
+            expect(subject.page_queue_total_size).to eq(0)
+            expect(subject.push_to_page_queue( page )).to be_truthy
             subject.run
 
-            subject.report.issues.size.should == 1
-            subject.page_queue_total_size.should > 0
+            expect(subject.report.issues.size).to eq(1)
+            expect(subject.page_queue_total_size).to be > 0
         end
 
         it 'updates the #sitemap with the DOM URL' do
             subject.options.audit.elements :links, :forms, :cookies
-            subject.checks.load :taint
+            subject.checks.load :signature
 
-            subject.sitemap.should be_empty
+            expect(subject.sitemap).to be_empty
 
             page = Arachni::Page.from_url( @url + '/link' )
             page.dom.url = @url + '/link/#/stuff'
 
             subject.push_to_page_queue page
-            subject.sitemap.should include @url + '/link/#/stuff'
+            expect(subject.sitemap).to include @url + '/link/#/stuff'
         end
 
         it "passes it to #{Arachni::ElementFilter}#update_from_page_cache" do
             page = Arachni::Page.from_url( @url + '/link' )
 
-            Arachni::ElementFilter.should receive(:update_from_page_cache).with(page)
+            expect(Arachni::ElementFilter).to receive(:update_from_page_cache).with(page)
 
             subject.push_to_page_queue page
         end
@@ -62,58 +62,58 @@ describe Arachni::Framework::Parts::Data do
             it 'ignores it' do
                 page = Arachni::Page.from_url( @url + '/stuff' )
 
-                subject.page_queue_total_size.should == 0
+                expect(subject.page_queue_total_size).to eq(0)
                 subject.push_to_page_queue( page )
                 subject.push_to_page_queue( page )
                 subject.push_to_page_queue( page )
-                subject.page_queue_total_size.should == 1
+                expect(subject.page_queue_total_size).to eq(1)
             end
 
             it 'returns false' do
                 page = Arachni::Page.from_url( @url + '/stuff' )
 
-                subject.page_queue_total_size.should == 0
-                subject.push_to_page_queue( page ).should be_true
-                subject.push_to_page_queue( page ).should be_false
-                subject.push_to_page_queue( page ).should be_false
-                subject.page_queue_total_size.should == 1
+                expect(subject.page_queue_total_size).to eq(0)
+                expect(subject.push_to_page_queue( page )).to be_truthy
+                expect(subject.push_to_page_queue( page )).to be_falsey
+                expect(subject.push_to_page_queue( page )).to be_falsey
+                expect(subject.page_queue_total_size).to eq(1)
             end
         end
 
         context 'when #accepts_more_pages?' do
             context false do
                 it 'returns false' do
-                    subject.stub(:accepts_more_pages?) { false }
-                    subject.push_to_page_queue( page ).should be_false
+                    allow(subject).to receive(:accepts_more_pages?) { false }
+                    expect(subject.push_to_page_queue( page )).to be_falsey
                 end
             end
 
             context true do
                 it 'returns true' do
-                    subject.stub(:accepts_more_pages?) { true }
-                    subject.push_to_page_queue( page ).should be_true
+                    allow(subject).to receive(:accepts_more_pages?) { true }
+                    expect(subject.push_to_page_queue( page )).to be_truthy
                 end
             end
         end
 
         context "when #{Arachni::Page::Scope}#out? is true" do
             it 'returns false' do
-                Arachni::Page::Scope.any_instance.stub(:out?) { true }
-                subject.push_to_page_queue( page ).should be_false
+                allow_any_instance_of(Arachni::Page::Scope).to receive(:out?) { true }
+                expect(subject.push_to_page_queue( page )).to be_falsey
             end
         end
 
         context "when #{Arachni::URI::Scope}#redundant? is true" do
             it 'returns false' do
-                Arachni::Page::Scope.any_instance.stub(:redundant?) { true }
-                subject.push_to_page_queue( page ).should be_false
+                allow_any_instance_of(Arachni::Page::Scope).to receive(:redundant?) { true }
+                expect(subject.push_to_page_queue( page )).to be_falsey
             end
         end
 
         context "when #{Arachni::Page::Scope}#auto_redundant? is true" do
             it 'returns false' do
-                Arachni::Page::Scope.any_instance.stub(:auto_redundant?) { true }
-                subject.push_to_page_queue( page ).should be_false
+                allow_any_instance_of(Arachni::Page::Scope).to receive(:auto_redundant?) { true }
+                expect(subject.push_to_page_queue( page )).to be_falsey
             end
         end
     end
@@ -121,65 +121,65 @@ describe Arachni::Framework::Parts::Data do
     describe '#push_to_url_queue' do
         it 'pushes a URL to the URL audit queue' do
             subject.options.audit.elements :links, :forms, :cookies
-            subject.checks.load :taint
+            subject.checks.load :signature
 
-            subject.url_queue_total_size.should == 0
-            subject.push_to_url_queue(  @url + '/link' ).should be_true
+            expect(subject.url_queue_total_size).to eq(0)
+            expect(subject.push_to_url_queue(  @url + '/link' )).to be_truthy
             subject.run
 
-            subject.report.issues.size.should == 1
-            subject.url_queue_total_size.should == 3
+            expect(subject.report.issues.size).to eq(1)
+            expect(subject.url_queue_total_size).to eq(3)
         end
 
         context 'when the URL has already been seen' do
             it 'returns false' do
-                subject.push_to_url_queue( @url + '/link' ).should be_true
-                subject.push_to_url_queue( @url + '/link' ).should be_false
+                expect(subject.push_to_url_queue( @url + '/link' )).to be_truthy
+                expect(subject.push_to_url_queue( @url + '/link' )).to be_falsey
             end
 
             it 'ignores it' do
-                subject.url_queue_total_size.should == 0
+                expect(subject.url_queue_total_size).to eq(0)
                 subject.push_to_url_queue( @url + '/link' )
                 subject.push_to_url_queue( @url + '/link' )
                 subject.push_to_url_queue( @url + '/link' )
-                subject.url_queue_total_size.should == 1
+                expect(subject.url_queue_total_size).to eq(1)
             end
         end
 
         context 'when #accepts_more_pages?' do
             context false do
                 it 'returns false' do
-                    subject.stub(:accepts_more_pages?) { false }
-                    subject.push_to_url_queue( @url ).should be_false
+                    allow(subject).to receive(:accepts_more_pages?) { false }
+                    expect(subject.push_to_url_queue( @url )).to be_falsey
                 end
             end
 
             context true do
                 it 'returns true' do
-                    subject.stub(:accepts_more_pages?) { true }
-                    subject.push_to_url_queue( @url ).should be_true
+                    allow(subject).to receive(:accepts_more_pages?) { true }
+                    expect(subject.push_to_url_queue( @url )).to be_truthy
                 end
             end
         end
 
         context "when #{Arachni::URI::Scope}#out? is true" do
             it 'returns false' do
-                Arachni::URI::Scope.any_instance.stub(:out?) { true }
-                subject.push_to_url_queue( @url ).should be_false
+                allow_any_instance_of(Arachni::URI::Scope).to receive(:out?) { true }
+                expect(subject.push_to_url_queue( @url )).to be_falsey
             end
         end
 
         context "when #{Arachni::URI::Scope}#redundant? is true" do
             it 'returns false' do
-                Arachni::URI::Scope.any_instance.stub(:redundant?) { true }
-                subject.push_to_url_queue( @url ).should be_false
+                allow_any_instance_of(Arachni::URI::Scope).to receive(:redundant?) { true }
+                expect(subject.push_to_url_queue( @url )).to be_falsey
             end
         end
 
         context "when #{Arachni::URI::Scope}#auto_redundant? is true" do
             it 'returns false' do
-                Arachni::URI::Scope.any_instance.stub(:auto_redundant?) { true }
-                subject.push_to_url_queue( @url ).should be_false
+                allow_any_instance_of(Arachni::URI::Scope).to receive(:auto_redundant?) { true }
+                expect(subject.push_to_url_queue( @url )).to be_falsey
             end
         end
     end

data/spec/arachni/framework/parts/platform_spec.rb

@@ -5,7 +5,7 @@ describe Arachni::Framework::Parts::Platform do
 
     describe '#list_platforms' do
         it 'returns information about all valid platforms' do
-            subject.list_platforms.should == {
+            expect(subject.list_platforms).to eq({
                 'Operating systems' => {
                     unix:    'Generic Unix family',
                     linux:   'Linux',
@@ -61,9 +61,9 @@ describe Arachni::Framework::Parts::Platform do
                     cherrypy: 'CherryPy',
                     cakephp:  'CakePHP',
                     symfony:  'Symfony',
-                    nette:  'Nette Framework'
+                    nette:    'Nette'
                 }
-            }
+            })
         end
     end
 

data/spec/arachni/framework/parts/plugin_spec.rb

@@ -5,29 +5,30 @@ describe Arachni::Framework::Parts::Plugin do
 
     describe '#plugins' do
         it 'provides access to the plugin manager' do
-            subject.plugins.is_a?( Arachni::Plugin::Manager ).should be_true
-            subject.plugins.available.sort.should ==
+            expect(subject.plugins.is_a?( Arachni::Plugin::Manager )).to be_truthy
+            expect(subject.plugins.available.sort).to eq(
                 %w(wait bad with_options distributable loop default suspendable).sort
+            )
         end
     end
 
     describe '#list_plugins' do
         it 'returns info on all plugins' do
-            subject.list_plugins.size.should == subject.plugins.available.size
+            expect(subject.list_plugins.size).to eq(subject.plugins.available.size)
 
             info   = subject.list_plugins.find { |p| p[:options].any? }
             plugin = subject.plugins[info[:shortname]]
 
             plugin.info.each do |k, v|
                 if k == :author
-                    info[k].should == [v].flatten
+                    expect(info[k]).to eq([v].flatten)
                     next
                 end
 
-                info[k].should == v
+                expect(info[k]).to eq(v)
             end
 
-            info[:shortname].should == plugin.shortname
+            expect(info[:shortname]).to eq(plugin.shortname)
         end
 
         context 'when a pattern is given' do

data/spec/arachni/framework/parts/report_spec.rb

@@ -5,28 +5,28 @@ describe Arachni::Framework::Parts::Report do
 
     describe '#reporters' do
         it 'provides access to the reporter manager' do
-            subject.reporters.is_a?( Arachni::Reporter::Manager ).should be_true
-            subject.reporters.available.sort.should == %w(afr foo error).sort
+            expect(subject.reporters.is_a?( Arachni::Reporter::Manager )).to be_truthy
+            expect(subject.reporters.available.sort).to eq(%w(afr foo error).sort)
         end
     end
 
     describe '#list_reporters' do
         it 'returns info on all reporters' do
-            subject.list_reporters.size.should == subject.reporters.available.size
+            expect(subject.list_reporters.size).to eq(subject.reporters.available.size)
 
             info   = subject.list_reporters.find { |p| p[:options].any? }
             report = subject.reporters[info[:shortname]]
 
             report.info.each do |k, v|
                 if k == :author
-                    info[k].should == [v].flatten
+                    expect(info[k]).to eq([v].flatten)
                     next
                 end
 
-                info[k].should == v
+                expect(info[k]).to eq(v)
             end
 
-            info[:shortname].should == report.shortname
+            expect(info[:shortname]).to eq(report.shortname)
         end
 
         context 'when a pattern is given' do
@@ -46,7 +46,7 @@ describe Arachni::Framework::Parts::Report do
         context 'when passed a valid reporter name' do
             it 'returns the reporter as a string' do
                 json = @new_framework.report_as( :json )
-                JSON.load( json )['issues'].size.should == @new_framework.report.issues.size
+                expect(JSON.load( json )['issues'].size).to eq(@new_framework.report.issues.size)
             end
 
             context 'which does not support the \'outfile\' option' do