rubyntlm 0.4.0 → 0.5.0

data/spec/lib/net/ntlm/security_buffer_spec.rb

@@ -24,26 +24,26 @@ describe Net::NTLM::SecurityBuffer do
       domain_security_buffer.value = 'DOMAIN1'
     end
     it 'should change the value' do
-      domain_security_buffer.value.should == 'DOMAIN1'
+      expect(domain_security_buffer.value).to eq('DOMAIN1')
     end
 
     it 'should adjust the length field to the size of the new value' do
-      domain_security_buffer.length.should == 7
+      expect(domain_security_buffer.length).to eq(7)
     end
 
     it 'should adjust the allocated field to the size of the new value' do
-      domain_security_buffer.allocated.should == 7
+      expect(domain_security_buffer.allocated).to eq(7)
     end
   end
 
   context '#data_size' do
     it 'should return the size of the value if active' do
-      domain_security_buffer.data_size.should == 11
+      expect(domain_security_buffer.data_size).to eq(11)
     end
 
     it 'should return 0 if inactive' do
       domain_security_buffer.active = false
-      domain_security_buffer.data_size.should == 0
+      expect(domain_security_buffer.data_size).to eq(0)
     end
   end
 
@@ -56,9 +56,9 @@ describe Net::NTLM::SecurityBuffer do
       # The offset that the actual value begins at is also 8
       offset = "\x08\x00\x00\x00"
       string_to_parse = "#{length}#{allocated}#{offset}FooBarBaz"
-      domain_security_buffer.parse(string_to_parse).should == 8
-      domain_security_buffer.value.should == 'FooBarBa'
+      expect(domain_security_buffer.parse(string_to_parse)).to eq(8)
+      expect(domain_security_buffer.value).to eq('FooBarBa')
     end
 
   end
-end
+end

data/spec/lib/net/ntlm/string_spec.rb

@@ -22,51 +22,51 @@ describe Net::NTLM::String do
 
   context '#serialize' do
     it 'should return the value when active' do
-      active.serialize.should == 'Test'
+      expect(active.serialize).to eq('Test')
     end
 
     it 'should return an empty string when inactive' do
-      inactive.serialize.should == ''
+      expect(inactive.serialize).to eq('')
     end
 
     it 'should coerce non-string values into strings' do
       active.value = 15
-      active.serialize.should == '15'
+      expect(active.serialize).to eq('15')
     end
 
     it 'should return empty string on a nil' do
       active.value = nil
-      active.serialize.should == ''
+      expect(active.serialize).to eq('')
     end
   end
 
   context '#value=' do
     it 'should set active to false if it empty' do
       active.value = ''
-      active.active.should == false
+      expect(active.active).to eq(false)
     end
 
     it 'should adjust the size based on the value set' do
-      active.size.should == 4
+      expect(active.size).to eq(4)
       active.value = 'Foobar'
-      active.size.should == 6
+      expect(active.size).to eq(6)
     end
   end
 
   context '#parse' do
     it 'should read in a string of the proper size' do
-      active.parse('tseT').should == 4
-      active.value.should == 'tseT'
+      expect(active.parse('tseT')).to eq(4)
+      expect(active.value).to eq('tseT')
     end
 
     it 'should not read in a string that is too small' do
-      active.parse('B').should == 0
-      active.value.should == 'Test'
+      expect(active.parse('B')).to eq(0)
+      expect(active.value).to eq('Test')
     end
 
     it 'should be able to read from an offset and only for the given size' do
-      active.parse('FooBarBaz',3).should == 4
-      active.value.should == 'BarB'
+      expect(active.parse('FooBarBaz',3)).to eq(4)
+      expect(active.value).to eq('BarB')
     end
   end
-end
+end

data/spec/lib/net/ntlm/version_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/../../../../lib/net/ntlm/version")
 
 describe Net::NTLM::VERSION do
 
   it 'should contain an integer value for Major Version' do
-    Net::NTLM::VERSION::MAJOR.should be_an Integer
+    expect(Net::NTLM::VERSION::MAJOR).to be_an Integer
   end
 
   it 'should contain an integer value for Minor Version' do
-    Net::NTLM::VERSION::MINOR.should be_an Integer
+    expect(Net::NTLM::VERSION::MINOR).to be_an Integer
   end
 
   it 'should contain an integer value for Patch Version' do
-    Net::NTLM::VERSION::TINY.should be_an Integer
+    expect(Net::NTLM::VERSION::TINY).to be_an Integer
   end
 
   it 'should contain an aggregate version string' do
@@ -20,7 +21,7 @@ describe Net::NTLM::VERSION do
         Net::NTLM::VERSION::MINOR,
         Net::NTLM::VERSION::TINY
     ].join('.')
-    Net::NTLM::VERSION::STRING.should be_a String
-    Net::NTLM::VERSION::STRING.should == string
+    expect(Net::NTLM::VERSION::STRING).to be_a String
+    expect(Net::NTLM::VERSION::STRING).to eq(string)
   end
-end
+end

data/spec/lib/net/ntlm_spec.rb

@@ -1,11 +1,9 @@
-
-require 'rspec'
-require 'net/ntlm'
+require "spec_helper"
 
 describe Net::NTLM do
   let(:passwd) {"SecREt01"}
   let(:user) {"user"}
-  let(:domain) {"domain"}
+  let(:domain) {"DOMAIN"}
   let(:challenge) {["0123456789abcdef"].pack("H*")}
   let(:client_ch) {["ffffff0011223344"].pack("H*")}
   let(:timestamp) {1055844000}
@@ -22,68 +20,68 @@ describe Net::NTLM do
   let(:keys) { Net::NTLM.gen_keys(padded_pwd)}
 
   it 'should convert a value to 64-bit LE Integer' do
-    Net::NTLM.pack_int64le(42).should == "\x2A\x00\x00\x00\x00\x00\x00\x00"
+    expect(Net::NTLM.pack_int64le(42)).to eq("\x2A\x00\x00\x00\x00\x00\x00\x00")
   end
 
   it 'should split a string into an array of slices, 7 chars or less' do
-    Net::NTLM.split7("HelloWorld!").should == [ 'HelloWo', 'rld!']
+    expect(Net::NTLM.split7("HelloWorld!")).to eq([ 'HelloWo', 'rld!'])
   end
 
   it 'should generate DES keys from the supplied string' do
     first_key = ["52a2516b252a5161"].pack('H*')
     second_key = ["3180010101010101"].pack('H*')
-    Net::NTLM.gen_keys(padded_pwd).should == [first_key, second_key]
+    expect(Net::NTLM.gen_keys(padded_pwd)).to eq([first_key, second_key])
   end
 
   it 'should encrypt the string with DES for each key supplied' do
     first_crypt = ["ff3750bcc2b22412"].pack('H*')
     second_crypt = ["c2265b23734e0dac"].pack('H*')
-    Net::NTLM::apply_des(Net::NTLM::LM_MAGIC, keys).should == [first_crypt, second_crypt]
+    expect(Net::NTLM::apply_des(Net::NTLM::LM_MAGIC, keys)).to eq([first_crypt, second_crypt])
   end
 
   it 'should generate an lm_hash' do
-    Net::NTLM::lm_hash(passwd).should == ["ff3750bcc2b22412c2265b23734e0dac"].pack("H*")
+    expect(Net::NTLM::lm_hash(passwd)).to eq(["ff3750bcc2b22412c2265b23734e0dac"].pack("H*"))
   end
 
   it 'should generate an ntlm_hash' do
-    Net::NTLM::ntlm_hash(passwd).should == ["cd06ca7c7e10c99b1d33b7485a2ed808"].pack("H*")
+    expect(Net::NTLM::ntlm_hash(passwd)).to eq(["cd06ca7c7e10c99b1d33b7485a2ed808"].pack("H*"))
   end
 
   it 'should generate an ntlmv2_hash' do
-    Net::NTLM::ntlmv2_hash(user, passwd, domain).should == ["04b8e0ba74289cc540826bab1dee63ae"].pack("H*")
+    expect(Net::NTLM::ntlmv2_hash(user, passwd, domain)).to eq(["04b8e0ba74289cc540826bab1dee63ae"].pack("H*"))
   end
 
   it 'should generate an lm_response' do
-    Net::NTLM::lm_response(
+    expect(Net::NTLM::lm_response(
         {
             :lm_hash => Net::NTLM::lm_hash(passwd),
             :challenge => challenge
         }
-    ).should == ["c337cd5cbd44fc9782a667af6d427c6de67c20c2d3e77c56"].pack("H*")
+    )).to eq(["c337cd5cbd44fc9782a667af6d427c6de67c20c2d3e77c56"].pack("H*"))
   end
 
   it 'should generate an ntlm_response' do
     ntlm_hash = Net::NTLM::ntlm_hash(passwd)
-    Net::NTLM::ntlm_response(
+    expect(Net::NTLM::ntlm_response(
         {
             :ntlm_hash => ntlm_hash,
             :challenge => challenge
         }
-    ).should == ["25a98c1c31e81847466b29b2df4680f39958fb8c213a9cc6"].pack("H*")
+    )).to eq(["25a98c1c31e81847466b29b2df4680f39958fb8c213a9cc6"].pack("H*"))
   end
 
   it 'should generate a lvm2_response' do
-    Net::NTLM::lmv2_response(
+    expect(Net::NTLM::lmv2_response(
         {
             :ntlmv2_hash => Net::NTLM::ntlmv2_hash(user, passwd, domain),
             :challenge => challenge
         },
         { :client_challenge => client_ch }
-    ).should == ["d6e6152ea25d03b7c6ba6629c2d6aaf0ffffff0011223344"].pack("H*")
+    )).to eq(["d6e6152ea25d03b7c6ba6629c2d6aaf0ffffff0011223344"].pack("H*"))
   end
 
   it 'should generate a ntlmv2_response' do
-    Net::NTLM::ntlmv2_response(
+    expect(Net::NTLM::ntlmv2_response(
         {
             :ntlmv2_hash => Net::NTLM::ntlmv2_hash(user, passwd, domain),
             :challenge => challenge,
@@ -93,7 +91,7 @@ describe Net::NTLM do
             :timestamp => timestamp,
             :client_challenge => client_ch
         }
-    ).should == [
+    )).to eq([
         "cbabbca713eb795d04c97abc01ee4983" +
         "01010000000000000090d336b734c301" +
         "ffffff00112233440000000002000c00" +
@@ -104,7 +102,7 @@ describe Net::NTLM do
         "650072002e0064006f006d0061006900" +
         "6e002e0063006f006d00000000000000" +
         "0000"
-    ].pack("H*")
+    ].pack("H*"))
   end
 
   it 'should generate a ntlm2_session' do
@@ -115,7 +113,7 @@ describe Net::NTLM do
         },
         { :client_challenge => client_ch }
     )
-    session[0].should == ["ffffff001122334400000000000000000000000000000000"].pack("H*")
-    session[1].should == ["10d550832d12b2ccb79d5ad1f4eed3df82aca4c3681dd455"].pack("H*")
+    expect(session[0]).to eq(["ffffff001122334400000000000000000000000000000000"].pack("H*"))
+    expect(session[1]).to eq(["10d550832d12b2ccb79d5ad1f4eed3df82aca4c3681dd455"].pack("H*"))
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ SimpleCov.start do
   add_filter '/vendor/'
 end if ENV["COVERAGE"]
 
-
 require 'rspec'
 require 'net/ntlm'
 
@@ -18,4 +17,4 @@ support_glob = root_pathname.join('spec', 'support', '**', '*.rb')
 
 Dir.glob(support_glob) do |path|
   require path
-end
+end

data/spec/support/shared/examples/net/ntlm/field_shared.rb

@@ -15,11 +15,11 @@ shared_examples_for 'a field' do  | value, active|
 
 
   it 'should set the value from initialize options' do
-    subject.value.should == value
+    expect(subject.value).to eq(value)
   end
 
   it 'should set active from initialize options' do
-    subject.active.should == active
+    expect(subject.active).to eq(active)
   end
 
-end
+end

data/spec/support/shared/examples/net/ntlm/fieldset_shared.rb

@@ -21,19 +21,19 @@ shared_examples_for 'a fieldset' do |fields|
       end
 
       it 'should set the prototypes correctly' do
-        fieldset_class.prototypes.should include([:test_string, Net::NTLM::String, {:value=>"Test"}])
+        expect(fieldset_class.prototypes).to include([:test_string, Net::NTLM::String, {:value=>"Test"}])
       end
 
       it 'should set the names correctly' do
-        fieldset_class.names.should include(:test_string)
+        expect(fieldset_class.names).to include(:test_string)
       end
 
       it 'should set the types correctly' do
-        fieldset_class.types.should include(Net::NTLM::String)
+        expect(fieldset_class.types).to include(Net::NTLM::String)
       end
 
       it 'should set the opts correctly' do
-        fieldset_class.opts.should include({:value => 'Test'})
+        expect(fieldset_class.opts).to include({:value => 'Test'})
       end
 
       context 'when creating an instance' do
@@ -42,11 +42,11 @@ shared_examples_for 'a fieldset' do |fields|
         end
 
         it 'should have the new accessor' do
-          fieldset_object.should respond_to :test_string
+          expect(fieldset_object).to respond_to(:test_string)
         end
 
         it 'should have the correct default value' do
-          fieldset_object.test_string.should == 'Test'
+          expect(fieldset_object.test_string).to eq('Test')
         end
       end
     end
@@ -57,19 +57,19 @@ shared_examples_for 'a fieldset' do |fields|
       end
 
       it 'should set the prototypes correctly' do
-        fieldset_class.prototypes.should include([:test_int, Net::NTLM::Int16LE, {:value=>15}])
+        expect(fieldset_class.prototypes).to include([:test_int, Net::NTLM::Int16LE, {:value=>15}])
       end
 
       it 'should set the names correctly' do
-        fieldset_class.names.should include(:test_int)
+        expect(fieldset_class.names).to include(:test_int)
       end
 
       it 'should set the types correctly' do
-        fieldset_class.types.should include(Net::NTLM::Int16LE)
+        expect(fieldset_class.types).to include(Net::NTLM::Int16LE)
       end
 
       it 'should set the opts correctly' do
-        fieldset_class.opts.should include({:value => 15})
+        expect(fieldset_class.opts).to include({:value => 15})
       end
 
       context 'when creating an instance' do
@@ -78,11 +78,11 @@ shared_examples_for 'a fieldset' do |fields|
         end
 
         it 'should have the new accessor' do
-          fieldset_object.should respond_to :test_int
+          expect(fieldset_object).to respond_to(:test_int)
         end
 
         it 'should have the correct default value' do
-          fieldset_object.test_int.should == 15
+          expect(fieldset_object.test_int).to eq(15)
         end
       end
     end
@@ -93,19 +93,19 @@ shared_examples_for 'a fieldset' do |fields|
       end
 
       it 'should set the prototypes correctly' do
-        fieldset_class.prototypes.should include([:test_int, Net::NTLM::Int32LE, {:value=>15}])
+        expect(fieldset_class.prototypes).to include([:test_int, Net::NTLM::Int32LE, {:value=>15}])
       end
 
       it 'should set the names correctly' do
-        fieldset_class.names.should include(:test_int)
+        expect(fieldset_class.names).to include(:test_int)
       end
 
       it 'should set the types correctly' do
-        fieldset_class.types.should include(Net::NTLM::Int32LE)
+        expect(fieldset_class.types).to include(Net::NTLM::Int32LE)
       end
 
       it 'should set the opts correctly' do
-        fieldset_class.opts.should include({:value => 15})
+        expect(fieldset_class.opts).to include({:value => 15})
       end
 
       context 'when creating an instance' do
@@ -114,11 +114,11 @@ shared_examples_for 'a fieldset' do |fields|
         end
 
         it 'should have the new accessor' do
-          fieldset_object.should respond_to :test_int
+          expect(fieldset_object).to respond_to(:test_int)
         end
 
         it 'should have the correct default value' do
-          fieldset_object.test_int.should == 15
+          expect(fieldset_object.test_int).to eq(15)
         end
       end
     end
@@ -129,19 +129,19 @@ shared_examples_for 'a fieldset' do |fields|
       end
 
       it 'should set the prototypes correctly' do
-        fieldset_class.prototypes.should include([:test_int, Net::NTLM::Int64LE, {:value=>15}])
+        expect(fieldset_class.prototypes).to include([:test_int, Net::NTLM::Int64LE, {:value=>15}])
       end
 
       it 'should set the names correctly' do
-        fieldset_class.names.should include(:test_int)
+        expect(fieldset_class.names).to include(:test_int)
       end
 
       it 'should set the types correctly' do
-        fieldset_class.types.should include(Net::NTLM::Int64LE)
+        expect(fieldset_class.types).to include(Net::NTLM::Int64LE)
       end
 
       it 'should set the opts correctly' do
-        fieldset_class.opts.should include({:value => 15})
+        expect(fieldset_class.opts).to include({:value => 15})
       end
 
       context 'when creating an instance' do
@@ -150,11 +150,11 @@ shared_examples_for 'a fieldset' do |fields|
         end
 
         it 'should have the new accessor' do
-          fieldset_object.should respond_to :test_int
+          expect(fieldset_object).to respond_to(:test_int)
         end
 
         it 'should have the correct default value' do
-          fieldset_object.test_int.should == 15
+          expect(fieldset_object.test_int).to eq(15)
         end
       end
     end
@@ -165,19 +165,19 @@ shared_examples_for 'a fieldset' do |fields|
       end
 
       it 'should set the prototypes correctly' do
-        fieldset_class.prototypes.should include([:test_buffer, Net::NTLM::SecurityBuffer, {:value=>15}])
+        expect(fieldset_class.prototypes).to include([:test_buffer, Net::NTLM::SecurityBuffer, {:value=>15}])
       end
 
       it 'should set the names correctly' do
-        fieldset_class.names.should include(:test_buffer)
+        expect(fieldset_class.names).to include(:test_buffer)
       end
 
       it 'should set the types correctly' do
-        fieldset_class.types.should include(Net::NTLM::SecurityBuffer)
+        expect(fieldset_class.types).to include(Net::NTLM::SecurityBuffer)
       end
 
       it 'should set the opts correctly' do
-        fieldset_class.opts.should include({:value => 15})
+        expect(fieldset_class.opts).to include({:value => 15})
       end
 
       context 'when creating an instance' do
@@ -186,11 +186,11 @@ shared_examples_for 'a fieldset' do |fields|
         end
 
         it 'should have the new accessor' do
-          fieldset_object.should respond_to :test_buffer
+          expect(fieldset_object).to respond_to :test_buffer
         end
 
         it 'should have the correct default value' do
-          fieldset_object.test_buffer.should == 15
+          expect(fieldset_object.test_buffer).to eq(15)
         end
       end
     end
@@ -221,19 +221,19 @@ shared_examples_for 'a fieldset' do |fields|
 
         context "#{field[:name]}" do
           it "should be a #{field[:class].to_s}" do
-            fieldset_object[field[:name]].class.should == field[:class]
+            expect(fieldset_object[field[:name]].class).to eq(field[:class])
           end
 
           it "should have a default value of #{field[:value]}" do
-            fieldset_object[field[:name]].value.should == field[:value]
+            expect(fieldset_object[field[:name]].value).to eq(field[:value])
           end
 
           it "should have active set to #{field[:active]}" do
-            fieldset_object[field[:name]].active.should == field[:active]
+            expect(fieldset_object[field[:name]].active).to eq(field[:active])
           end
         end
       end
     end
 
   end
-end
+end