arachni 1.2.1 → 1.3

data/spec/arachni/http/response/scope_spec.rb

@@ -12,22 +12,22 @@ describe Arachni::HTTP::Response::Scope do
 
     describe '#out?' do
         it 'returns false' do
-            subject.out?.should be_false
+            expect(subject.out?).to be_falsey
         end
 
         context "when #{Arachni::URI::Scope}#out?" do
             context true do
                 it 'returns true' do
                     # We can't stub #out? because we also override it.
-                    Arachni::URI::Scope.any_instance.stub(:exclude?) { true }
-                    subject.out?.should be_true
+                    allow_any_instance_of(Arachni::URI::Scope).to receive(:exclude?) { true }
+                    expect(subject.out?).to be_truthy
                 end
             end
 
             context false do
                 it 'returns false' do
-                    Arachni::URI::Scope.any_instance.stub(:exclude?) { false }
-                    subject.out?.should be_false
+                    allow_any_instance_of(Arachni::URI::Scope).to receive(:exclude?) { false }
+                    expect(subject.out?).to be_falsey
                 end
             end
         end
@@ -35,15 +35,15 @@ describe Arachni::HTTP::Response::Scope do
         context 'when #exclude_as_binary?' do
             context true do
                 it 'returns true' do
-                    subject.stub(:exclude_as_binary?) { true }
-                    subject.out?.should be_true
+                    allow(subject).to receive(:exclude_as_binary?) { true }
+                    expect(subject.out?).to be_truthy
                 end
             end
 
             context false do
                 it 'returns false' do
-                    subject.stub(:exclude_as_binary?) { false }
-                    subject.out?.should be_false
+                    allow(subject).to receive(:exclude_as_binary?) { false }
+                    expect(subject.out?).to be_falsey
                 end
             end
         end
@@ -51,15 +51,15 @@ describe Arachni::HTTP::Response::Scope do
         context 'when #exclude_content?' do
             context true do
                 it 'returns true' do
-                    subject.stub(:exclude_content?) { true }
-                    subject.out?.should be_true
+                    allow(subject).to receive(:exclude_content?) { true }
+                    expect(subject.out?).to be_truthy
                 end
             end
 
             context false do
                 it 'returns false' do
-                    subject.stub(:exclude_content?) { false }
-                    subject.out?.should be_false
+                    allow(subject).to receive(:exclude_content?) { false }
+                    expect(subject.out?).to be_falsey
                 end
             end
         end
@@ -72,18 +72,18 @@ describe Arachni::HTTP::Response::Scope do
                     context true do
                         it 'returns false' do
                             scope.exclude_binaries = true
-                            response.stub(:text?) { true }
+                            allow(response).to receive(:text?) { true }
 
-                            subject.exclude_as_binary?.should be_false
+                            expect(subject.exclude_as_binary?).to be_falsey
                         end
                     end
 
                     context false do
                         it 'returns false' do
                             scope.exclude_binaries = false
-                            response.stub(:text?) { true }
+                            allow(response).to receive(:text?) { true }
 
-                            subject.exclude_as_binary?.should be_false
+                            expect(subject.exclude_as_binary?).to be_falsey
                         end
                     end
                 end
@@ -94,18 +94,18 @@ describe Arachni::HTTP::Response::Scope do
                     context true do
                         it 'returns true' do
                             scope.exclude_binaries = true
-                            response.stub(:text?) { false }
+                            allow(response).to receive(:text?) { false }
 
-                            subject.exclude_as_binary?.should be_true
+                            expect(subject.exclude_as_binary?).to be_truthy
                         end
                     end
 
                     context false do
                         it 'returns false' do
                             scope.exclude_binaries = false
-                            response.stub(:text?) { false }
+                            allow(response).to receive(:text?) { false }
 
-                            subject.exclude_as_binary?.should be_false
+                            expect(subject.exclude_as_binary?).to be_falsey
                         end
                     end
                 end
@@ -118,16 +118,16 @@ describe Arachni::HTTP::Response::Scope do
             context 'match the #body' do
                 it 'returns true' do
                     scope.exclude_content_patterns = /<a/
-                    subject.exclude_content?.should be_true
+                    expect(subject.exclude_content?).to be_truthy
                 end
             end
 
             context 'do not match the #body' do
                 it 'returns false' do
-                    subject.exclude_content?.should be_false
+                    expect(subject.exclude_content?).to be_falsey
 
                     scope.exclude_content_patterns = /<blah/
-                    subject.exclude_content?.should be_false
+                    expect(subject.exclude_content?).to be_falsey
                 end
             end
         end

data/spec/arachni/http/response_spec.rb

@@ -13,7 +13,7 @@ describe Arachni::HTTP::Response do
     subject { @subject }
 
     it "supports #{Arachni::RPC::Serializer}" do
-        subject.should == Arachni::RPC::Serializer.deep_clone( subject )
+        expect(subject).to eq(Arachni::RPC::Serializer.deep_clone( subject ))
     end
 
     describe '#to_rpc_data' do
@@ -22,16 +22,16 @@ describe Arachni::HTTP::Response do
         %w(url code ip_address headers body time app_time total_time return_code
             return_message).each do |attribute|
             it "includes '#{attribute}'" do
-                data[attribute].should == subject.send( attribute )
+                expect(data[attribute]).to eq(subject.send( attribute ))
             end
         end
 
         it "includes 'request'" do
-            data['request'].should == subject.request.to_rpc_data
+            expect(data['request']).to eq(subject.request.to_rpc_data)
         end
 
         it "does not include 'scope" do
-            data.should_not include 'scope'
+            expect(data).not_to include 'scope'
         end
     end
 
@@ -42,14 +42,14 @@ describe Arachni::HTTP::Response do
         %w(url code ip_address headers body time app_time total_time return_code
             return_message request).each do |attribute|
             it "restores '#{attribute}'" do
-                restored.send( attribute ).should == subject.send( attribute )
+                expect(restored.send( attribute )).to eq(subject.send( attribute ))
             end
         end
     end
 
     describe '#status_line' do
         it 'returns the first line of the response' do
-            @http.get( @url, mode: :sync ).status_line.should == 'HTTP/1.1 200 OK'
+            expect(@http.get( @url, mode: :sync ).status_line).to eq('HTTP/1.1 200 OK')
         end
     end
 
@@ -57,13 +57,13 @@ describe Arachni::HTTP::Response do
         context 'when the #code is' do
             describe 200 do
                 it 'returns false' do
-                    described_class.new( url: @url, code: 200 ).should be_modified
+                    expect(described_class.new( url: @url, code: 200 )).to be_modified
                 end
             end
 
             describe 304 do
                 it 'returns true' do
-                    described_class.new( url: @url, code: 304 ).should_not be_modified
+                    expect(described_class.new( url: @url, code: 304 )).not_to be_modified
                 end
             end
         end
@@ -73,44 +73,44 @@ describe Arachni::HTTP::Response do
         context 'when the response is a redirection' do
             it 'returns true' do
                 300.upto( 399 ) do |c|
-                    described_class.new(
+                    expect(described_class.new(
                         url:     'http://test.com',
                         code:    c,
                         headers: {
                             location: '/test'
-                        }).redirection?.should be_true
+                        }).redirection?).to be_truthy
                 end
             end
         end
 
         context 'when the response is not a redirection' do
             it 'returns false' do
-                described_class.new( url: 'http://test.com', code: 200 ).redirection?.should be_false
+                expect(described_class.new( url: 'http://test.com', code: 200 ).redirection?).to be_falsey
             end
         end
     end
 
     describe '#to_s' do
         it 'returns the HTTP response as a string' do
-            subject.to_s.should == "#{subject.headers_string}#{subject.body}"
+            expect(subject.to_s).to eq("#{subject.headers_string}#{subject.body}")
         end
     end
 
     describe '#platforms' do
         it 'returns the platform manager for the resource' do
-            Factory[:response].platforms.should be_kind_of Arachni::Platform::Manager
+            expect(Factory[:response].platforms).to be_kind_of Arachni::Platform::Manager
         end
     end
 
     describe '#app_time' do
         it 'returns the approximated webap pprocessing time' do
             response = @http.get( @url, mode: :sync )
-            response.app_time.should > 0
-            response.app_time.should < 0.01
+            expect(response.app_time).to be > 0
+            expect(response.app_time).to be < 0.01
 
             response = @http.get( "#{@url}/sleep", mode: :sync )
-            response.app_time.should > 5
-            response.app_time.should < 5.01
+            expect(response.app_time).to be > 5
+            expect(response.app_time).to be < 5.01
         end
     end
 
@@ -123,7 +123,7 @@ describe Arachni::HTTP::Response do
                         headers: { 'Content-Type' => 'text/stuff' },
                         body:    'stuff'
                     }
-                    described_class.new( h ).text?.should be_true
+                    expect(described_class.new( h ).text?).to be_truthy
                 end
             end
 
@@ -136,7 +136,7 @@ describe Arachni::HTTP::Response do
                                 headers: { 'Content-Type' => 'application/stuff' },
                                 body:    "\00\00\00"
                             }
-                            described_class.new( h ).text?.should be_false
+                            expect(described_class.new( h ).text?).to be_falsey
                         end
                     end
 
@@ -147,7 +147,7 @@ describe Arachni::HTTP::Response do
                                 headers: { 'Content-Type' => 'application/stuff' },
                                 body:    'stuff'
                             }
-                            described_class.new( h ).text?.should be_true
+                            expect(described_class.new( h ).text?).to be_truthy
                         end
                     end
                 end
@@ -160,7 +160,7 @@ describe Arachni::HTTP::Response do
                         headers: { 'Content-Type' => 'blah/stuff' },
                         body:    'stuff'
                     }
-                    described_class.new( h ).text?.should be_false
+                    expect(described_class.new( h ).text?).to be_falsey
                 end
             end
 
@@ -172,7 +172,7 @@ describe Arachni::HTTP::Response do
                                 url:  'http://test.com',
                                 body: "\00\00\00"
                             }
-                            described_class.new( h ).text?.should == false
+                            expect(described_class.new( h ).text?).to eq(false)
                         end
                     end
 
@@ -182,7 +182,7 @@ describe Arachni::HTTP::Response do
                                 url:  'http://test.com',
                                 body: 'stuff'
                             }
-                            described_class.new( h ).text?.should be_true
+                            expect(described_class.new( h ).text?).to be_truthy
                         end
                     end
 
@@ -192,7 +192,7 @@ describe Arachni::HTTP::Response do
                                 url:  'http://test.com',
                                 body: "abc\u3042\x81"
                             )
-                            r.text?.should be_nil
+                            expect(r.text?).to be_nil
                         end
                     end
                 end
@@ -229,18 +229,18 @@ describe Arachni::HTTP::Response do
             parser = Arachni::Parser.new( response )
             page = parser.page
 
-            page.url.should == parser.url
-            page.method.should == parser.response.request.method
-            page.response.should == parser.response
-            page.body.should == parser.response.body
-            page.query_vars.should == parser.link_vars
-            page.paths.should == parser.paths
-            page.links.should == parser.links
-            page.forms.should == parser.forms
-            page.cookies.should == parser.cookies_to_be_audited
-            page.headers.should == parser.headers
-            page.cookie_jar.should == parser.cookie_jar
-            page.text?.should == parser.text?
+            expect(page.url).to eq(parser.url)
+            expect(page.method).to eq(parser.response.request.method)
+            expect(page.response).to eq(parser.response)
+            expect(page.body).to eq(parser.response.body)
+            expect(page.query_vars).to eq(parser.link_vars)
+            expect(page.paths).to eq(parser.paths)
+            expect(page.links).to eq(parser.links)
+            expect(page.forms).to eq(parser.forms)
+            expect(page.cookies).to eq(parser.cookies_to_be_audited)
+            expect(page.headers).to eq(parser.headers)
+            expect(page.cookie_jar).to eq(parser.cookie_jar)
+            expect(page.text?).to eq(parser.text?)
         end
     end
 
@@ -248,19 +248,19 @@ describe Arachni::HTTP::Response do
         it 'sets the #time' do
             r = described_class.new( url: url )
             r.time = 1.2
-            r.time.should == 1.2
+            expect(r.time).to eq(1.2)
         end
 
         it 'casts to Float' do
             r = described_class.new( url: url )
             r.time = '1.2'
-            r.time.should == 1.2
+            expect(r.time).to eq(1.2)
         end
     end
 
     describe '#time' do
         it 'defaults to 0.0' do
-            described_class.new( url: url ).time.should == 0.0
+            expect(described_class.new( url: url ).time).to eq(0.0)
         end
     end
 
@@ -269,19 +269,19 @@ describe Arachni::HTTP::Response do
             body = 'Stuff...'
             r = described_class.new( url: url )
             r.body = body
-            r.body.should == body
+            expect(r.body).to eq(body)
         end
 
         it 'freezes it' do
             r = described_class.new( url: url )
             r.body = 'Stuff...'
-            r.body.should be_frozen
+            expect(r.body).to be_frozen
         end
 
         it 'forces it to a string' do
             r = described_class.new( url: url )
             r.body = nil
-            r.body.should == ''
+            expect(r.body).to eq('')
         end
 
         context 'when content-length is' do
@@ -295,7 +295,7 @@ describe Arachni::HTTP::Response do
                         body:    'stuff'
                     )
                     r.body = body
-                    r.body.should == "abcあ�"
+                    expect(r.body).to eq("abcあ�")
                 end
             end
 
@@ -307,7 +307,7 @@ describe Arachni::HTTP::Response do
                         body:    'stuff'
                     )
                     r.body = body
-                    r.body.should == body
+                    expect(r.body).to eq(body)
                 end
             end
 
@@ -315,7 +315,7 @@ describe Arachni::HTTP::Response do
                 it 'removes invalid characters' do
                     r = described_class.new( url:  'http://test.com' )
                     r.body = body
-                    r.body.should == "abcあ�"
+                    expect(r.body).to eq("abcあ�")
                 end
             end
         end
@@ -329,21 +329,22 @@ describe Arachni::HTTP::Response do
                     headers: { 'Content-Type' => 'application/stuff' },
                     body:    'stuff'
                 }
-                described_class.new( h.dup ).should == described_class.new( h.dup )
+                expect(described_class.new( h.dup )).to eq(described_class.new( h.dup ))
             end
         end
         context 'when responses are not identical' do
             it 'returns false' do
-                described_class.new(
+                expect(described_class.new(
                     url:     'http://test.com',
                     headers: { 'Content-Type' => 'application/stuff' },
                     body:    'stuff'
-                ).should_not ==
+                )).not_to eq(
                     described_class.new(
                         url:     'http://test.com',
                         headers: { 'Content-Type' => 'application/stuff1' },
                         body:    'stuff'
                     )
+                )
             end
         end
     end
@@ -363,7 +364,7 @@ describe Arachni::HTTP::Response do
                 return_message: 'No error'
             }
 
-            described_class.new( h ).to_h.should == h
+            expect(described_class.new( h ).to_h).to eq(h)
         end
     end
 

data/spec/arachni/issue/severity_spec.rb

@@ -3,27 +3,27 @@ require 'spec_helper'
 describe Arachni::Issue::Severity do
     describe 'Arachni::Issue::Severity::HIGH' do
         it 'returns "high"' do
-            Arachni::Issue::Severity::HIGH.to_s.should == 'high'
+            expect(Arachni::Issue::Severity::HIGH.to_s).to eq('high')
         end
     end
     describe 'Arachni::Issue::Severity::MEDIUM' do
         it 'returns "medium"' do
-            Arachni::Issue::Severity::MEDIUM.to_s.should == 'medium'
+            expect(Arachni::Issue::Severity::MEDIUM.to_s).to eq('medium')
         end
     end
     describe 'Arachni::Issue::Severity::LOW' do
         it 'returns "low"' do
-            Arachni::Issue::Severity::LOW.to_s.should == 'low'
+            expect(Arachni::Issue::Severity::LOW.to_s).to eq('low')
         end
     end
     describe 'Arachni::Issue::Severity::INFORMATIONAL' do
         it 'returns "informational"' do
-            Arachni::Issue::Severity::INFORMATIONAL.to_s.should == 'informational'
+            expect(Arachni::Issue::Severity::INFORMATIONAL.to_s).to eq('informational')
         end
     end
 
     it 'is assigned to Arachni::Severity for easy access' do
-        Arachni::Severity.should == Arachni::Issue::Severity
+        expect(Arachni::Severity).to eq(Arachni::Issue::Severity)
     end
 
     it 'is comparable' do
@@ -32,12 +32,13 @@ describe Arachni::Issue::Severity do
         medium        = Arachni::Issue::Severity::MEDIUM
         high          = Arachni::Issue::Severity::HIGH
 
-        informational.should be < low
-        low.should be < medium
-        medium.should be < high
+        expect(informational).to be < low
+        expect(low).to be < medium
+        expect(medium).to be < high
 
-        [low, informational, high, medium].sort.should ==
+        expect([low, informational, high, medium].sort).to eq(
             [informational, low, medium, high]
+        )
     end
 
 end