arachni 1.2.1 → 1.3

data/spec/arachni/component/options/address_spec.rb

@@ -6,20 +6,20 @@ describe Arachni::Component::Options::Address do
     describe '#valid?' do
         context 'when the value is valid' do
             it 'returns true' do
-                described_class.new( '', value: 'localhost' ).should be_true
+                expect(described_class.new( '', value: 'localhost' )).to be_truthy
             end
         end
 
         context 'when the value is not valid' do
             it 'returns false' do
-                described_class.new( '', value: 'stuff' ).valid?.should be_false
+                expect(described_class.new( '', value: 'stuff' ).valid?).to be_falsey
             end
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            described_class.new( '' ).type.should == :address
+            expect(described_class.new( '' ).type).to eq(:address)
         end
     end
 

data/spec/arachni/component/options/base_spec.rb

@@ -5,12 +5,12 @@ describe Arachni::Component::Options::Base do
 
     describe '#normalize' do
         it 'returns the value as is' do
-            described_class.new( '', value: 'blah' ).normalize.should == 'blah'
+            expect(described_class.new( '', value: 'blah' ).normalize).to eq('blah')
         end
 
         context 'when no #value is set' do
             it 'returns #default' do
-                described_class.new( '', default: 'test' ).normalize.should == 'test'
+                expect(described_class.new( '', default: 'test' ).normalize).to eq('test')
             end
         end
     end
@@ -19,13 +19,13 @@ describe Arachni::Component::Options::Base do
         context 'when the option is required' do
             context 'and the value is not empty' do
                 it 'returns true' do
-                    described_class.new( '', required: true, value: 'stuff' ).valid?.should be_true
+                    expect(described_class.new( '', required: true, value: 'stuff' ).valid?).to be_truthy
                 end
             end
 
             context 'and the value is nil' do
                 it 'returns false' do
-                    described_class.new( '', required: true ).valid?.should be_false
+                    expect(described_class.new( '', required: true ).valid?).to be_falsey
                 end
             end
         end
@@ -33,13 +33,13 @@ describe Arachni::Component::Options::Base do
         context 'when the option is not required' do
             context 'and the value is not empty' do
                 it 'returns true' do
-                    described_class.new( '', value: 'true' ).valid?.should be_true
+                    expect(described_class.new( '', value: 'true' ).valid?).to be_truthy
                 end
             end
 
             context 'and the value is empty' do
                 it 'returns true' do
-                    described_class.new( '' ).valid?.should be_true
+                    expect(described_class.new( '' ).valid?).to be_truthy
                 end
             end
         end
@@ -47,7 +47,7 @@ describe Arachni::Component::Options::Base do
 
     describe '#type' do
         it 'returns the option type' do
-            described_class.new( '' ).type.should == :abstract
+            expect(described_class.new( '' ).type).to eq(:abstract)
         end
     end
 end

data/spec/arachni/component/options/bool_spec.rb

@@ -10,34 +10,34 @@ describe Arachni::Component::Options::Bool do
         context 'when the value is valid' do
             it 'returns true' do
                 trues.each do |v|
-                    described_class.new( '', value: v ).valid?.should be_true
+                    expect(described_class.new( '', value: v ).valid?).to be_truthy
                 end
             end
         end
 
         context 'when the value is not valid' do
             it 'returns false' do
-                described_class.new( '', value: 'dds' ).valid?.should be_false
+                expect(described_class.new( '', value: 'dds' ).valid?).to be_falsey
             end
         end
     end
 
     describe '#normalize' do
         it 'converts the string input into a boolean value' do
-            trues.each { |v| described_class.new( '', value: v  ).normalize.should be_true }
-            falses.each { |v| described_class.new( '', value: v  ).normalize.should be_false }
+            trues.each { |v| expect(described_class.new( '', value: v  ).normalize).to be_truthy }
+            falses.each { |v| expect(described_class.new( '', value: v  ).normalize).to be_falsey }
         end
     end
 
     describe '#true?' do
         context 'when the value option represents true' do
             it 'returns true' do
-                trues.each { |v| described_class.new( '', value: v  ).true?.should be_true }
+                trues.each { |v| expect(described_class.new( '', value: v  ).true?).to be_truthy }
             end
         end
         context 'when the value option represents false' do
             it 'returns false' do
-                falses.each { |v| described_class.new( '', value: v  ).true?.should be_false }
+                falses.each { |v| expect(described_class.new( '', value: v  ).true?).to be_falsey }
             end
         end
     end
@@ -45,19 +45,19 @@ describe Arachni::Component::Options::Bool do
     describe '#false?' do
         context 'when the value option represents false' do
             it 'returns true' do
-                falses.each { |v| described_class.new( '', value: v  ).false?.should be_true }
+                falses.each { |v| expect(described_class.new( '', value: v  ).false?).to be_truthy }
             end
         end
         context 'when the value option represents true' do
             it 'returns false' do
-                trues.each { |v| described_class.new( '', value: v  ).false?.should be_false }
+                trues.each { |v| expect(described_class.new( '', value: v  ).false?).to be_falsey }
             end
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            described_class.new( '' ).type.should == :bool
+            expect(described_class.new( '' ).type).to eq(:bool)
         end
     end
 

data/spec/arachni/component/options/float_spec.rb

@@ -9,14 +9,14 @@ describe Arachni::Component::Options::Float do
             it 'returns true' do
                 ['1', 1, '1.2'].each do |value|
                     subject.value = value
-                    subject.valid?.should be_true
+                    expect(subject.valid?).to be_truthy
                 end
             end
         end
         context 'when the value is not valid' do
             it 'returns false' do
                 subject.value = '4d'
-                subject.valid?.should be_false
+                expect(subject.valid?).to be_falsey
             end
         end
     end
@@ -24,19 +24,19 @@ describe Arachni::Component::Options::Float do
     describe '#normalize' do
         it 'converts the string input into a boolean value' do
             subject.value = '5'
-            subject.normalize.should == 5.0
+            expect(subject.normalize).to eq(5.0)
 
             subject.value = '5.3'
-            subject.normalize.should == 5.3
+            expect(subject.normalize).to eq(5.3)
 
             subject.value = 3
-            subject.normalize.should == 3.0
+            expect(subject.normalize).to eq(3.0)
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :float
+            expect(subject.type).to eq(:float)
         end
     end
 

data/spec/arachni/component/options/int_spec.rb

@@ -9,7 +9,7 @@ describe Arachni::Component::Options::Int do
             it 'returns true' do
                 ['1', 1, 0, '0'].each do |value|
                     subject.value = value
-                    subject.valid?.should be_true
+                    expect(subject.valid?).to be_truthy
                 end
             end
         end
@@ -18,7 +18,7 @@ describe Arachni::Component::Options::Int do
             it 'returns false' do
                 %w(sd 4d).each do |value|
                     subject.value = value
-                    subject.valid?.should be_false
+                    expect(subject.valid?).to be_falsey
                 end
             end
         end
@@ -27,16 +27,16 @@ describe Arachni::Component::Options::Int do
     describe '#normalize' do
         it 'converts the string input into a boolean value' do
             subject.value = '5'
-            subject.normalize.should == 5
+            expect(subject.normalize).to eq(5)
 
             subject.value = 3
-            subject.normalize.should == 3
+            expect(subject.normalize).to eq(3)
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :integer
+            expect(subject.type).to eq(:integer)
         end
     end
 

data/spec/arachni/component/options/multiple_choice_spec.rb

@@ -9,7 +9,7 @@ describe Arachni::Component::Options::MultipleChoice do
         let(:data) { subject.to_rpc_data }
 
         it "includes 'choices'" do
-            data['choices'].should == subject.choices
+            expect(data['choices']).to eq(subject.choices)
         end
     end
 
@@ -18,20 +18,20 @@ describe Arachni::Component::Options::MultipleChoice do
         let(:data) { Arachni::RPC::Serializer.rpc_data( subject ) }
 
         it "restores 'choices'" do
-            restored.choices.should == subject.choices
+            expect(restored.choices).to eq(subject.choices)
         end
     end
 
     describe '#choices' do
         context 'when no values have been provided' do
             it 'returns an empty array' do
-                described_class.new( '' ).choices.should == []
+                expect(described_class.new( '' ).choices).to eq([])
             end
         end
 
         it 'returns an array of possible, predefined, values' do
             valid_values = %w(1 2 3)
-            described_class.new( '', choices: valid_values ).choices.should == valid_values
+            expect(described_class.new( '', choices: valid_values ).choices).to eq(valid_values)
         end
     end
 
@@ -39,13 +39,13 @@ describe Arachni::Component::Options::MultipleChoice do
         context 'when the value is valid' do
             it 'returns true' do
                 subject.value = 1
-                subject.should be_true
+                expect(subject).to be_truthy
             end
         end
         context 'when the value is not valid' do
             it 'returns false' do
                 subject.value = 4
-                subject.valid?.should be_false
+                expect(subject.valid?).to be_falsey
             end
         end
     end
@@ -53,29 +53,29 @@ describe Arachni::Component::Options::MultipleChoice do
     describe '#normalize' do
         it 'returns a String' do
             subject.value = '3'
-            subject.normalize.should == '3'
+            expect(subject.normalize).to eq('3')
 
             subject.value = 3
-            subject.normalize.should == '3'
+            expect(subject.normalize).to eq('3')
         end
     end
 
     describe '#description' do
         it 'returns a description including the acceptable values' do
-            subject.description.include?( 'Blah' ).should be_true
-            subject.choices.each { |v| subject.description.should include v }
+            expect(subject.description.include?( 'Blah' )).to be_truthy
+            subject.choices.each { |v| expect(subject.description).to include v }
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :multiple_choice
+            expect(subject.type).to eq(:multiple_choice)
         end
     end
 
     describe '#to_h' do
         it 'includes :choices' do
-            subject.to_h[:choices].should == subject.choices
+            expect(subject.to_h[:choices]).to eq(subject.choices)
         end
     end
 

data/spec/arachni/component/options/object_spec.rb

@@ -9,7 +9,7 @@ describe Arachni::Component::Options::Object do
             it 'returns the value as is' do
                 [1, 'test', :stuff, [:blah]].each do |value|
                     subject.value = value
-                    subject.send(m).should == value
+                    expect(subject.send(m)).to eq(value)
                 end
             end
         end
@@ -17,7 +17,7 @@ describe Arachni::Component::Options::Object do
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :object
+            expect(subject.type).to eq(:object)
         end
     end
 

data/spec/arachni/component/options/path_spec.rb

@@ -8,21 +8,21 @@ describe Arachni::Component::Options::Path do
         context 'when the path exists' do
             it 'returns true' do
                 subject.value = __FILE__
-                subject.valid?.should be_true
+                expect(subject.valid?).to be_truthy
             end
         end
 
         context 'when the path does not exist' do
             it 'returns false' do
                 subject.value = __FILE__ + '22'
-                subject.valid?.should be_false
+                expect(subject.valid?).to be_falsey
             end
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :path
+            expect(subject.type).to eq(:path)
         end
     end
 

data/spec/arachni/component/options/port_spec.rb

@@ -9,10 +9,10 @@ describe Arachni::Component::Options::Port do
             it 'returns true' do
                 (1..65535).each do |p|
                     subject.value = p
-                    subject.valid?.should be_true
+                    expect(subject.valid?).to be_truthy
 
                     subject.value = p.to_s
-                    subject.valid?.should be_true
+                    expect(subject.valid?).to be_truthy
                 end
             end
         end
@@ -20,10 +20,10 @@ describe Arachni::Component::Options::Port do
             it 'returns false' do
                 ['dd', -1, 0, 9999999].each do |p|
                     subject.value = p
-                    subject.valid?.should be_false
+                    expect(subject.valid?).to be_falsey
 
                     subject.value = p.to_s
-                    subject.valid?.should be_false
+                    expect(subject.valid?).to be_falsey
                 end
 
             end
@@ -32,7 +32,7 @@ describe Arachni::Component::Options::Port do
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :port
+            expect(subject.type).to eq(:port)
         end
     end
 

data/spec/arachni/component/options/string_spec.rb

@@ -8,7 +8,7 @@ describe Arachni::Component::Options::String do
         it 'returns true' do
             ['test', 999, true].each do |value|
                 subject.value = value
-                subject.valid?.should be_true
+                expect(subject.valid?).to be_truthy
             end
         end
     end
@@ -16,13 +16,13 @@ describe Arachni::Component::Options::String do
     describe '#normalize' do
         it 'returns a string representation of the value' do
             subject.value = 'test'
-            subject.normalize.should == 'test'
+            expect(subject.normalize).to eq('test')
         end
     end
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :string
+            expect(subject.type).to eq(:string)
         end
     end
 

data/spec/arachni/component/options/url_spec.rb

@@ -7,7 +7,7 @@ describe Arachni::Component::Options::URL do
     describe '#normalize' do
         it "returns #{Arachni::URI}" do
             subject.value = 'http://localhost'
-            subject.normalize.should == Arachni::URI('http://localhost')
+            expect(subject.normalize).to eq(Arachni::URI('http://localhost'))
         end
     end
 
@@ -15,7 +15,7 @@ describe Arachni::Component::Options::URL do
         context 'when the value is valid' do
             it 'returns true' do
                 subject.value = 'http://localhost'
-                subject.valid?.should be_true
+                expect(subject.valid?).to be_truthy
             end
         end
 
@@ -23,7 +23,7 @@ describe Arachni::Component::Options::URL do
             it 'returns false' do
                 ['http://localhost22', 'localhost', 11, '#$#$c3c43', true].each do |value|
                     subject.value = value
-                    subject.valid?.should be_false
+                    expect(subject.valid?).to be_falsey
                 end
             end
         end
@@ -31,7 +31,7 @@ describe Arachni::Component::Options::URL do
 
     describe '#type' do
         it 'returns the option type as a string' do
-            subject.type.should == :url
+            expect(subject.type).to eq(:url)
         end
     end
 

data/spec/arachni/component/utilities_spec.rb

@@ -12,7 +12,7 @@ describe Arachni::Component::Utilities do
             filename = 'read_file.txt'
             filepath = File.expand_path( File.dirname( __FILE__ ) ) + '/utilities_spec/' + filename
 
-            @utils.read_file( filename ).join( "\n" ).should == IO.read( filepath ).strip
+            expect(@utils.read_file( filename ).join( "\n" )).to eq(IO.read( filepath ).strip)
         end
 
         context 'if a block is given' do
@@ -23,7 +23,7 @@ describe Arachni::Component::Utilities do
                 lines = []
                 @utils.read_file( filename ){ |line| lines << line }
 
-                lines.join( "\n" ).should == IO.read( filepath ).strip
+                expect(lines.join( "\n" )).to eq(IO.read( filepath ).strip)
             end
         end
     end