arachni 1.2.1 → 1.3

data/spec/arachni/option_groups/dispatcher_spec.rb

@@ -7,27 +7,27 @@ describe Arachni::OptionGroups::Dispatcher do
     %w(url external_address pool_size instance_port_range neighbour
         node_ping_interval node_cost node_pipe_id node_weight node_nickname
     ).each do |method|
-        it { should respond_to method }
-        it { should respond_to "#{method}=" }
+        it { is_expected.to respond_to method }
+        it { is_expected.to respond_to "#{method}=" }
     end
 
     describe '#grid?' do
         it 'defaults to false' do
-            subject.grid?.should be_false
+            expect(subject.grid?).to be_falsey
         end
 
         describe 'when the option has been enabled' do
             context 'via #grid=' do
                 it 'returns true' do
                     subject.grid = true
-                    subject.grid?.should be_true
+                    expect(subject.grid?).to be_truthy
                 end
             end
 
             context 'via #grid_mode=' do
                 it 'returns true' do
                     subject.grid_mode = :balance
-                    subject.grid?.should be_true
+                    expect(subject.grid?).to be_truthy
                 end
             end
         end
@@ -35,20 +35,20 @@ describe Arachni::OptionGroups::Dispatcher do
             context 'via #grid=' do
                 it 'returns false' do
                     subject.grid = false
-                    subject.grid?.should be_false
+                    expect(subject.grid?).to be_falsey
                 end
             end
 
             context 'via #grid_mode=' do
                 it 'returns false' do
                     subject.grid_mode = false
-                    subject.grid?.should be_false
+                    expect(subject.grid?).to be_falsey
                 end
             end
         end
         describe 'by default' do
             it 'returns false' do
-                subject.grid?.should be_false
+                expect(subject.grid?).to be_falsey
             end
         end
     end
@@ -57,7 +57,7 @@ describe Arachni::OptionGroups::Dispatcher do
         context true do
             it 'is a shorthand for #grid_mode = :balance' do
                 subject.grid = true
-                subject.grid_mode.should == :balance
+                expect(subject.grid_mode).to eq(:balance)
             end
         end
     end
@@ -67,14 +67,14 @@ describe Arachni::OptionGroups::Dispatcher do
             context String do
                 it 'converts it to Symbol and sets the option' do
                     subject.grid_mode = 'balance'
-                    subject.grid_mode.should == :balance
+                    expect(subject.grid_mode).to eq(:balance)
                 end
             end
 
             context Symbol do
                 it 'sets the option' do
                     subject.grid_mode = :aggregate
-                    subject.grid_mode.should == :aggregate
+                    expect(subject.grid_mode).to eq(:aggregate)
                 end
             end
 
@@ -89,16 +89,16 @@ describe Arachni::OptionGroups::Dispatcher do
     describe '#grid_aggregate?' do
         context 'when in :aggregate mode' do
             it 'returns true' do
-                subject.grid_aggregate?.should be_false
+                expect(subject.grid_aggregate?).to be_falsey
                 subject.grid_mode = :aggregate
-                subject.grid_aggregate?.should be_true
+                expect(subject.grid_aggregate?).to be_truthy
             end
         end
         context 'when in :balance mode' do
             it 'returns false' do
-                subject.grid_aggregate?.should be_false
+                expect(subject.grid_aggregate?).to be_falsey
                 subject.grid_mode = :balance
-                subject.grid_aggregate?.should be_false
+                expect(subject.grid_aggregate?).to be_falsey
             end
         end
     end
@@ -106,16 +106,16 @@ describe Arachni::OptionGroups::Dispatcher do
     describe '#grid_balance?' do
         context 'when in :balance mode' do
             it 'returns true' do
-                subject.grid_balance?.should be_false
+                expect(subject.grid_balance?).to be_falsey
                 subject.grid_mode = :balance
-                subject.grid_balance?.should be_true
+                expect(subject.grid_balance?).to be_truthy
             end
         end
         context 'when in :balance mode' do
             it 'returns false' do
-                subject.grid_balance?.should be_false
+                expect(subject.grid_balance?).to be_falsey
                 subject.grid_mode = :aggregate
-                subject.grid_balance?.should be_false
+                expect(subject.grid_balance?).to be_falsey
             end
         end
     end

data/spec/arachni/option_groups/http_spec.rb

@@ -9,38 +9,38 @@ describe Arachni::OptionGroups::HTTP do
         response_max_size proxy_host proxy_port proxy_username proxy_password
         proxy_type proxy cookies cookie_jar_filepath cookie_string user_agent
         request_headers).each do |method|
-        it { should respond_to method }
-        it { should respond_to "#{method}=" }
+        it { is_expected.to respond_to method }
+        it { is_expected.to respond_to "#{method}=" }
     end
 
     describe '#user_agent' do
         it "defaults to Arachni/v#{Arachni::VERSION}" do
-            subject.user_agent.should == 'Arachni/v' + Arachni::VERSION.to_s
+            expect(subject.user_agent).to eq('Arachni/v' + Arachni::VERSION.to_s)
         end
     end
 
     describe '#request_concurrency' do
         it 'defaults to 20' do
-            subject.request_concurrency.should == 20
+            expect(subject.request_concurrency).to eq(20)
         end
     end
 
     describe '#request_timeout' do
         it 'defaults to 10000' do
-            subject.request_timeout.should == 10000
+            expect(subject.request_timeout).to eq(10000)
         end
     end
 
     describe '#response_max_size' do
         it 'defaults to 500000' do
-            subject.response_max_size.should == 500_000
+            expect(subject.response_max_size).to eq(500_000)
         end
     end
 
     describe '#proxy_type=' do
         it 'sets #proxy_type' do
             subject.proxy_type = 'http'
-            subject.proxy_type.should == 'http'
+            expect(subject.proxy_type).to eq('http')
         end
 
         context 'when given an invalid type' do
@@ -55,7 +55,7 @@ describe Arachni::OptionGroups::HTTP do
     describe '#ssl_certificate_type=' do
         it 'sets #ssl_certificate_type' do
             subject.ssl_certificate_type = 'pem'
-            subject.ssl_certificate_type.should == 'pem'
+            expect(subject.ssl_certificate_type).to eq('pem')
         end
 
         context 'when given an invalid type' do
@@ -70,7 +70,7 @@ describe Arachni::OptionGroups::HTTP do
     describe '#ssl_key_type=' do
         it 'sets #ssl_key_type' do
             subject.ssl_key_type = 'pem'
-            subject.ssl_key_type.should == 'pem'
+            expect(subject.ssl_key_type).to eq('pem')
         end
 
         context 'when given an invalid type' do
@@ -85,7 +85,7 @@ describe Arachni::OptionGroups::HTTP do
     describe '#ssl_version=' do
         it 'sets #ssl_version' do
             subject.ssl_version = 'TLSv1'
-            subject.ssl_version.should == 'TLSv1'
+            expect(subject.ssl_version).to eq('TLSv1')
         end
 
         context 'when given an invalid type' do
@@ -102,7 +102,7 @@ describe Arachni::OptionGroups::HTTP do
 
         it "does not include 'cookie_jar_filepath'" do
             subject.cookie_jar_filepath = 'stuff'
-            data.should_not include 'cookie_jar_filepath'
+            expect(data).not_to include 'cookie_jar_filepath'
         end
     end
 end

data/spec/arachni/option_groups/input_spec.rb

@@ -5,8 +5,8 @@ describe Arachni::OptionGroups::Input do
     subject { described_class.new }
 
     %w(values without_defaults).each do |method|
-        it { should respond_to method }
-        it { should respond_to "#{method}=" }
+        it { is_expected.to respond_to method }
+        it { is_expected.to respond_to "#{method}=" }
     end
 
     context '#values' do
@@ -15,9 +15,9 @@ describe Arachni::OptionGroups::Input do
                 'article' => 'my article'
             }
 
-            subject.values.should == {
+            expect(subject.values).to eq({
                 /article/ => 'my article'
-            }
+            })
         end
     end
 
@@ -27,23 +27,24 @@ describe Arachni::OptionGroups::Input do
                 'article' => 'my article'
             }
 
-            subject.default_values.should == {
+            expect(subject.default_values).to eq({
                 /article/ => 'my article'
-            }
+            })
         end
     end
 
     context '#without_defaults' do
         it 'returns false' do
-            subject.without_defaults.should be_false
+            expect(subject.without_defaults).to be_falsey
         end
     end
 
     describe '#effective_values' do
         it 'merges the #default_values with the configured #values' do
             subject.values = { /some stuff/ => '2' }
-            subject.effective_values.should ==
+            expect(subject.effective_values).to eq(
                 subject.default_values.merge( subject.values )
+            )
         end
 
         context '#without_defaults?' do
@@ -51,7 +52,7 @@ describe Arachni::OptionGroups::Input do
                 subject.without_defaults = true
 
                 subject.values = { /some stuff/ => '2' }
-                subject.effective_values.should == subject.values
+                expect(subject.effective_values).to eq(subject.values)
             end
         end
     end
@@ -61,10 +62,10 @@ describe Arachni::OptionGroups::Input do
 
         it 'updates #values from the given file' do
             subject.update_values_from_file( file )
-            subject.values.should == {
+            expect(subject.values).to eq({
                 /test/       => 'blah',
                 /other-test/ => 'blah2'
-            }
+            })
         end
     end
 
@@ -73,7 +74,7 @@ describe Arachni::OptionGroups::Input do
             subject.without_defaults = true
             subject.values = { /name/ => 'John Doe' }
 
-            subject.value_for_name( 'name' ).should == 'John Doe'
+            expect(subject.value_for_name( 'name' )).to eq('John Doe')
         end
 
         context 'when the value is a Proc' do
@@ -83,14 +84,14 @@ describe Arachni::OptionGroups::Input do
                 value = 'John Doe'
                 subject.values = { /name/ => proc{ value } }
 
-                subject.value_for_name( 'name' ).should == value
+                expect(subject.value_for_name( 'name' )).to eq(value)
             end
 
             it 'passes the input name as an argument' do
                 subject.without_defaults = true
                 subject.values = { /name/ => proc{ |name| name } }
 
-                subject.value_for_name( 'name' ).should == 'name'
+                expect(subject.value_for_name( 'name' )).to eq('name')
             end
         end
 
@@ -98,21 +99,23 @@ describe Arachni::OptionGroups::Input do
             context "and 'use_default' is set to" do
                 context true do
                     it 'returns the default' do
-                        subject.value_for_name( 'blahblah', true ).should ==
+                        expect(subject.value_for_name( 'blahblah', true )).to eq(
                             described_class::DEFAULT
+                        )
                     end
                 end
 
                 context false do
                     it 'returns nil' do
-                        subject.value_for_name( 'blahblah', false ).should == nil
+                        expect(subject.value_for_name( 'blahblah', false )).to eq(nil)
                     end
                 end
 
                 context 'by default' do
                     it 'returns the default' do
-                        subject.value_for_name( 'blahblah' ).should ==
+                        expect(subject.value_for_name( 'blahblah' )).to eq(
                             described_class::DEFAULT
+                        )
                     end
                 end
             end
@@ -123,7 +126,7 @@ describe Arachni::OptionGroups::Input do
         let(:inputs) { { 'name' => 'john' } }
 
         it 'fills in all empty inputs' do
-            subject.fill(
+            expect(subject.fill(
                 'nAMe'    => nil,
                 'usEr'    => nil,
                 'uSR'     => nil,
@@ -135,7 +138,7 @@ describe Arachni::OptionGroups::Input do
                 'aCcouNt' => nil,
                 'stuff'   => 'stuff value',
                 'iD'      => nil
-            ).should == {
+            )).to eq({
                 'nAMe'    => 'arachni_name',
                 'usEr'    => 'arachni_user',
                 'uSR'     => 'arachni_user',
@@ -147,28 +150,28 @@ describe Arachni::OptionGroups::Input do
                 'aCcouNt' => '12',
                 'stuff'   => 'stuff value',
                 'iD'      => '1'
-            }
+            })
         end
 
         context 'when no match could be found' do
             let(:inputs) { { 'stuff' => '' } }
 
             it 'does not overwrite it' do
-                subject.fill( inputs ).should == {
+                expect(subject.fill( inputs )).to eq({
                     'stuff' => described_class::DEFAULT
-                }
+                })
             end
         end
 
         context 'when there is a value' do
             it 'skips it' do
-                subject.fill( inputs ).should == inputs
+                expect(subject.fill( inputs )).to eq(inputs)
             end
 
             context '#force?' do
                 it 'overwrites it' do
                     subject.force = true
-                    subject.fill( inputs ).should == { 'name' => 'arachni_name' }
+                    expect(subject.fill( inputs )).to eq({ 'name' => 'arachni_name' })
                 end
 
                 context 'when no value could be found' do
@@ -176,7 +179,7 @@ describe Arachni::OptionGroups::Input do
 
                     it 'does not overwrite it' do
                         subject.force = true
-                        subject.fill( inputs ).should == inputs
+                        expect(subject.fill( inputs )).to eq(inputs)
                     end
                 end
             end
@@ -190,12 +193,13 @@ describe Arachni::OptionGroups::Input do
             values = { /article/ => 'my article' }
             subject.values = values
 
-            data['values'].should == { /article/.to_s => 'my article' }
+            expect(data['values']).to eq({ /article/.to_s => 'my article' })
         end
 
         it "converts 'default_values' to strings" do
-            data['default_values'].keys.should ==
+            expect(data['default_values'].keys).to eq(
                 subject.default_values.keys.map(&:to_s)
+            )
         end
     end
 

data/spec/arachni/option_groups/output_spec.rb

@@ -5,7 +5,7 @@ describe Arachni::OptionGroups::Output do
     subject { described_class.new }
 
     %w(reroute_to_logfile).each do |method|
-        it { should respond_to method }
-        it { should respond_to "#{method}=" }
+        it { is_expected.to respond_to method }
+        it { is_expected.to respond_to "#{method}=" }
     end
 end

data/spec/arachni/option_groups/paths_spec.rb

@@ -21,29 +21,29 @@ describe Arachni::OptionGroups::Paths do
 
         describe "##{method}" do
             it 'points to an existing directory' do
-                File.exists?( subject.send method ).should be_true
+                expect(File.exists?( subject.send method )).to be_truthy
             end
         end
 
-        it { should respond_to method }
-        it { should respond_to "#{method}=" }
+        it { is_expected.to respond_to method }
+        it { is_expected.to respond_to "#{method}=" }
     end
 
     describe '#logs' do
         it 'returns the default location' do
-            subject.logs.should == "#{subject.root}logs/"
+            expect(subject.logs).to eq("#{subject.root}logs/")
         end
 
         context 'when the ARACHNI_FRAMEWORK_LOGDIR environment variable' do
             it 'returns its value' do
                 ENV['ARACHNI_FRAMEWORK_LOGDIR'] = 'test'
-                subject.logs.should == 'test/'
+                expect(subject.logs).to eq('test/')
             end
         end
 
         context "when #{described_class}.config['framework']['logs']" do
             it 'returns its value' do
-                described_class.stub(:config) do
+                allow(described_class).to receive(:config) do
                     {
                         'framework' => {
                             'logs' => 'logs-stuff/'
@@ -51,19 +51,19 @@ describe Arachni::OptionGroups::Paths do
                     }
                 end
 
-                described_class.new.logs.should == 'logs-stuff/'
+                expect(described_class.new.logs).to eq('logs-stuff/')
             end
         end
     end
 
     describe '#snapshots' do
         it 'returns the default location' do
-            subject.snapshots.should == "#{subject.root}snapshots/"
+            expect(subject.snapshots).to eq("#{subject.root}snapshots/")
         end
 
         context "when #{described_class}.config['framework']['snapshots']" do
             it 'returns its value' do
-                described_class.stub(:config) do
+                allow(described_class).to receive(:config) do
                     {
                         'framework' => {
                             'snapshots' => 'snapshots-stuff/'
@@ -71,7 +71,7 @@ describe Arachni::OptionGroups::Paths do
                     }
                 end
 
-                described_class.new.snapshots.should == 'snapshots-stuff/'
+                expect(described_class.new.snapshots).to eq('snapshots-stuff/')
             end
         end
     end
@@ -86,13 +86,13 @@ describe Arachni::OptionGroups::Paths do
                 }
             }.to_yaml
 
-            described_class.stub(:paths_config_file) { paths_config_file }
+            allow(described_class).to receive(:paths_config_file) { paths_config_file }
             IO.write( described_class.paths_config_file, yaml )
             described_class.clear_config_cache
 
             @created_resources << described_class.config['stuff']['blah']
 
-            described_class.config['stuff']['blah'].should == "#{ENV['HOME']}/foo-#{Process.pid}/"
+            expect(described_class.config['stuff']['blah']).to eq("#{ENV['HOME']}/foo-#{Process.pid}/")
         end
 
         it 'appends / to paths' do
@@ -103,13 +103,13 @@ describe Arachni::OptionGroups::Paths do
                 }
             }.to_yaml
 
-            described_class.stub(:paths_config_file) { paths_config_file }
+            allow(described_class).to receive(:paths_config_file) { paths_config_file }
             IO.write( described_class.paths_config_file, yaml )
             described_class.clear_config_cache
 
             @created_resources << described_class.config['stuff']['blah']
 
-            described_class.config['stuff']['blah'].should == "#{dir}/"
+            expect(described_class.config['stuff']['blah']).to eq("#{dir}/")
         end
 
         it 'creates the given directories' do
@@ -120,15 +120,15 @@ describe Arachni::OptionGroups::Paths do
                 }
             }.to_yaml
 
-            described_class.stub(:paths_config_file) { paths_config_file }
+            allow(described_class).to receive(:paths_config_file) { paths_config_file }
             IO.write( described_class.paths_config_file, yaml )
             described_class.clear_config_cache
 
             @created_resources << dir
 
-            File.exist?( dir ).should be_false
+            expect(File.exist?( dir )).to be_falsey
             described_class.config
-            File.exist?( dir ).should be_true
+            expect(File.exist?( dir )).to be_truthy
         end
     end