arachni 1.2.1 → 1.3

data/spec/components/plugins/content_types_spec.rb

@@ -60,7 +60,7 @@ YAML
     context 'with default options' do
         it "skips 'text' content types" do
             run
-            actual_results.should eq default_results
+            expect(actual_results).to eq default_results
         end
     end
 
@@ -69,7 +69,7 @@ YAML
             options.plugins[component_name] = { 'exclude' => 'image|excel' }
 
             run
-            actual_results.should eq results_with_options
+            expect(actual_results).to eq results_with_options
         end
     end
 
@@ -78,14 +78,14 @@ YAML
             options.plugins[component_name] = { 'exclude' => '' }
 
             run
-            actual_results.should eq results_with_empty_options
+            expect(actual_results).to eq results_with_empty_options
         end
     end
 
     describe '.merge' do
         it 'merges an array of results' do
             results = plugin.merge( [default_results, results_with_options] )
-            results.should eq results_with_empty_options
+            expect(results).to eq results_with_empty_options
         end
     end
 end

data/spec/components/plugins/cookie_collector_spec.rb

@@ -10,7 +10,7 @@ describe name_from_filename do
     it 'logs the expected results' do
         run
 
-        actual_results.size.should == 3
+        expect(actual_results.size).to eq(3)
 
         oks = 0
         actual_results.each do |result|
@@ -24,7 +24,7 @@ describe name_from_filename do
             end
         end
 
-        oks.should == 3
+        expect(oks).to eq(3)
     end
 
     context 'when a filter has been specified' do
@@ -33,9 +33,9 @@ describe name_from_filename do
 
             run
 
-            actual_results.size.should == 2
-            actual_results.map { |r| r['cookies'].keys }.flatten.
-                uniq.sort.should == %w(link_followed)
+            expect(actual_results.size).to eq(2)
+            expect(actual_results.map { |r| r['cookies'].keys }.flatten.
+                uniq.sort).to eq(%w(link_followed))
         end
     end
 end

data/spec/components/plugins/exec_spec.rb

@@ -21,36 +21,36 @@ describe name_from_filename do
         port   = parsed_url.port
 
         pre = actual_results['pre']
-        pre.delete('runtime').should be_kind_of Float
-        pre.delete('pid').should be_kind_of Integer
+        expect(pre.delete('runtime')).to be_kind_of Float
+        expect(pre.delete('pid')).to be_kind_of Integer
 
-        pre.should == {
+        expect(pre).to eq({
             "status"     => 0,
             "executable" => "echo \"#{options.url} #{scheme} #{host} #{port} pre 0 0 preparing\"",
             "stdout"     => "#{options.url} #{scheme} #{host} #{port} pre 0 0 preparing\n",
             "stderr"     => ""
-        }
+        })
 
         during = actual_results['during']
-        during.delete('runtime').should be_kind_of Float
-        during.delete('pid').should be_kind_of Integer
+        expect(during.delete('runtime')).to be_kind_of Float
+        expect(during.delete('pid')).to be_kind_of Integer
 
-        during.should == {
+        expect(during).to eq({
             "status"     => 0,
             "executable" => "echo \"#{options.url} #{scheme} #{host} #{port} during 0 0 preparing\"",
             "stdout"     => "#{options.url} #{scheme} #{host} #{port} during 0 0 preparing\n",
             "stderr"     => ""
-        }
+        })
 
         post = actual_results['post']
-        post.delete('runtime').should be_kind_of Float
-        post.delete('pid').should be_kind_of Integer
+        expect(post.delete('runtime')).to be_kind_of Float
+        expect(post.delete('pid')).to be_kind_of Integer
 
-        post.should == {
+        expect(post).to eq({
             "status"     => 0,
             "executable" => "echo \"#{options.url} #{scheme} #{host} #{port} post 0 2 cleanup\"",
             "stdout"     => "#{options.url} #{scheme} #{host} #{port} post 0 2 cleanup\n",
             "stderr"     => ""
-        }
+        })
     end
 end

data/spec/components/plugins/form_dicattack_spec.rb

@@ -18,7 +18,7 @@ describe name_from_filename do
             }
 
             run
-            actual_results.should == { 'username' => 'sys', 'password' => 'admin' }
+            expect(actual_results).to eq({ 'username' => 'sys', 'password' => 'admin' })
         end
     end
 
@@ -33,7 +33,7 @@ describe name_from_filename do
             }
 
             run
-            actual_results.should be_nil
+            expect(actual_results).to be_nil
         end
     end
 
@@ -48,7 +48,7 @@ describe name_from_filename do
             }
 
             run
-            actual_results.should be_nil
+            expect(actual_results).to be_nil
         end
     end
 end

data/spec/components/plugins/headers_collector_spec.rb

@@ -11,7 +11,7 @@ describe name_from_filename do
         it 'logs all headers' do
             run
 
-            actual_results.should == {
+            expect(actual_results).to eq({
                 url => {
                     "Content-Type" => "text/html;charset=utf-8",
                     "X-Xss-Protection" => "1; mode=block",
@@ -35,7 +35,7 @@ describe name_from_filename do
                     "X-Frame-Options" => "SAMEORIGIN",
                     "Content-Length" => "6"
                 }
-            }
+            })
         end
     end
 
@@ -47,7 +47,7 @@ describe name_from_filename do
 
             run
 
-            actual_results.should == {
+            expect(actual_results).to eq({
                 url => {
                     "X-Frame-Options" => "SAMEORIGIN"
                 },
@@ -59,7 +59,7 @@ describe name_from_filename do
                     "Weird2" => "Value2",
                     "X-Frame-Options" => "SAMEORIGIN"
                 }
-            }
+            })
         end
     end
 
@@ -71,7 +71,7 @@ describe name_from_filename do
 
             run
 
-            actual_results.should == {
+            expect(actual_results).to eq({
                 url => {
                     "Content-Type" => "text/html;charset=utf-8",
                     "X-Xss-Protection" => "1; mode=block",
@@ -90,7 +90,7 @@ describe name_from_filename do
                     "X-Content-Type-Options" => "nosniff",
                     "Content-Length" => "6"
                 }
-            }
+            })
         end
     end
 
@@ -112,7 +112,7 @@ describe name_from_filename do
                 },
             ]
 
-            framework.plugins[component_name].merge( results ).should == {
+            expect(framework.plugins[component_name].merge( results )).to eq({
                 "#{url}" => {
                     "Name" => "Value",
                     "Name2" => "Value2"
@@ -120,7 +120,7 @@ describe name_from_filename do
                 "#{url}2" => {
                     "Name22" => "Value22"
                 }
-            }
+            })
         end
     end
 end

data/spec/components/plugins/healthmap_spec.rb

@@ -32,9 +32,9 @@ YAML
         actual_map   = results.delete( 'map' )
         expected_map = exp_results.delete( 'map' )
 
-        actual_map.select { |k, v| k == 'without_issues' }.should be_eql expected_map.select { |k, v| k == 'without_issues' }
-        actual_map.select { |k, v| k == 'with_issues' }.should be_eql expected_map.select { |k, v| k == 'with_issues' }
+        expect(actual_map.select { |k, v| k == 'without_issues' }).to be_eql expected_map.select { |k, v| k == 'without_issues' }
+        expect(actual_map.select { |k, v| k == 'with_issues' }).to be_eql expected_map.select { |k, v| k == 'with_issues' }
 
-        results.should be_eql exp_results
+        expect(results).to be_eql exp_results
     end
 end

data/spec/components/plugins/http_dicattack_spec.rb

@@ -18,7 +18,7 @@ describe name_from_filename do
         it 'logins successfully' do
             options.url = web_server_url_for( name_from_filename )
             run
-            results.should == { 'username' => 'admin', 'password' => 'pass' }
+            expect(results).to eq({ 'username' => 'admin', 'password' => 'pass' })
         end
     end
 
@@ -26,7 +26,7 @@ describe name_from_filename do
         it 'logs nothing' do
             options.url = web_server_url_for( "#{name_from_filename}_secure" )
             run
-            results.should be_nil
+            expect(results).to be_nil
         end
     end
 
@@ -34,7 +34,7 @@ describe name_from_filename do
         it 'logs nothing' do
             options.url = web_server_url_for( "#{name_from_filename}_unprotected" )
             run
-            results.should be_nil
+            expect(results).to be_nil
         end
     end
 end

data/spec/components/plugins/login_script_spec.rb

@@ -35,7 +35,7 @@ EOSCRIPT
                 it "exposes a Watir::Browser interface via the 'browser' variable" do
                     run
 
-                    options.datastore.browser.should be_kind_of Watir::Browser
+                    expect(options.datastore.browser).to be_kind_of Watir::Browser
                 end
             end
 
@@ -50,8 +50,8 @@ EOSCRIPT
                 it 'runs the code' do
                     run
 
-                    framework.http.cookies.
-                        find { |c| c.name == 'mycookie' }.value.should == 'myvalue'
+                    expect(framework.http.cookies.
+                        find { |c| c.name == 'mycookie' }.value).to eq('myvalue')
                 end
             end
         end
@@ -71,7 +71,7 @@ EOSCRIPT
                 it "sets 'browser' to 'nil'" do
                     run
 
-                    options.datastore.browser.should be_nil
+                    expect(options.datastore.browser).to be_nil
                 end
             end
 
@@ -86,19 +86,19 @@ EOSCRIPT
                 it 'sets the status' do
                     run
 
-                    actual_results['status'].should  == 'missing_browser'
+                    expect(actual_results['status']).to  eq('missing_browser')
                 end
 
                 it 'sets the message' do
                     run
 
-                    actual_results['message'].should == plugin::STATUSES[:missing_browser]
+                    expect(actual_results['message']).to eq(plugin::STATUSES[:missing_browser])
                 end
 
                 it 'aborts the scan' do
                     run
 
-                    framework.status.should == :aborted
+                    expect(framework.status).to eq(:aborted)
                 end
             end
 
@@ -120,19 +120,19 @@ EOSCRIPT
         it 'sets the status' do
             run
 
-            actual_results['status'].should  == 'success'
+            expect(actual_results['status']).to  eq('success')
         end
 
         it 'sets the message' do
             run
 
-            actual_results['message'].should == plugin::STATUSES[:success]
+            expect(actual_results['message']).to eq(plugin::STATUSES[:success])
         end
 
         it 'sets the cookies' do
             run
 
-            actual_results['cookies'].should == { 'success' => 'true' }
+            expect(actual_results['cookies']).to eq({ 'success' => 'true' })
         end
     end
 
@@ -146,19 +146,19 @@ EOSCRIPT
         it 'sets the status' do
             run
 
-            actual_results['status'].should  == 'missing_check'
+            expect(actual_results['status']).to  eq('missing_check')
         end
 
         it 'sets the message' do
             run
 
-            actual_results['message'].should == plugin::STATUSES[:missing_check]
+            expect(actual_results['message']).to eq(plugin::STATUSES[:missing_check])
         end
 
         it 'aborts the scan' do
             run
 
-            framework.status.should == :aborted
+            expect(framework.status).to eq(:aborted)
         end
     end
 
@@ -171,19 +171,19 @@ EOSCRIPT
         it 'sets the status' do
             run
 
-            actual_results['status'].should  == 'failure'
+            expect(actual_results['status']).to  eq('failure')
         end
 
         it 'sets the message' do
             run
 
-            actual_results['message'].should == plugin::STATUSES[:failure]
+            expect(actual_results['message']).to eq(plugin::STATUSES[:failure])
         end
 
         it 'aborts the scan' do
             run
 
-            framework.status.should == :aborted
+            expect(framework.status).to eq(:aborted)
         end
     end
 
@@ -198,19 +198,76 @@ EOSCRIPT
             it 'sets the status' do
                 run
 
-                actual_results['status'].should  == 'error'
+                expect(actual_results['status']).to  eq('error')
             end
 
             it 'sets the message' do
                 run
 
-                actual_results['message'].should == plugin::STATUSES[:error]
+                expect(actual_results['message']).to eq(plugin::STATUSES[:error])
             end
 
             it 'aborts the scan' do
                 run
 
-                framework.status.should == :aborted
+                expect(framework.status).to eq(:aborted)
+            end
+        end
+
+        context 'when using Javascript' do
+            let(:script) do
+                <<EOSCRIPT
+                doesNotExist()
+EOSCRIPT
+            end
+            let(:script_path) { "#{super()}.js" }
+
+            it 'sets the status' do
+                run
+
+                expect(actual_results['status']).to  eq('error')
+            end
+
+            it 'sets the message' do
+                run
+
+                expect(actual_results['message']).to eq(plugin::STATUSES[:error])
+            end
+
+            it 'aborts the scan' do
+                run
+
+                expect(framework.status).to eq(:aborted)
+            end
+        end
+    end
+
+    context 'when there is a syntax error in the script' do
+        context 'when using Ruby' do
+            let(:script) do
+                <<EOSCRIPT
+                    {
+                        id: => stuff
+                    }
+EOSCRIPT
+            end
+
+            it 'sets the status' do
+                run
+
+                expect(actual_results['status']).to  eq('error')
+            end
+
+            it 'sets the message' do
+                run
+
+                expect(actual_results['message']).to eq(plugin::STATUSES[:error])
+            end
+
+            it 'aborts the scan' do
+                run
+
+                expect(framework.status).to eq(:aborted)
             end
         end
 
@@ -225,19 +282,19 @@ EOSCRIPT
             it 'sets the status' do
                 run
 
-                actual_results['status'].should  == 'error'
+                expect(actual_results['status']).to  eq('error')
             end
 
             it 'sets the message' do
                 run
 
-                actual_results['message'].should == plugin::STATUSES[:error]
+                expect(actual_results['message']).to eq(plugin::STATUSES[:error])
             end
 
             it 'aborts the scan' do
                 run
 
-                framework.status.should == :aborted
+                expect(framework.status).to eq(:aborted)
             end
         end
     end