arachni 1.2.1 → 1.3

data/spec/arachni/check/auditor_spec.rb

@@ -75,7 +75,8 @@ describe Arachni::Check::Auditor do
         Arachni::Element::Cookie, Arachni::Element::Cookie::DOM,
         Arachni::Element::Header, Arachni::Element::LinkTemplate,
         Arachni::Element::LinkTemplate::DOM, Arachni::Element::JSON,
-        Arachni::Element::XML
+        Arachni::Element::XML, Arachni::Element::UIInput, Arachni::Element::UIInput::DOM,
+        Arachni::Element::UIForm, Arachni::Element::UIForm::DOM
     ]
 
     let(:auditor) { AuditorTest.new( @framework ) }
@@ -86,28 +87,28 @@ describe Arachni::Check::Auditor do
 
     describe '.has_timeout_candidates?' do
         it "delegates to #{Arachni::Element::Capabilities::Analyzable}.has_timeout_candidates?" do
-            Arachni::Element::Capabilities::Analyzable.should receive(:has_timeout_candidates?)
+            expect(Arachni::Element::Capabilities::Analyzable).to receive(:has_timeout_candidates?)
             described_class.has_timeout_candidates?
         end
     end
 
     describe '.timeout_audit_run' do
         it "delegates to #{Arachni::Element::Capabilities::Analyzable}.timeout_audit_run" do
-            Arachni::Element::Capabilities::Analyzable.should receive(:timeout_audit_run)
+            expect(Arachni::Element::Capabilities::Analyzable).to receive(:timeout_audit_run)
             described_class.timeout_audit_run
         end
     end
 
     describe '#preferred' do
         it 'returns an empty array' do
-            subject.preferred.should == []
+            expect(subject.preferred).to eq([])
         end
     end
 
     describe '#max_issues' do
         it 'returns the maximum amount of issues the auditor is allowed to log' do
             subject.class.info[:max_issues] = 1
-            subject.max_issues.should == 1
+            expect(subject.max_issues).to eq(1)
         end
     end
 
@@ -115,20 +116,20 @@ describe Arachni::Check::Auditor do
         it 'increments the issue counter' do
             i = subject.class.issue_counter
             subject.increment_issue_counter
-            subject.class.issue_counter.should == i + 1
+            expect(subject.class.issue_counter).to eq(i + 1)
         end
     end
 
     describe '#issue_limit_reached?' do
         it 'returns false' do
-            subject.issue_limit_reached?.should be_false
+            expect(subject.issue_limit_reached?).to be_falsey
         end
 
         context 'when the issue counter reaches the limit' do
             it 'returns true' do
                 subject.class.info[:max_issues] = 1
                 subject.increment_issue_counter
-                subject.issue_limit_reached?.should be_true
+                expect(subject.issue_limit_reached?).to be_truthy
             end
         end
     end
@@ -136,7 +137,7 @@ describe Arachni::Check::Auditor do
     describe '#audited' do
         it 'marks the given task as audited' do
             subject.audited 'stuff'
-            subject.audited?( 'stuff' ).should be_true
+            expect(subject.audited?( 'stuff' )).to be_truthy
         end
     end
 
@@ -144,19 +145,19 @@ describe Arachni::Check::Auditor do
         context 'when elements have been provided' do
             it 'restricts the check' do
                 page = Arachni::Page.from_data( url: url, body: 'stuff' )
-                page.stub(:has_script?) { true }
+                allow(page).to receive(:has_script?) { true }
                 auditor.class.info[:elements] =
                     element_classes + [Arachni::Element::Body, Arachni::Element::GenericDOM]
 
-                auditor.class.check?( page, Arachni::Element::GenericDOM ).should be_true
-                auditor.class.check?( page, Arachni::Element::Body ).should be_true
+                expect(auditor.class.check?( page, Arachni::Element::GenericDOM )).to be_truthy
+                expect(auditor.class.check?( page, Arachni::Element::Body )).to be_truthy
 
                 element_classes.each do |element|
-                    auditor.class.check?( page, element ).should be_false
+                    expect(auditor.class.check?( page, element )).to be_falsey
                 end
 
-                auditor.class.check?( page, element_classes ).should be_false
-                auditor.class.check?( page, element_classes + [Arachni::Element::Body] ).should be_true
+                expect(auditor.class.check?( page, element_classes )).to be_falsey
+                expect(auditor.class.check?( page, element_classes + [Arachni::Element::Body] )).to be_truthy
             end
         end
 
@@ -166,14 +167,14 @@ describe Arachni::Check::Auditor do
             context 'and page with a non-empty body' do
                 it 'returns true' do
                     p = Arachni::Page.from_data( url: url, body: 'stuff' )
-                    auditor.class.check?( p ).should be_true
+                    expect(auditor.class.check?( p )).to be_truthy
                 end
             end
 
             context 'and page with an empty body' do
                 it 'returns false' do
                     p = Arachni::Page.from_data( url: url, body: '' )
-                    auditor.class.check?( p ).should be_false
+                    expect(auditor.class.check?( p )).to be_falsey
                 end
             end
         end
@@ -185,15 +186,15 @@ describe Arachni::Check::Auditor do
             context 'and Page#has_script? is' do
                 context true do
                     it 'returns true' do
-                        page.stub(:has_script?) { true }
-                        auditor.class.check?( page ).should be_true
+                        allow(page).to receive(:has_script?) { true }
+                        expect(auditor.class.check?( page )).to be_truthy
                     end
                 end
 
                 context false do
                     it 'returns false' do
-                        page.stub(:has_script?) { false }
-                        auditor.class.check?( page ).should be_false
+                        allow(page).to receive(:has_script?) { false }
+                        expect(auditor.class.check?( page )).to be_falsey
                     end
                 end
             end
@@ -206,8 +207,8 @@ describe Arachni::Check::Auditor do
                         url: url,
                         "#{element.type}s".gsub( '_dom', '').to_sym => [Factory[element.type]]
                     )
-                    p.dom.stub(:depth) { 1 }
-                    p.stub(:has_script?) { true }
+                    allow(p.dom).to receive(:depth) { 1 }
+                    allow(p).to receive(:has_script?) { true }
                     p
                 end
                 before(:each) { auditor.class.info[:elements] = [element] }
@@ -232,15 +233,15 @@ describe Arachni::Check::Auditor do
                                 context 'and Page::DOM#depth is' do
                                     context '0' do
                                         it 'returns false' do
-                                            page.dom.stub(:depth) { 0 }
-                                            auditor.class.check?( page ).should be_false
+                                            allow(page.dom).to receive(:depth) { 0 }
+                                            expect(auditor.class.check?( page )).to be_falsey
                                         end
                                     end
 
                                     context '> 0' do
                                         it 'returns true' do
-                                            page.dom.stub(:depth) { 1 }
-                                            auditor.class.check?( page ).should be_true
+                                            allow(page.dom).to receive(:depth) { 1 }
+                                            expect(auditor.class.check?( page )).to be_truthy
                                         end
                                     end
                                 end
@@ -248,22 +249,26 @@ describe Arachni::Check::Auditor do
                                 context 'and Page#has_script? is' do
                                     context true do
                                         it 'returns true' do
-                                            page.stub(:has_script?) { true }
-                                            auditor.class.check?( page ).should be_true
+                                            allow(page).to receive(:has_script?) { true }
+                                            expect(auditor.class.check?( page )).to be_truthy
                                         end
                                     end
 
                                     context false do
                                         it 'returns false' do
-                                            page.stub(:has_script?) { false }
-                                            auditor.class.check?( page ).should be_false
+                                            allow(page).to receive(:has_script?) { false }
+                                            expect(auditor.class.check?( page )).to be_falsey
                                         end
                                     end
                                 end
-
+                            elsif element == Arachni::Element::UIInput ||
+                                         element == Arachni::Element::UIForm
+                                it 'returns false' do
+                                    expect(auditor.class.check?( page )).to be_falsey
+                                end
                             else
                                 it 'returns true' do
-                                    auditor.class.check?( page ).should be_true
+                                    expect(auditor.class.check?( page )).to be_truthy
                                 end
                             end
                         end
@@ -275,7 +280,13 @@ describe Arachni::Check::Auditor do
 
                                     it 'returns true' do
                                         auditor.class.info[:elements] = e
-                                        auditor.class.check?( page ).should be_true
+                                        expect(auditor.class.check?( page )).to be_truthy
+                                    end
+
+                                elsif element == Arachni::Element::UIInput ||
+                                    element == Arachni::Element::UIForm
+                                    it 'returns false' do
+                                        expect(auditor.class.check?( page )).to be_falsey
                                     end
 
                                 elsif element == Arachni::Element::Cookie &&
@@ -284,17 +295,17 @@ describe Arachni::Check::Auditor do
                                     context 'and Page#has_script? is' do
                                         context true do
                                             it 'returns true' do
-                                                page.stub(:has_script?) { true }
+                                                allow(page).to receive(:has_script?) { true }
                                                 auditor.class.info[:elements] = e
-                                                auditor.class.check?( page ).should be_true
+                                                expect(auditor.class.check?( page )).to be_truthy
                                             end
                                         end
 
                                         context false do
                                             it 'returns false' do
-                                                page.stub(:has_script?) { false }
+                                                allow(page).to receive(:has_script?) { false }
                                                 auditor.class.info[:elements] = e
-                                                auditor.class.check?( page ).should be_false
+                                                expect(auditor.class.check?( page )).to be_falsey
                                             end
                                         end
                                     end
@@ -304,12 +315,12 @@ describe Arachni::Check::Auditor do
                                         e == Arachni::Element::Form
                                         it 'returns true' do
                                             auditor.class.info[:elements] = e
-                                            auditor.class.check?( page ).should be_true
+                                            expect(auditor.class.check?( page )).to be_truthy
                                         end
                                     else
                                         it 'returns false' do
                                             auditor.class.info[:elements] = e
-                                            auditor.class.check?( page ).should be_false
+                                            expect(auditor.class.check?( page )).to be_falsey
                                         end
                                     end
                                 end
@@ -320,7 +331,7 @@ describe Arachni::Check::Auditor do
                             context "and the check supports #{e ? e : 'everything'}" do
                                 it 'returns true' do
                                     auditor.class.info[:elements] = e
-                                    auditor.class.check?( page ).should be_true
+                                    expect(auditor.class.check?( page )).to be_truthy
                                 end
                             end
                         end
@@ -333,7 +344,7 @@ describe Arachni::Check::Auditor do
                     context "and the page contains #{element}" do
                         context "and the check only supports #{element}" do
                             it 'returns false' do
-                                auditor.class.check?( page ).should be_false
+                                expect(auditor.class.check?( page )).to be_falsey
                             end
                         end
 
@@ -341,7 +352,7 @@ describe Arachni::Check::Auditor do
                             context "and the check supports #{e ? e : 'everything'}" do
                                 it 'returns true' do
                                     auditor.class.info[:elements] = e
-                                    auditor.class.check?( page ).should be_true
+                                    expect(auditor.class.check?( page )).to be_truthy
                                 end
                             end
                         end
@@ -357,9 +368,9 @@ describe Arachni::Check::Auditor do
             received = nil
             b        = proc {}
 
-            Arachni::Element::Server.any_instance.stub(:log_remote_file_if_exists) { |args, &block| received = [args, block]}
+            allow_any_instance_of(Arachni::Element::Server).to receive(:log_remote_file_if_exists) { |instance, args, &block| received = [args, block]}
 
-            subject.log_remote_file_if_exists( *sent, &b ).should == received
+            expect(subject.log_remote_file_if_exists( *sent, &b )).to eq(received)
         end
     end
 
@@ -369,31 +380,31 @@ describe Arachni::Check::Auditor do
             received = nil
             b        = proc {}
 
-            Arachni::Element::Body.any_instance.stub(:match_and_log) { |args, &block| received = [args, block]}
+            allow_any_instance_of(Arachni::Element::Body).to receive(:match_and_log) { |instance, args, &block| received = [args, block]}
 
-            subject.match_and_log( *sent, &b ).should == received
+            expect(subject.match_and_log( *sent, &b )).to eq(received)
         end
     end
 
     describe '#log_remote_file' do
         let(:page) { Arachni::Page.from_url @url }
-        let(:issue) { Arachni::Data.issues.last.variations.last }
+        let(:issue) { Arachni::Data.issues.last }
         let(:vector) { Arachni::Element::Server.new( page.url ) }
 
         context 'given a' do
             describe Arachni::Page do
                 it 'logs it' do
                     subject.log_remote_file( page )
-                    issue.page.should == page
-                    issue.vector.should == vector
+                    expect(issue.page).to eq(page)
+                    expect(issue.vector).to eq(vector)
                 end
             end
 
             describe Arachni::HTTP::Response do
                 it "logs it as a #{Arachni::Page}" do
                     subject.log_remote_file( page.response )
-                    issue.page.should == page
-                    issue.vector.should == vector
+                    expect(issue.page).to eq(page)
+                    expect(issue.vector).to eq(vector)
                 end
             end
         end
@@ -403,13 +414,16 @@ describe Arachni::Check::Auditor do
         before(:each) do
             Arachni::Options.audit.link_templates = /link-template\/input\/(?<input>.+)/
             auditor.load_page_from "#{@url}each_candidate_element"
-            auditor.page.jsons = [Factory[:json]]
-            auditor.page.xmls  = [Factory[:xml]]
+
+            auditor.page.jsons     = [Factory[:json]]
+            auditor.page.xmls      = [Factory[:xml]]
+            auditor.page.ui_inputs = [Factory[:ui_input]]
+            auditor.page.ui_forms  = [Factory[:ui_form]]
         end
 
         it 'sets the auditor' do
             auditor.each_candidate_element [ Arachni::Link ] do |element|
-                element.auditor.should == auditor
+                expect(element.auditor).to eq(auditor)
             end
         end
 
@@ -420,8 +434,8 @@ describe Arachni::Check::Auditor do
                     elements << element
                 end
 
-                elements.should == (auditor.page.links | auditor.page.headers).
-                    select { |e| e.inputs.any? }
+                expect(elements).to eq((auditor.page.links | auditor.page.headers).
+                    select { |e| e.inputs.any? })
             end
 
             context 'and are not supported' do
@@ -441,23 +455,27 @@ describe Arachni::Check::Auditor do
                     elements << element
                 end
 
-                auditor.class.elements.should == [Arachni::Link, Arachni::Form]
-                elements.should == (auditor.page.links | auditor.page.forms).
-                    select { |e| e.inputs.any? }
+                expect(auditor.class.elements).to eq([Arachni::Link, Arachni::Form])
+                expect(elements).to eq((auditor.page.links | auditor.page.forms).
+                    select { |e| e.inputs.any? })
             end
 
             context 'and no types are specified by the check' do
-                it 'provides all types of elements'do
+                it 'provides all types of elements but :inputs and :ui_forms'do
                     auditor.class.info[:elements].clear
 
+                    expected_elements = Arachni::Page::ELEMENTS
+                    expected_elements.delete :ui_inputs
+                    expected_elements.delete :ui_forms
+
                     elements = []
                     auditor.each_candidate_element do |element|
                         elements << element
                     end
 
-                    elements.map { |e| "#{e.type}s".to_sym }.uniq.should == Arachni::Page::ELEMENTS
-                    elements.should == (auditor.page.elements).
-                        select { |e| e.inputs.any? }
+                    expect(elements.map { |e| "#{e.type}s".to_sym }.uniq).to eq(Arachni::Page::ELEMENTS)
+                    expect(elements).to eq((auditor.page.elements).
+                        select { |e| e.inputs.any? })
                 end
             end
         end
@@ -467,13 +485,16 @@ describe Arachni::Check::Auditor do
         before(:each) do
             Arachni::Options.audit.link_templates = /dom-link-template\/input\/(?<input>.+)/
             auditor.load_page_from "#{@url}each_candidate_dom_element"
+
+            auditor.page.ui_inputs = [Factory[:ui_input]]
+            auditor.page.ui_forms  = [Factory[:ui_form]]
         end
 
         it 'sets the auditor' do
             auditor.class.info[:elements].clear
 
             auditor.each_candidate_dom_element do |element|
-                element.auditor.should == auditor
+                expect(element.auditor).to eq(auditor)
             end
         end
 
@@ -484,8 +505,8 @@ describe Arachni::Check::Auditor do
                     elements << element
                 end
 
-                elements.should be_any
-                elements.should == auditor.page.links.select { |l| l.dom }.map(&:dom)
+                expect(elements).to be_any
+                expect(elements).to eq(auditor.page.links.select { |l| l.dom }.map(&:dom))
             end
 
             context 'and are not supported' do
@@ -499,14 +520,14 @@ describe Arachni::Check::Auditor do
         context 'when types have not been provided' do
             it 'provides the types of elements specified by the check' do
                 auditor.class.info[:elements] = [Arachni::Form::DOM]
-                auditor.class.elements.should == [Arachni::Form::DOM]
+                expect(auditor.class.elements).to eq([Arachni::Form::DOM])
 
                 elements = []
                 auditor.each_candidate_dom_element do |element|
                     elements << element
                 end
 
-                elements.should == auditor.page.forms.map(&:dom)
+                expect(elements).to eq(auditor.page.forms.map(&:dom))
             end
 
             context 'and no types are specified by the check' do
@@ -518,10 +539,12 @@ describe Arachni::Check::Auditor do
                         elements << element
                     end
 
-                    elements.should ==
+                    expect(elements).to eq(
                         (auditor.page.links.select { |l| l.dom } |
                             auditor.page.forms | auditor.page.cookies |
-                            auditor.page.link_templates).map(&:dom)
+                            auditor.page.link_templates | auditor.page.ui_inputs |
+                            auditor.page.ui_forms).map(&:dom)
+                    )
                 end
             end
         end
@@ -533,11 +556,11 @@ describe Arachni::Check::Auditor do
                 it 'passes it to the given block' do
                     worker = nil
 
-                    auditor.with_browser_cluster do |cluster|
+                    expect(auditor.with_browser_cluster do |cluster|
                         worker = cluster
-                    end.should be_true
+                    end).to be_truthy
 
-                    worker.should == @framework.browser_cluster
+                    expect(worker).to eq(@framework.browser_cluster)
                 end
             end
         end
@@ -549,12 +572,12 @@ describe Arachni::Check::Auditor do
                 it 'passes a BrowserCluster::Worker to the given block' do
                     worker = nil
 
-                    auditor.with_browser do |browser|
+                    expect(auditor.with_browser do |browser|
                         worker = browser
-                    end.should be_true
+                    end).to be_truthy
                     @framework.browser_cluster.wait
 
-                    worker.should be_kind_of Arachni::BrowserCluster::Worker
+                    expect(worker).to be_kind_of Arachni::BrowserCluster::Worker
                 end
             end
         end
@@ -563,8 +586,8 @@ describe Arachni::Check::Auditor do
     describe '#skip?' do
         context 'when there is no Arachni::Page#element_audit_whitelist' do
             it 'returns false' do
-                auditor.page.element_audit_whitelist.should be_empty
-                auditor.skip?( auditor.page.elements.first ).should be_false
+                expect(auditor.page.element_audit_whitelist).to be_empty
+                expect(auditor.skip?( auditor.page.elements.first )).to be_falsey
             end
         end
 
@@ -572,14 +595,14 @@ describe Arachni::Check::Auditor do
             context 'and the element is in it' do
                 it 'returns false' do
                     auditor.page.update_element_audit_whitelist auditor.page.elements.first
-                    auditor.skip?( auditor.page.elements.first ).should be_false
+                    expect(auditor.skip?( auditor.page.elements.first )).to be_falsey
                 end
             end
 
             context 'and the element is not in it' do
                 it 'returns true' do
                     auditor.page.update_element_audit_whitelist auditor.page.elements.first
-                    auditor.skip?( auditor.page.elements.last ).should be_true
+                    expect(auditor.skip?( auditor.page.elements.last )).to be_truthy
                 end
             end
         end
@@ -595,7 +618,12 @@ describe Arachni::Check::Auditor do
 
     describe '#create_issue' do
         it 'creates an issue' do
-            auditor.class.create_issue( vector: issue.vector ).should == issue
+            expect(
+                auditor.class.create_issue(
+                    proof: issue.proof,
+                    vector: issue.vector
+                )
+            ).to eq(issue)
         end
     end
 
@@ -603,11 +631,11 @@ describe Arachni::Check::Auditor do
         it 'logs an issue' do
             auditor.log_issue( issue_data )
 
-            logged_issue = Arachni::Data.issues.flatten.first
+            logged_issue = Arachni::Data.issues.first
 
-            logged_issue.to_h.tap do |h|
+            expect(logged_issue.to_h.tap do |h|
                 h[:page][:dom][:transitions].each { |t| t.delete :time }
-            end.should eq issue.to_h.merge( referring_page: {
+            end).to eq issue.to_h.merge( referring_page: {
                 body: auditor.page.body,
                 dom:  auditor.page.dom.to_h.tap do |h|
                     h.delete :skip_states
@@ -618,20 +646,20 @@ describe Arachni::Check::Auditor do
         it 'assigns a #referring_page' do
             auditor.log_issue( issue_data )
 
-            logged_issue = Arachni::Data.issues.flatten.first
-            logged_issue.referring_page.should == auditor.page
+            logged_issue = Arachni::Data.issues.first
+            expect(logged_issue.referring_page).to eq(auditor.page)
         end
 
         it 'returns the issue' do
-            auditor.log_issue( issue_data ).should be_kind_of Arachni::Issue
+            expect(auditor.log_issue( issue_data )).to be_kind_of Arachni::Issue
         end
 
         context 'when #issue_limit_reached?' do
             it 'does not log the issue' do
-                subject.stub(:issue_limit_reached?) { true }
+                allow(subject).to receive(:issue_limit_reached?) { true }
 
-                auditor.log_issue( issue_data ).should be_false
-                Arachni::Data.issues.should be_empty
+                expect(auditor.log_issue( issue_data )).to be_falsey
+                expect(Arachni::Data.issues).to be_empty
             end
         end
     end
@@ -640,12 +668,12 @@ describe Arachni::Check::Auditor do
         it 'preserves the given remarks' do
             auditor.log( issue_data )
 
-            logged_issue = Arachni::Data.issues.flatten.first
-            logged_issue.remarks.first.should be_any
+            logged_issue = Arachni::Data.issues.first
+            expect(logged_issue.remarks.first).to be_any
         end
 
         it 'returns the issue' do
-            auditor.log( issue_data ).should be_kind_of Arachni::Issue
+            expect(auditor.log( issue_data )).to be_kind_of Arachni::Issue
         end
 
         context 'when given a page' do
@@ -653,14 +681,16 @@ describe Arachni::Check::Auditor do
 
             it 'includes response data' do
                 auditor.log( issue_data )
-                Arachni::Data.issues.flatten.first.response.should ==
+                expect(Arachni::Data.issues.first.response).to eq(
                     issue_data[:page].response
+                )
             end
 
             it 'includes request data' do
                 auditor.log( issue_data )
-                Arachni::Data.issues.flatten.first.request.should ==
+                expect(Arachni::Data.issues.first.request).to eq(
                     issue_data[:page].request
+                )
             end
         end
 
@@ -669,10 +699,10 @@ describe Arachni::Check::Auditor do
                 issue_data.delete(:page)
                 auditor.log( issue_data )
 
-                issue = Arachni::Data.issues.flatten.first
-                issue.page.body.should == auditor.page.body
-                issue.response.should == auditor.page.response
-                issue.request.should == auditor.page.request
+                issue = Arachni::Data.issues.first
+                expect(issue.page.body).to eq(auditor.page.body)
+                expect(issue.response).to eq(auditor.page.response)
+                expect(issue.request).to eq(auditor.page.request)
             end
         end
     end
@@ -690,7 +720,7 @@ describe Arachni::Check::Auditor do
                 auditor.load_page_from( @url + '/link' )
                 auditor.audit( @seed )
                 @framework.http.run
-                Arachni::Data.issues.size.should == 1
+                expect(Arachni::Data.issues.size).to eq(1)
             end
         end
 
@@ -699,10 +729,10 @@ describe Arachni::Check::Auditor do
                 auditor.load_page_from( @url + '/link' )
                 auditor.audit( { unix: @seed }, substring: @seed )
                 @framework.http.run
-                Arachni::Data.issues.size.should == 1
-                issue = Arachni::Data.issues.flatten.first
-                issue.platform_name.should == :unix
-                issue.platform_type.should == :os
+                expect(Arachni::Data.issues.size).to eq(1)
+                issue = Arachni::Data.issues.first
+                expect(issue.platform_name).to eq(:unix)
+                expect(issue.platform_type).to eq(:os)
             end
         end
 
@@ -721,13 +751,13 @@ describe Arachni::Check::Auditor do
                 end
 
                 auditor.audit( @seed ){}
-                $audit_called.should == auditor.page.elements.map(&:class)
+                expect($audit_called).to eq(auditor.page.elements.map(&:class))
             end
         end
 
         context 'when called without a block' do
-            it 'delegates to #audit_taint' do
-                auditor.should receive(:audit_taint).with( @seed, described_class::OPTIONS )
+            it 'delegates to #audit_signature' do
+                expect(auditor).to receive(:audit_signature).with( @seed, described_class::OPTIONS )
                 auditor.audit( @seed )
             end
         end
@@ -744,10 +774,10 @@ describe Arachni::Check::Auditor do
                             elements: [ Arachni::Element::Link ]
                          )
                         @framework.http.run
-                        Arachni::Data.issues.size.should == 1
-                        issue = Arachni::Data.issues.flatten.first
-                        issue.vector.class.should == Arachni::Element::Link
-                        issue.vector.affected_input_name.should == 'link_input'
+                        expect(Arachni::Data.issues.size).to eq(1)
+                        issue = Arachni::Data.issues.first
+                        expect(issue.vector.class).to eq(Arachni::Element::Link)
+                        expect(issue.vector.affected_input_name).to eq('link_input')
                     end
                 end
                 describe 'Arachni::Element::Form' do
@@ -757,10 +787,10 @@ describe Arachni::Check::Auditor do
                             elements: [ Arachni::Element::Form ]
                          )
                         @framework.http.run
-                        Arachni::Data.issues.size.should == 1
-                        issue = Arachni::Data.issues.flatten.first
-                        issue.vector.class.should == Arachni::Element::Form
-                        issue.vector.affected_input_name.should == 'form_input'
+                        expect(Arachni::Data.issues.size).to eq(1)
+                        issue = Arachni::Data.issues.first
+                        expect(issue.vector.class).to eq(Arachni::Element::Form)
+                        expect(issue.vector.affected_input_name).to eq('form_input')
                     end
                 end
                 describe 'Arachni::Element::Cookie' do
@@ -770,10 +800,10 @@ describe Arachni::Check::Auditor do
                             elements: [ Arachni::Element::Cookie ]
                          )
                         @framework.http.run
-                        Arachni::Data.issues.size.should == 1
-                        issue = Arachni::Data.issues.flatten.first
-                        issue.vector.class.should == Arachni::Element::Cookie
-                        issue.vector.affected_input_name.should == 'cookie_input'
+                        expect(Arachni::Data.issues.size).to eq(1)
+                        issue = Arachni::Data.issues.first
+                        expect(issue.vector.class).to eq(Arachni::Element::Cookie)
+                        expect(issue.vector.affected_input_name).to eq('cookie_input')
                     end
                     it 'maintains the session while auditing cookies' do
                         auditor.load_page_from( @url + '/session' )
@@ -782,10 +812,10 @@ describe Arachni::Check::Auditor do
                                         elements: [ Arachni::Element::Cookie ]
                         )
                         @framework.http.run
-                        Arachni::Data.issues.size.should == 1
-                        issue = Arachni::Data.issues.flatten.first
-                        issue.vector.class.should == Arachni::Element::Cookie
-                        issue.vector.affected_input_name.should == 'vulnerable'
+                        expect(Arachni::Data.issues.size).to eq(1)
+                        issue = Arachni::Data.issues.first
+                        expect(issue.vector.class).to eq(Arachni::Element::Cookie)
+                        expect(issue.vector.affected_input_name).to eq('vulnerable')
                     end
 
                 end
@@ -796,10 +826,10 @@ describe Arachni::Check::Auditor do
                             elements: [ Arachni::Element::Header ]
                          )
                         @framework.http.run
-                        Arachni::Data.issues.size.should == 1
-                        issue = Arachni::Data.issues.flatten.first
-                        issue.vector.class.should == Arachni::Element::Header
-                        issue.vector.affected_input_name.should == 'Referer'
+                        expect(Arachni::Data.issues.size).to eq(1)
+                        issue = Arachni::Data.issues.first
+                        expect(issue.vector.class).to eq(Arachni::Element::Header)
+                        expect(issue.vector.affected_input_name).to eq('Referer')
                     end
                 end
 
@@ -809,7 +839,7 @@ describe Arachni::Check::Auditor do
                             format: [ Arachni::Check::Auditor::Format::STRAIGHT ]
                          )
                         @framework.http.run
-                        Arachni::Data.issues.size.should == 4
+                        expect(Arachni::Data.issues.size).to eq(4)
                     end
                 end
             end
@@ -834,9 +864,9 @@ describe Arachni::Check::Auditor do
                             @framework.http.run
                         end
 
-                        Arachni::Data.issues.flatten.find do |i|
+                        expect(Arachni::Data.issues.all.find do |i|
                             i.vector.affected_input_name == 'you_made_it'
-                        end.should be_true
+                        end).to be_truthy
                     end
                 end
 
@@ -859,10 +889,10 @@ describe Arachni::Check::Auditor do
                             @framework.http.run
                         end
 
-                        issue = issues.flatten.first
-                        issue.should be_true
-                        issue.vector.class.should == Arachni::Element::Form
-                        issue.vector.affected_input_name.should == 'you_made_it'
+                        issue = issues.first
+                        expect(issue).to be_truthy
+                        expect(issue.vector.class).to eq(Arachni::Element::Form)
+                        expect(issue.vector.affected_input_name).to eq('you_made_it')
                     end
                 end
 
@@ -881,29 +911,29 @@ describe Arachni::Check::Auditor do
                         auditor = Arachni::Check::Base.new( page, @framework )
                         auditor.audit( @seed, submit: { train: false } )
                         @framework.http.run
-                        updated_pages.should be_empty
+                        expect(updated_pages).to be_empty
                     end
                 end
             end
         end
     end
 
-    describe '#audit_taint' do
-        it "delegates to #{Arachni::Element::Capabilities::Analyzable::Taint}#taint_analysis" do
+    describe '#audit_signature' do
+        it "delegates to #{Arachni::Element::Capabilities::Analyzable::Signature}#signature_analysis" do
             auditor.load_page_from( @url + '/link' )
 
-            $audit_taint_called = []
+            $audit_signature_called = []
             auditor.page.elements.each do |element|
                 element.class.class_eval do
-                    def taint_analysis( *args, &block )
-                        $audit_taint_called << self.class if $audit_taint_called
+                    def signature_analysis( *args, &block )
+                        $audit_signature_called << self.class if $audit_signature_called
                         super( *args, &block )
                     end
                 end
             end
 
-            auditor.audit_taint( 'seed' )
-            $audit_taint_called.should == auditor.page.elements.map(&:class)
+            auditor.audit_signature( 'seed' )
+            expect($audit_signature_called).to eq(auditor.page.elements.map(&:class))
         end
     end
 
@@ -922,7 +952,7 @@ describe Arachni::Check::Auditor do
             end
 
             auditor.audit_differential( { false: '0', pairs: { '1' => '2' } } )
-            $audit_differential_called.should == auditor.page.elements.map(&:class)
+            expect($audit_differential_called).to eq(auditor.page.elements.map(&:class))
         end
     end
 
@@ -941,7 +971,7 @@ describe Arachni::Check::Auditor do
             end
 
             auditor.audit_timeout( 'seed', timeout: 1 )
-            $audit_timeout_called.should == auditor.page.elements.map(&:class)
+            expect($audit_timeout_called).to eq(auditor.page.elements.map(&:class))
         end
     end
 
@@ -1113,7 +1143,7 @@ describe Arachni::Check::Auditor do
                         true
                     end
                     auditor.browser_cluster.wait
-                    calls.should == 1
+                    expect(calls).to eq(1)
                 end
             end
 
@@ -1125,7 +1155,7 @@ describe Arachni::Check::Auditor do
                         false
                     end
                     auditor.browser_cluster.wait
-                    calls.should > 1
+                    expect(calls).to be > 1
                 end
             end
         end