arachni 1.5.1 → 1.6.1.1

data/spec/arachni/browser_spec.rb

@@ -20,7 +20,7 @@ describe Arachni::Browser do
     end
 
     let(:subject) { @browser }
-    let(:ua) { described_class::USER_AGENT }
+    let(:ua) { Arachni::Options.http.user_agent }
 
     def transitions_from_array( transitions )
         transitions.map do |t|
@@ -61,70 +61,6 @@ describe Arachni::Browser do
         pages_should_have_form_with_input( pages, 'by-ajax' )
     end
 
-    context 'when the browser dies' do
-        it 'kills the lifeline too' do
-            Arachni::Processes::Manager.kill subject.browser_pid
-            expect(Arachni::Processes::Manager.alive?(subject.lifeline_pid)).to be_falsey
-        end
-    end
-
-    context 'when the lifeline dies' do
-        it 'kills the browser too' do
-            Arachni::Processes::Manager.kill subject.lifeline_pid
-            expect(Arachni::Processes::Manager.alive?(subject.browser_pid)).to be_falsey
-        end
-    end
-
-    describe '#alive?' do
-        context 'when the lifeline is alive' do
-            it 'returns true' do
-                expect(Arachni::Processes::Manager.alive?(subject.lifeline_pid)).to be_truthy
-                expect(subject).to be_alive
-            end
-        end
-
-        context 'when the browser is dead' do
-            it 'returns false' do
-                Arachni::Processes::Manager.kill subject.browser_pid
-
-                expect(subject).to_not be_alive
-            end
-        end
-
-        context 'when the lifeline is dead' do
-            it 'returns false' do
-                Arachni::Processes::Manager << subject.browser_pid
-                Arachni::Processes::Manager.kill subject.lifeline_pid
-
-                expect(subject).to_not be_alive
-            end
-        end
-    end
-
-    describe '.has_executable?' do
-        context 'when there is no executable browser' do
-            it 'returns false' do
-                allow(Selenium::WebDriver::PhantomJS).to receive(:path){ false }
-                expect(described_class.has_executable?).to be_falsey
-            end
-        end
-
-        context 'when there is an executable browser' do
-            it 'returns true' do
-                allow(Selenium::WebDriver::PhantomJS).to receive(:path){ __FILE__ }
-                expect(described_class.has_executable?).to be_truthy
-            end
-        end
-    end
-
-    describe '.executable' do
-        it 'returns the path to the browser executable' do
-            stub = __FILE__
-            allow(Selenium::WebDriver::PhantomJS).to receive(:path){ stub }
-            expect(described_class.executable).to eq(stub)
-        end
-    end
-
     describe '#initialize' do
         describe ':concurrency' do
             it 'sets the HTTP request concurrency'
@@ -255,13 +191,6 @@ describe Arachni::Browser do
                 end
             end
         end
-
-        context 'when browser process spawn fails' do
-            it "raises #{described_class::Error::Spawn}" do
-                allow_any_instance_of(described_class).to receive(:spawn_phantomjs) { nil }
-                expect { described_class.new }.to raise_error described_class::Error::Spawn
-            end
-        end
     end
 
     describe '#source_with_line_numbers' do
@@ -779,12 +708,12 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick')
             expect(entry.trace[0].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_execution_flow_sink(1)'
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_execution_flow_sink(1)'
             expect(entry.trace[0].function.arguments).to eq([1, 2])
 
             expect(entry.trace[1].function.name).to eq('onClick2')
             expect(entry.trace[1].function.source).to start_with 'function onClick2'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick'
             expect(entry.trace[1].function.arguments).to eq(%w(blah1 blah2 blah3))
 
             expect(entry.trace[2].function.name).to eq('onmouseover')
@@ -802,17 +731,17 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick3')
             expect(entry.trace[0].function.source).to start_with 'function onClick3'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_execution_flow_sink(1)'
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_execution_flow_sink(1)'
             expect(entry.trace[0].function.arguments).to be_empty
 
             expect(entry.trace[1].function.name).to eq('onClick')
             expect(entry.trace[1].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick3'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick3'
             expect(entry.trace[1].function.arguments).to eq([1, 2])
 
             expect(entry.trace[2].function.name).to eq('onClick2')
             expect(entry.trace[2].function.source).to start_with 'function onClick2'
-            expect(@browser.source.split("\n")[entry.trace[2].line - 1]).to include 'onClick'
+            expect(@browser.source.split("\n")[entry.trace[2].line]).to include 'onClick'
             expect(entry.trace[2].function.arguments).to eq(%w(blah1 blah2 blah3))
 
             expect(entry.trace[3].function.name).to eq('onmouseover')
@@ -846,12 +775,12 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick')
             expect(entry.trace[0].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_execution_flow_sink(1)'
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_execution_flow_sink(1)'
             expect(entry.trace[0].function.arguments).to eq(%w(some-arg arguments-arg here-arg))
 
             expect(entry.trace[1].function.name).to eq('onsubmit')
             expect(entry.trace[1].function.source).to start_with 'function onsubmit'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick'
 
             event = entry.trace[1].function.arguments.first
 
@@ -865,17 +794,17 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick3')
             expect(entry.trace[0].function.source).to start_with 'function onClick3'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_execution_flow_sink(1)'
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_execution_flow_sink(1)'
             expect(entry.trace[0].function.arguments).to be_empty
 
             expect(entry.trace[1].function.name).to eq('onClick')
             expect(entry.trace[1].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick3()'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick3()'
             expect(entry.trace[1].function.arguments).to eq(%w(some-arg arguments-arg here-arg))
 
             expect(entry.trace[2].function.name).to eq('onsubmit')
             expect(entry.trace[2].function.source).to start_with 'function onsubmit'
-            expect(@browser.source.split("\n")[entry.trace[2].line - 1]).to include 'onClick('
+            expect(@browser.source.split("\n")[entry.trace[2].line]).to include 'onClick('
 
             event = entry.trace[2].function.arguments.first
 
@@ -902,12 +831,12 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick')
             expect(entry.trace[0].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_data_flow_sink('
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_data_flow_sink('
             expect(entry.trace[0].function.arguments).to eq([1, 2])
 
             expect(entry.trace[1].function.name).to eq('onClick2')
             expect(entry.trace[1].function.source).to start_with 'function onClick2'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick'
             expect(entry.trace[1].function.arguments).to eq(%w(blah1 blah2 blah3))
 
             expect(entry.trace[2].function.name).to eq('onmouseover')
@@ -925,17 +854,17 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick3')
             expect(entry.trace[0].function.source).to start_with 'function onClick3'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_data_flow_sink('
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_data_flow_sink('
             expect(entry.trace[0].function.arguments).to be_empty
 
             expect(entry.trace[1].function.name).to eq('onClick')
             expect(entry.trace[1].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick3'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick3'
             expect(entry.trace[1].function.arguments).to eq([1, 2])
 
             expect(entry.trace[2].function.name).to eq('onClick2')
             expect(entry.trace[2].function.source).to start_with 'function onClick2'
-            expect(@browser.source.split("\n")[entry.trace[2].line - 1]).to include 'onClick'
+            expect(@browser.source.split("\n")[entry.trace[2].line]).to include 'onClick'
             expect(entry.trace[2].function.arguments).to eq(%w(blah1 blah2 blah3))
 
             expect(entry.trace[3].function.name).to eq('onmouseover')
@@ -955,12 +884,12 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick')
             expect(entry.trace[0].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_data_flow_sink('
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_data_flow_sink('
             expect(entry.trace[0].function.arguments).to eq(%w(some-arg arguments-arg here-arg))
 
             expect(entry.trace[1].function.name).to eq('onsubmit')
             expect(entry.trace[1].function.source).to start_with 'function onsubmit'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick'
 
             event = entry.trace[1].function.arguments.first
 
@@ -974,17 +903,17 @@ describe Arachni::Browser do
 
             expect(entry.trace[0].function.name).to eq('onClick3')
             expect(entry.trace[0].function.source).to start_with 'function onClick3'
-            expect(@browser.source.split("\n")[entry.trace[0].line - 1]).to include 'log_data_flow_sink('
+            expect(@browser.source.split("\n")[entry.trace[0].line]).to include 'log_data_flow_sink('
             expect(entry.trace[0].function.arguments).to be_empty
 
             expect(entry.trace[1].function.name).to eq('onClick')
             expect(entry.trace[1].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[entry.trace[1].line - 1]).to include 'onClick3()'
+            expect(@browser.source.split("\n")[entry.trace[1].line]).to include 'onClick3()'
             expect(entry.trace[1].function.arguments).to eq(%w(some-arg arguments-arg here-arg))
 
             expect(entry.trace[2].function.name).to eq('onsubmit')
             expect(entry.trace[2].function.source).to start_with 'function onsubmit'
-            expect(@browser.source.split("\n")[entry.trace[2].line - 1]).to include 'onClick('
+            expect(@browser.source.split("\n")[entry.trace[2].line]).to include 'onClick('
 
             event = entry.trace[2].function.arguments.first
 
@@ -1096,11 +1025,11 @@ describe Arachni::Browser do
 
         it "assigns the proper #{Arachni::Page::DOM}#digest" do
             @browser.load( @url )
-            expect(@browser.to_page.dom.digest).to eq(32000153)
+            expect(@browser.to_page.dom.digest).to eq(-2125129228)
 
             # expect(@browser.to_page.dom.instance_variable_get(:@digest)).to eq(
-            #     '<HTML><HEAD><SCRIPT src=http://' <<
-            #     'javascript.browser.arachni/polyfills.js><SCRIPT src=http://' <<
+            #     '<HTML><HEAD><SCRIPT src=https://' <<
+            #     'javascript.browser.arachni/polyfills.js><SCRIPT src=https://' <<
             #     'javascript.browser.arachni/' <<
             #     'taint_tracer.js><SCRIPT src=http://javascript.' <<
             #     'browser.arachni/dom_monitor.js><SCRIPT><TITLE><BODY><' <<
@@ -1148,12 +1077,12 @@ describe Arachni::Browser do
 
             expect(first_entry.trace[0].function.name).to eq('onClick')
             expect(first_entry.trace[0].function.source).to start_with 'function onClick'
-            expect(@browser.source.split("\n")[first_entry.trace[0].line - 1]).to include 'log_execution_flow_sink(1)'
+            expect(@browser.source.split("\n")[first_entry.trace[0].line]).to include 'log_execution_flow_sink(1)'
             expect(first_entry.trace[0].function.arguments).to eq(%w(some-arg arguments-arg here-arg))
 
             expect(first_entry.trace[1].function.name).to eq('onsubmit')
             expect(first_entry.trace[1].function.source).to start_with 'function onsubmit'
-            expect(@browser.source.split("\n")[first_entry.trace[1].line - 1]).to include 'onClick('
+            expect(@browser.source.split("\n")[first_entry.trace[1].line]).to include 'onClick('
             expect(first_entry.trace[1].function.arguments.size).to eq(1)
 
             event = first_entry.trace[1].function.arguments.first
@@ -1180,7 +1109,7 @@ describe Arachni::Browser do
                                     input = @browser.to_page.ui_forms.first
 
                                     expect(input.action).to eq @browser.url
-                                    expect(input.source).to eq '<input type="button" id="insert">'
+                                    expect(input.source).to eq '<input id="insert" type="button">'
                                     expect(input.method).to eq :click
                                 end
                             end
@@ -1243,7 +1172,7 @@ describe Arachni::Browser do
                                     input = @browser.to_page.ui_inputs.first
 
                                     expect(input.action).to eq @browser.url
-                                    expect(input.source).to eq '<input oninput="handleOnInput();" id="my-input" name="my-input" value="1">'
+                                    expect(input.source).to eq '<input id="my-input" name="my-input" oninput="handleOnInput();" value="1">'
                                     expect(input.method).to eq :input
                                 end
                             end
@@ -1264,7 +1193,7 @@ describe Arachni::Browser do
                                     input = @browser.to_page.ui_inputs.first
 
                                     expect(input.action).to eq @browser.url
-                                    expect(input.source).to eq '<textarea oninput="handleOnInput();" id="my-input" name="my-input">'
+                                    expect(input.source).to eq '<textarea id="my-input" name="my-input" oninput="handleOnInput();">'
                                     expect(input.method).to eq :input
                                 end
                             end
@@ -1444,15 +1373,15 @@ describe Arachni::Browser do
                 Arachni::Options.url = @url
                 subject.load @url
 
-                subject.javascript.run( 'window.location = "http://google.com/";' )
+                subject.javascript.run( 'window.location = "http://www.google.com/";' )
                 sleep 1
 
                 page = subject.to_page
 
                 expect(page.code).to eq(0)
-                expect(page.url).to  eq('http://google.com/')
+                expect(page.url).to  eq('http://www.google.com/')
                 expect(page.body).to be_empty
-                expect(page.dom.url).to eq('http://google.com/')
+                expect(page.dom.url).to eq('http://www.google.com/')
             end
         end
     end
@@ -1504,21 +1433,40 @@ describe Arachni::Browser do
         context 'when new timers are introduced' do
             let(:url) { "#{@url}/trigger_events/with_new_timers/3000" }
 
-            it 'waits for them' do
-                @browser.fire_event @browser.selenium.find_element( id: 'my-div' ), :click
-                pages_should_have_form_with_input [@browser.to_page], 'by-ajax'
-            end
+            context "when #{Arachni::OptionGroups::BrowserCluster}#wait_for_timers is" do
+                context 'true' do
+                    before do
+                        Arachni::Options.browser_cluster.wait_for_timers = true
+                    end
 
-            context 'when a new timer exceeds Options.http.request_timeout' do
-                let(:url) { "#{@url}/trigger_events/with_new_timers/#{Arachni::Options.http.request_timeout + 5000}" }
+                    it 'waits for them' do
+                        @browser.fire_event @browser.selenium.find_element( id: 'my-div' ), :click
+                        pages_should_have_form_with_input [@browser.to_page], 'by-ajax'
+                    end
 
-                it 'waits for Options.http.request_timeout' do
-                    t = Time.now
+                    context 'when a new timer exceeds Options.http.request_timeout' do
+                        let(:url) { "#{@url}/trigger_events/with_new_timers/#{Arachni::Options.http.request_timeout + 5000}" }
+
+                        it 'waits for Options.http.request_timeout' do
+                            t = Time.now
 
-                    @browser.fire_event @browser.selenium.find_element( id: 'my-div' ), :click
-                    pages_should_not_have_form_with_input [@browser.to_page], 'by-ajax'
+                            @browser.fire_event @browser.selenium.find_element( id: 'my-div' ), :click
+                            pages_should_not_have_form_with_input [@browser.to_page], 'by-ajax'
 
-                    expect(Time.now - t).to be <= Arachni::Options.http.request_timeout
+                            expect(Time.now - t).to be <= Arachni::Options.http.request_timeout
+                        end
+                    end
+                end
+
+                context 'false' do
+                    before do
+                        Arachni::Options.browser_cluster.wait_for_timers = false
+                    end
+
+                    it 'waits for them' do
+                        @browser.fire_event @browser.selenium.find_element( id: 'my-div' ), :click
+                        pages_should_not_have_form_with_input [@browser.to_page], 'by-ajax'
+                    end
                 end
             end
         end
@@ -2237,6 +2185,7 @@ describe Arachni::Browser do
                             }
                         } => :click
                     },
+                    { "#{@url}post-ajax" => :request },
                     { "#{@url}get-ajax?ajax-token=my-token" => :request },
                     { "#{@url}post-ajax" => :request }
                 ],
@@ -2352,6 +2301,52 @@ describe Arachni::Browser do
             expect(subject.response.headers).not_to include 'Content-Security-Policy'
         end
 
+        context 'when there is no page URL' do
+            it 'does not receive a Date header' do
+                subject.watir.goto "#{@url}/Date"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.headers).not_to include 'Date'
+            end
+
+            it 'does not receive an Etag header' do
+                subject.watir.goto "#{@url}/Etag"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.headers).not_to include 'Etag'
+            end
+
+            it 'does not receive a Cache-Control header' do
+                subject.watir.goto "#{@url}/Cache-Control"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.headers).not_to include 'Cache-Control'
+            end
+
+            it 'does not receive a Last-Modified header' do
+                subject.watir.goto "#{@url}/Last-Modified"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.headers).not_to include 'Last-Modified'
+            end
+
+            it 'does not send If-None-Match request headers' do
+                subject.watir.goto "#{@url}/If-None-Match"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.request.headers).not_to include 'If-None-Match'
+
+                subject.watir.goto "#{@url}/If-None-Match"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.request.headers).not_to include 'If-None-Match'
+            end
+
+            it 'does not send If-Modified-Since request headers' do
+                subject.watir.goto "#{@url}/If-Modified-Since"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.request.headers).not_to include 'If-Modified-Since'
+
+                subject.watir.goto "#{@url}/If-Modified-Since"
+                expect(subject.response.code).to eq(200)
+                expect(subject.response.request.headers).not_to include 'If-Modified-Since'
+            end
+        end
+
         context 'when requesting the page URL' do
             it 'does not receive a Date header' do
                 subject.goto "#{@url}/Date"
@@ -2530,12 +2525,34 @@ describe Arachni::Browser do
         end
 
         context 'when the page has JS timeouts' do
-            it 'waits for them to complete' do
-                time = Time.now
-                subject.goto "#{@url}load_delay"
-                waited = Time.now - time
+            context "when #{Arachni::OptionGroups::BrowserCluster}#wait_for_timers is" do
+                context 'true' do
+                    before do
+                        Arachni::Options.browser_cluster.wait_for_timers = true
+                    end
+
+                    it 'waits for them to complete' do
+                        time = Time.now
+                        subject.goto "#{@url}load_delay"
+                        waited = Time.now - time
+
+                        expect(waited).to be >= subject.load_delay / 1000.0
+                    end
+                end
+
+                context 'false' do
+                    before do
+                        Arachni::Options.browser_cluster.wait_for_timers = false
+                    end
+
+                    it 'does not waits for them to complete' do
+                        time = Time.now
+                        subject.goto "#{@url}load_delay"
+                        waited = Time.now - time
 
-                expect(waited).to be >= subject.load_delay / 1000.0
+                        expect(waited).to be < subject.load_delay / 1000.0
+                    end
+                end
             end
         end
 
@@ -2577,6 +2594,19 @@ describe Arachni::Browser do
             end
         end
 
+        context "with #{Arachni::OptionGroups::BrowserCluster}#session_storage" do
+            before do
+                Arachni::Options.browser_cluster.session_storage = {
+                    'name' => 'value'
+                }
+            end
+
+            it 'sets the data as session storage' do
+                subject.load @url
+                expect( subject.javascript.run( 'return sessionStorage.getItem( "name" )' ) ).to eq 'value'
+            end
+        end
+
         context "with #{Arachni::OptionGroups::BrowserCluster}#wait_for_elements" do
             before do
                 Arachni::Options.browser_cluster.wait_for_elements = {
@@ -2599,10 +2629,6 @@ describe Arachni::Browser do
                     t = Time.now
                     @browser.goto( @url + '/wait_for_elements#stuff/here' )
                     expect(Time.now - t).to be < 5
-
-                    expect do
-                        @browser.watir.element( css: '#matchThis' ).tag_name
-                    end.to raise_error Watir::Exception::UnknownObjectException
                 end
             end
 
@@ -2611,36 +2637,6 @@ describe Arachni::Browser do
                     t = Time.now
                     @browser.goto( @url + '/wait_for_elements' )
                     expect(Time.now - t).to be < 5
-
-                    expect do
-                        @browser.watir.element( css: '#matchThis' ).tag_name
-                    end.to raise_error Watir::Exception::UnknownObjectException
-                end
-            end
-        end
-
-        context "#{Arachni::OptionGroups::BrowserCluster}#ignore_images" do
-            context 'true' do
-                it 'does not load images' do
-                    Arachni::Options.browser_cluster.ignore_images = true
-                    @browser.shutdown
-                    @browser = described_class.new( disk_cache: false )
-
-                    @browser.load( "#{@url}form-with-image-button" )
-
-                    expect(image_hit_count).to eq(0)
-                end
-            end
-
-            context 'false' do
-                it 'loads images' do
-                    Arachni::Options.browser_cluster.ignore_images = false
-                    @browser.shutdown
-                    @browser = described_class.new( disk_cache: false )
-
-                    @browser.load( "#{@url}form-with-image-button" )
-
-                    expect(image_hit_count).to eq(1)
                 end
             end
         end
@@ -2669,8 +2665,10 @@ describe Arachni::Browser do
 
         context "with #{Arachni::OptionGroups::Scope}#auto_redundant_paths has bee configured" do
             it 'respects scope restrictions' do
-                Arachni::Options.scope.auto_redundant_paths = 0
-                expect(@browser.load( @url + '/explore?test=1&test2=2' ).response).to be_nil
+                Arachni::Options.scope.auto_redundant_paths = 1
+                Arachni::URI( @url + '/explore?test=2&test2=3' ).scope.auto_redundant?( true )
+
+                expect(@browser.load( @url + '/explore?test=4&test2=5' ).response.body).to be_empty
             end
         end
 
@@ -3221,10 +3219,14 @@ describe Arachni::Browser do
             expect(cookie.expires.to_s).to eq Time.parse( '2047-08-01 09:30:11 +0000' ).to_s
         end
 
+        # Need a better test, Chrome returns no cookies for '.localhost'
+        # (or is it a bug and it's all subdomains?) and Firefox just converts
+        # '.localhost' to 'localhost', is this only for localhost or general bug?
         it 'preserves the domain' do
+            skip
             @browser.load "#{@url}/cookies/domains"
 
-            cookies = @browser.cookies
+            ap cookies = @browser.cookies
 
             cookie = cookies.find { |c| c.name == 'include_subdomains' }
             expect(cookie.name).to  eq 'include_subdomains'
@@ -3245,7 +3247,7 @@ describe Arachni::Browser do
             cookie = @browser.cookies.first
             expect(cookie.name).to  eq 'cookie_under_path'
             expect(cookie.value).to eq 'value'
-            expect(cookie.path).to eq '/cookies/under/'
+            expect(cookie.path).to eq '/cookies/under'
         end
 
         it 'preserves httpOnly' do
@@ -3254,7 +3256,7 @@ describe Arachni::Browser do
             cookie = @browser.cookies.first
             expect(cookie.name).to  eq 'cookie_under_path'
             expect(cookie.value).to eq 'value'
-            expect(cookie.path).to eq '/cookies/under/'
+            expect(cookie.path).to eq '/cookies/under'
             expect(cookie).to_not be_http_only
 
             @browser.load "#{@url}/cookies/httpOnly"

data/spec/arachni/data/framework/rpc_spec.rb

@@ -41,7 +41,7 @@ describe Arachni::Data::Framework::RPC do
 
             pages = []
             Dir["#{dump_directory}/distributed_page_queue/*"].each do |page_file|
-                pages << Marshal.load( IO.binread( page_file ) )
+                pages << subject.distributed_page_queue.unserialize( IO.binread( page_file ) )
             end
             expect(pages).to eq([page, page])
         end

data/spec/arachni/data/framework_spec.rb

@@ -166,7 +166,7 @@ describe Arachni::Data::Framework do
 
             pages = []
             Dir["#{dump_directory}/page_queue/*"].each do |page_file|
-                pages << Marshal.load( IO.binread( page_file ) )
+                pages << subject.page_queue.unserialize( IO.binread( page_file ) )
             end
             expect(pages).to eq([page, page])
         end

data/spec/arachni/element/cookie_spec.rb

@@ -460,7 +460,7 @@ describe Arachni::Element::Cookie do
             expect(cookie.path).to eq('/')
             expect(cookie.secure).to eq(false)
             expect(cookie.session?).to eq(false)
-            expect(cookie.expires).to eq(Time.parse( '2020-08-09 16:59:20 +0300' ))
+            expect(cookie.expires).to eq(Time.parse( '2052-04-17 18:46:00 +0300' ))
             expect(cookie.name).to eq('coo@ki e2')
             expect(cookie.raw_name).to eq('coo%40ki+e2')
             expect(cookie.value).to eq('blah val2@')