arachni 1.2.1 → 1.3

data/spec/arachni/element/generic_dom_spec.rb

@@ -28,35 +28,35 @@ describe Arachni::Element::GenericDOM do
 
     describe '#initialize' do
         it "sets #source form the #{Arachni::Browser::ElementLocator}" do
-            subject.source.should == element.to_s
+            expect(subject.source).to eq(element.to_s)
         end
     end
 
     describe '#transition' do
         it 'returns the associated transition' do
-            subject.transition.should == transition
+            expect(subject.transition).to eq(transition)
         end
     end
 
     describe '#event' do
         it 'returns the associated event' do
-            subject.event.should == transition.event
+            expect(subject.event).to eq(transition.event)
         end
 
         it 'is aliased to #method' do
-            subject.method.should == transition.event
+            expect(subject.method).to eq(transition.event)
         end
     end
 
     describe '#element' do
         it 'returns the associated element locator' do
-            subject.element.should == transition.element
+            expect(subject.element).to eq(transition.element)
         end
     end
 
     describe '#attributes' do
         it 'returns the associated element attributes' do
-            subject.attributes.should == transition.element.attributes
+            expect(subject.attributes).to eq(transition.element.attributes)
         end
     end
 
@@ -68,7 +68,7 @@ describe Arachni::Element::GenericDOM do
         end
 
         it 'returns the element name from the its attributes' do
-            subject.name.should == 'my-name'
+            expect(subject.name).to eq('my-name')
         end
 
         context 'when an id is set instead of a name' do
@@ -79,12 +79,12 @@ describe Arachni::Element::GenericDOM do
             end
 
             it 'returns the id' do
-                subject.name.should == 'my-id'
+                expect(subject.name).to eq('my-id')
             end
         end
 
         it 'is aliased to #affected_input_name' do
-            subject.affected_input_name.should == subject.name
+            expect(subject.affected_input_name).to eq(subject.name)
         end
     end
 
@@ -96,25 +96,25 @@ describe Arachni::Element::GenericDOM do
         end
 
         it 'returns the value for the element' do
-            subject.value.should == 'my-val'
+            expect(subject.value).to eq('my-val')
         end
 
         it 'is aliased to #affected_input_value' do
-            subject.affected_input_value.should == subject.value
+            expect(subject.affected_input_value).to eq(subject.value)
         end
     end
 
     describe '#type' do
         it 'returns the #element tag name' do
-            subject.type.should == element.tag_name
+            expect(subject.type).to eq(element.tag_name)
         end
     end
 
     describe '#to_h' do
         it 'includes the #transition' do
-            subject.to_h[:transition].should == transition.to_h.tap do |h|
+            expect(subject.to_h[:transition]).to eq(transition.to_h.tap do |h|
                 h[:element] = h[:element].to_h
-            end
+            end)
         end
     end
 end

data/spec/arachni/element/header_spec.rb

@@ -2,7 +2,25 @@ require 'spec_helper'
 
 describe Arachni::Element::Header do
     it_should_behave_like 'element'
-    it_should_behave_like 'auditable', single_input: true, supports_nulls: false
+
+    it_should_behave_like 'with_auditor'
+
+    it_should_behave_like 'submittable'
+    it_should_behave_like 'inputtable', single_input:   true
+    it_should_behave_like 'mutable',    supports_nulls: false
+    it_should_behave_like 'auditable'
+
+    before :each do
+        @framework ||= Arachni::Framework.new
+        @auditor     = Auditor.new( Arachni::Page.from_url( url ), @framework )
+    end
+
+    after :each do
+        @framework.reset
+        reset_options
+    end
+
+    let(:auditor) { @auditor }
 
     def auditable_extract_parameters( resource )
         YAML.load( resource.body )
@@ -19,56 +37,56 @@ describe Arachni::Element::Header do
     let(:utilities) { Arachni::Utilities }
 
     it 'is be assigned to Arachni::Header for easy access' do
-        Arachni::Header.should == described_class
+        expect(Arachni::Header).to eq(described_class)
     end
 
     it 'retains its assigned inputs' do
-        subject.inputs.should == inputs
+        expect(subject.inputs).to eq(inputs)
     end
 
     describe '#simple' do
         it 'returns the inputs as is' do
-            subject.simple.should == inputs
+            expect(subject.simple).to eq(inputs)
         end
     end
 
     describe '#mutations' do
         describe :parameter_names do
             it 'creates a new header' do
-                subject.mutations( 'seed', parameter_names: true ).last.
-                    inputs.keys.should == %w(seed)
+                expect(subject.mutations( 'seed', parameter_names: true ).last.
+                    inputs.keys).to eq(%w(seed))
             end
         end
 
         describe :format do
             it 'does not include NULLs' do
-                subject.mutations( 'seed' ).
-                    select { |m| m.affected_input_value.include? "\0" }.should be_empty
+                expect(subject.mutations( 'seed' ).
+                    select { |m| m.affected_input_value.include? "\0" }).to be_empty
             end
         end
     end
 
     describe '#name' do
         it 'returns the header name' do
-            subject.name.should == inputs.first.to_a.first
+            expect(subject.name).to eq(inputs.first.to_a.first)
         end
     end
 
     describe '#value' do
         it 'returns the header value' do
-            subject.value.should == inputs.first.to_a.last
+            expect(subject.value).to eq(inputs.first.to_a.last)
         end
     end
 
     describe '#valid_input_data?' do
         it 'returns true' do
-            subject.valid_input_data?( 'stuff' ).should be_true
+            expect(subject.valid_input_data?( 'stuff' )).to be_truthy
         end
 
         described_class::INVALID_INPUT_DATA.each do |invalid_data|
             context "when the value contains #{invalid_data.inspect}" do
                 it 'returns false' do
-                    subject.valid_input_data?( "stuff #{invalid_data}" ).should be_false
+                    expect(subject.valid_input_data?( "stuff #{invalid_data}" )).to be_falsey
                 end
             end
         end
@@ -77,32 +95,32 @@ describe Arachni::Element::Header do
     describe '.encode' do
         it 'encodes the passed string' do
             v = "stuff \r\n"
-            described_class.encode( v ).should == URI.encode( v, "\r\n" )
+            expect(described_class.encode( v )).to eq(URI.encode( v, "\r\n" ))
         end
     end
     describe '#encode' do
         it 'encodes the passed string' do
             v = "stuff \r\n"
-            subject.encode( v ).should == described_class.encode( v )
+            expect(subject.encode( v )).to eq(described_class.encode( v ))
         end
     end
 
     describe '.decode' do
         it 'URL-decodes the passed string' do
             v = '%25+value%5C+%2B%3D%26%3B'
-            described_class.decode( v ).should == URI.decode( v )
+            expect(described_class.decode( v )).to eq(URI.decode( v ))
         end
     end
     describe '#decode' do
         it 'URL-decodes the passed string' do
             v = '%25+value%5C+%2B%3D%26%3B'
-            subject.decode( v ).should == described_class.decode( v )
+            expect(subject.decode( v )).to eq(described_class.decode( v ))
         end
     end
 
     describe '#type' do
         it 'is "header"' do
-            subject.type.should == :header
+            expect(subject.type).to eq(:header)
         end
     end
 

data/spec/arachni/element/json_spec.rb

@@ -2,8 +2,27 @@ require 'spec_helper'
 
 describe Arachni::Element::JSON do
     it_should_behave_like 'element'
+
+    it_should_behave_like 'with_source'
+    it_should_behave_like 'with_auditor'
+
+    it_should_behave_like 'submittable'
+    it_should_behave_like 'inputtable'
+    it_should_behave_like 'mutable'
     it_should_behave_like 'auditable'
 
+    before :each do
+        @framework ||= Arachni::Framework.new
+        @auditor     = Auditor.new( Arachni::Page.from_url( url ), @framework )
+    end
+
+    after :each do
+        @framework.reset
+        reset_options
+    end
+
+    let(:auditor) { @auditor }
+
     def auditable_extract_parameters( resource )
         JSON.load( resource.body )
     end
@@ -19,7 +38,7 @@ describe Arachni::Element::JSON do
     let(:utilities) { Arachni::Utilities }
 
     it 'is be assigned to Arachni::JSON for easy access' do
-        Arachni::JSON.should == described_class
+        expect(Arachni::JSON).to eq(described_class)
     end
 
     describe '#to_json' do
@@ -45,13 +64,13 @@ describe Arachni::Element::JSON do
         end
 
         it 'returns the input data as JSON' do
-            subject.to_json.should == inputs.to_json
+            expect(subject.to_json).to eq(inputs.to_json)
         end
     end
 
     describe '#inputs=' do
         it 'sets inputs' do
-            subject.inputs.should == inputs
+            expect(subject.inputs).to eq(inputs)
         end
 
         it 'recursively converts keys to string' do
@@ -62,12 +81,12 @@ describe Arachni::Element::JSON do
                 }
             }
 
-            subject.inputs.should == {
+            expect(subject.inputs).to eq({
                 'stuff'  => 1,
                 'stuff2' => {
                     'stuff2' => '2'
                 }
-            }
+            })
         end
 
         context 'when it has nested hashes' do
@@ -82,7 +101,7 @@ describe Arachni::Element::JSON do
             end
 
             it 'preserves them' do
-                subject.inputs.should == inputs
+                expect(subject.inputs).to eq(inputs)
             end
         end
 
@@ -98,7 +117,7 @@ describe Arachni::Element::JSON do
             end
 
             it 'preserves them' do
-                subject.inputs.should == inputs
+                expect(subject.inputs).to eq(inputs)
             end
         end
     end
@@ -109,7 +128,7 @@ describe Arachni::Element::JSON do
                 it 'stores the item as a String' do
                     affected_input_name = ['stuff']
                     subject.affected_input_name = affected_input_name
-                    subject.affected_input_name.should == affected_input_name.first
+                    expect(subject.affected_input_name).to eq(affected_input_name.first)
                 end
             end
 
@@ -117,7 +136,7 @@ describe Arachni::Element::JSON do
                 it 'sets the path to the fuzzed input' do
                     affected_input_name = ['stuff', 'stuff2']
                     subject.affected_input_name = affected_input_name
-                    subject.affected_input_name.should == affected_input_name
+                    expect(subject.affected_input_name).to eq(affected_input_name)
                 end
             end
         end
@@ -139,8 +158,9 @@ describe Arachni::Element::JSON do
                 end
 
                 it 'returns the input data at that path' do
-                    subject[['nested', 'nested-name', 'deep-nested']].should ==
+                    expect(subject[['nested', 'nested-name', 'deep-nested']]).to eq(
                         inputs['nested']['nested-name']['deep-nested']
+                    )
                 end
             end
 
@@ -162,8 +182,9 @@ describe Arachni::Element::JSON do
                 end
 
                 it 'returns the input data at that path' do
-                    subject[['nested', 'nested-name', 'deep-nested', 2]].should ==
+                    expect(subject[['nested', 'nested-name', 'deep-nested', 2]]).to eq(
                         inputs['nested']['nested-name']['deep-nested'][2]
+                    )
                 end
             end
         end
@@ -187,7 +208,7 @@ describe Arachni::Element::JSON do
                 it 'sets the input data at that path' do
                     subject[['nested', 'nested-name', 'deep-nested']] = 'foo'
 
-                    subject.inputs.should == {
+                    expect(subject.inputs).to eq({
                         'stuff' => 'blah',
                         'nested' => {
                             'nested-name'  => {
@@ -195,7 +216,7 @@ describe Arachni::Element::JSON do
                             },
                             'nested-name2' => true
                         }
-                    }
+                    })
                 end
             end
 
@@ -219,7 +240,7 @@ describe Arachni::Element::JSON do
                 it 'returns the input data at that path' do
                     subject[['nested', 'nested-name', 'deep-nested', 1]] = 'foo'
 
-                    subject.inputs.should ==
+                    expect(subject.inputs).to eq(
                         {
                             'stuff' => 'blah',
                             'nested' => {
@@ -233,6 +254,7 @@ describe Arachni::Element::JSON do
                                 'nested-name2' => true
                             }
                         }
+                    )
                 end
             end
         end
@@ -274,7 +296,7 @@ describe Arachni::Element::JSON do
                 }
             })
 
-            subject.inputs.should == {
+            expect(subject.inputs).to eq({
                 'stuff' => 'new stuff',
                 'nested' => {
                     'nested-name'  => {
@@ -291,7 +313,7 @@ describe Arachni::Element::JSON do
                     },
                     'nested-name2' => true
                 }
-            }
+            })
         end
     end
 
@@ -316,11 +338,11 @@ describe Arachni::Element::JSON do
                     )
 
                     mutations.each do |m|
-                        m[m.affected_input_name].should == 'seed'
-                        m.affected_input_value.should == 'seed'
+                        expect(m[m.affected_input_name]).to eq('seed')
+                        expect(m.affected_input_value).to eq('seed')
                     end
 
-                    mutations.map { |m| Hash[m.affected_input_name, m.inputs]}.should == [
+                    expect(mutations.map { |m| Hash[m.affected_input_name, m.inputs]}).to eq([
                         {
                             'stuff' => {
                                 'stuff'  => 'seed',
@@ -354,7 +376,7 @@ describe Arachni::Element::JSON do
                                 }
                             }
                         }
-                    ]
+                    ])
                 end
             end
 
@@ -381,11 +403,11 @@ describe Arachni::Element::JSON do
                     )
 
                     mutations.each do |m|
-                        m[m.affected_input_name].should == 'seed'
-                        m.affected_input_value.should == 'seed'
+                        expect(m[m.affected_input_name]).to eq('seed')
+                        expect(m.affected_input_value).to eq('seed')
                     end
 
-                    mutations.map { |m| Hash[m.affected_input_name, m.inputs]}.should == [
+                    expect(mutations.map { |m| Hash[m.affected_input_name, m.inputs]}).to eq([
                         {
                             'stuff' => {
                                 'stuff'  => 'seed',
@@ -461,7 +483,7 @@ describe Arachni::Element::JSON do
                                 }
                             }
                         }
-                    ]
+                    ])
                 end
             end
         end
@@ -469,41 +491,41 @@ describe Arachni::Element::JSON do
 
     describe '#simple' do
         it 'returns a simple Hash representation' do
-            subject.simple.should == { subject.action => subject.inputs }
+            expect(subject.simple).to eq({ subject.action => subject.inputs })
         end
     end
 
     describe '#valid_input_data?' do
         it 'returns true' do
-            subject.valid_input_data?( 'stuff' ).should be_true
+            expect(subject.valid_input_data?( 'stuff' )).to be_truthy
         end
     end
 
     describe '.encode' do
         it 'returns the string as is' do
-            described_class.encode( 'stuff' ).should == 'stuff'
+            expect(described_class.encode( 'stuff' )).to eq('stuff')
         end
     end
     describe '#encode' do
         it 'returns the string as is' do
-            subject.encode( 'stuff' ).should == 'stuff'
+            expect(subject.encode( 'stuff' )).to eq('stuff')
         end
     end
 
     describe '.decode' do
         it 'returns the string as is' do
-            described_class.decode( 'stuff' ).should == 'stuff'
+            expect(described_class.decode( 'stuff' )).to eq('stuff')
         end
     end
     describe '#decode' do
         it 'returns the string as is' do
-            subject.decode( 'stuff' ).should == 'stuff'
+            expect(subject.decode( 'stuff' )).to eq('stuff')
         end
     end
 
     describe '#type' do
         it 'is "json"' do
-            subject.type.should == :json
+            expect(subject.type).to eq(:json)
         end
     end