cisco_acl_intp 0.0.3 → 0.0.4

data/spec/cisco_acl_intp/{ace_tcp_flags_spec.rb → acespec_tcp_flags_spec.rb}

@@ -10,15 +10,15 @@ describe AceTcpFlag do
     end
 
     it 'should be make tcp flags' do
-      @flag.to_s.should be_aclstr('established')
+      expect(@flag.to_s).to be_aclstr('established')
     end
 
     it 'should be true when same flag' do
-      (@flag == @flag1).should be_true
+      expect(@flag == @flag1).to be_truthy
     end
 
     it 'should not false when different flag' do
-      (@flag == @flag2).should be_false
+      expect(@flag == @flag2).to be_falsey
     end
   end
 end
@@ -33,17 +33,17 @@ describe AceTcpFlagList do
     end
 
     it 'should be size 0 when empty list' do
-      @list.size.should be_zero
+      expect(@list.size).to be_zero
     end
 
     it 'should count-up size when added AceTcpFlag objects' do
       @list.push @f1
-      @list.size.should eq 1
+      expect(@list.size).to eq 1
       @list.push @f2
-      @list.size.should eq 2
+      expect(@list.size).to eq 2
       @list.push @f3
-      @list.size.should eq 3
-      @list.to_s.should be_aclstr('syn ack established')
+      expect(@list.size).to eq 3
+      expect(@list.to_s).to be_aclstr('syn ack established')
     end
   end
 
@@ -60,11 +60,11 @@ describe AceTcpFlagList do
     end
 
     it 'should be true when same list' do
-      (@list1 == @list2).should be_true
+      expect(@list1 == @list2).to be_truthy
     end
 
     it 'should be false when different list' do
-      (@list1 == @list3).should be_false
+      expect(@list1 == @list3).to be_falsey
     end
   end
 end

data/spec/cisco_acl_intp/acl_base_spec.rb

@@ -6,7 +6,7 @@ describe 'AclContainerBase' do
   describe '#generate_tagged_str' do
     before do
       # test mock
-      class TestAclContainer < AclContainerBase
+      class TestAclContainer < AccessControlContainer
         def initialize(str)
           @str = str
         end
@@ -23,32 +23,34 @@ describe 'AclContainerBase' do
     end
 
     it 'shoud be cleaning whitespace' do
-      @mock.to_s_with_cleaning.should eq 'foo bar baz'
+      expect(@mock.to_s_with_cleaning).to eq 'foo bar baz'
     end
 
     it 'should be same as raw string' do
-      AclContainerBase.color_mode = :none
-      @mock.to_s_with_tag(:port).should eq 'teststr'
+      AccessControlContainer.color_mode = :none
+      expect(@mock.to_s_with_tag(:port)).to eq 'teststr'
     end
 
     it 'should be colored string when mode html' do
-      AclContainerBase.color_mode = :html
+      AccessControlContainer.color_mode = :html
       tag = :header
       matchstr = "span.*acltag_#{tag}.*teststr.*span"
-      @mock.to_s_with_tag(tag).should match(/#{matchstr}/)
-      AclContainerBase.color_mode = :none
+      expect(@mock.to_s_with_tag(tag)).to match(/#{matchstr}/)
+      AccessControlContainer.color_mode = :none
     end
 
     it 'should be colored string when mode term' do
-      AclContainerBase.color_mode = :term
-      @mock.to_s_with_tag(:error).should match(/\e\[0?\d+m.*teststr.*\e\[0?m/)
-      AclContainerBase.color_mode = :none
+      AccessControlContainer.color_mode = :term
+      expect(@mock.to_s_with_tag(:error)).to match(
+        /\e\[0?\d+m.*teststr.*\e\[0?m/
+      )
+      AccessControlContainer.color_mode = :none
     end
 
     it 'should be raised NoMethodError when unknown tag' do
-      lambda do
+      expect do
         @cntr.to_s_with_tag(:hoge)
-      end.should raise_error(NoMethodError)
+      end.to raise_error(NoMethodError)
     end
   end
 end

data/spec/cisco_acl_intp/{extended_acl_spec.rb → acl_extended_spec.rb}

@@ -8,9 +8,9 @@ describe NamedExtAcl do
     end
 
     it 'should be zero when initialized' do
-      @acl.size.should be_zero
-      @acl.named_acl?.should be_true
-      @acl.numbered_acl?.should be_false
+      expect(@acl.size).to be_zero
+      expect(@acl.named_acl?).to be_truthy
+      expect(@acl.numbered_acl?).to be_falsey
     end
 
     it 'should be size 1 and matches aclstr when added a acl entry' do
@@ -27,12 +27,12 @@ describe NamedExtAcl do
         }
       )
       @acl.add_entry ea
-      @acl.size.should eq 1
+      expect(@acl.size).to eq 1
       aclstr = <<'EOL'
 ip access-list extended test-ext-acl
  permit udp 192.168.3.0 0.0.0.127 192.168.4.0 0.0.0.255
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 
@@ -68,7 +68,7 @@ EOL
     end
 
     it 'should be size 2' do
-      @acl.size.should eq 2
+      expect(@acl.size).to eq 2
     end
 
     it 'mutches aclstr' do
@@ -77,7 +77,7 @@ ip access-list extended test-ext-acl2
  permit udp 192.168.3.0 0.0.0.127 192.168.4.0 0.0.0.255
  deny tcp host 192.168.3.3 192.168.4.0 0.0.0.255 gt 32768
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
 
     it 'mutches aclstr with remark' do
@@ -89,9 +89,8 @@ ip access-list extended test-ext-acl2
  deny tcp host 192.168.3.3 192.168.4.0 0.0.0.255 gt 32768
  remark this is remark!!
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
-
   end
 
   describe '#find_aces_contains' do
@@ -129,7 +128,7 @@ EOL
         src_operator: :eq, src_ip: '192.168.10.3', src_port: 64_332,
         dst_operator: :eq, dst_ip: '192.168.4.5',  dst_port: 32_889
       )
-      ace.to_s.should be_aclstr(
+      expect(ace.to_s).to be_aclstr(
         'deny tcp host 192.168.10.3 192.168.4.0 0.0.0.255 gt 32768'
       )
     end
@@ -140,15 +139,16 @@ EOL
         src_operator: :eq, src_ip: '192.168.10.3', src_port: 64_332,
         dst_operator: :eq, dst_ip: '10.0.0.3',     dst_port: 33_890
       )
-      ace.to_s.should be_aclstr('deny ip any 10.0.0.0 0.0.0.255')
+      expect(ace.to_s).to be_aclstr('deny ip any 10.0.0.0 0.0.0.255')
     end
 
     it 'should be nil if not found match entry' do
-      @acl.find_aces_contains(
-        protocol: 'udp',
-        src_operator: :eq, src_ip: '192.168.10.3', src_port: 62_223,
-        dst_operator: :eq, dst_ip: '11.0.0.3', dst_port: 33_333
-      ).should be_nil
+      expect(
+        @acl.find_aces_contains(
+          protocol: 'udp',
+          src_operator: :eq, src_ip: '192.168.10.3', src_port: 62_223,
+          dst_operator: :eq, dst_ip: '11.0.0.3', dst_port: 33_333
+        )).to be_nil
     end
   end
 end
@@ -156,14 +156,14 @@ end
 describe NumberedAcl do
   describe '#initialize' do
     it 'should be error with acl no-integer-acl-number' do
-      lambda do
+      expect do
         @acl = NumberedAcl.new('a70')
-      end.should raise_error(AclArgumentError)
+      end.to raise_error(AclArgumentError)
     end
     it 'should be error with invalid number' do
-      lambda do
+      expect do
         @acl = NumberedAcl.new(33.3)
-      end.should raise_error(AclArgumentError)
+      end.to raise_error(AclArgumentError)
     end
   end
 end
@@ -175,9 +175,9 @@ describe NumberedExtAcl do
     end
 
     it 'should be zero when initialized' do
-      @acl.size.should be_zero
-      @acl.named_acl?.should be_false
-      @acl.numbered_acl?.should be_true
+      expect(@acl.size).to be_zero
+      expect(@acl.named_acl?).to be_falsey
+      expect(@acl.numbered_acl?).to be_truthy
     end
 
     it 'should be size 1 and matches aclstr when added a acl entry' do
@@ -194,11 +194,11 @@ describe NumberedExtAcl do
         }
       )
       @acl.add_entry ea
-      @acl.size.should eq 1
+      expect(@acl.size).to eq 1
       aclstr = <<'EOL'
 access-list 102 permit udp 192.168.3.0 0.0.0.127 192.168.4.0 0.0.0.255
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 
@@ -234,7 +234,7 @@ EOL
     end
 
     it 'should be size 2' do
-      @acl.size.should eq 2
+      expect(@acl.size).to eq 2
     end
 
     it 'mutches aclstr' do
@@ -242,7 +242,7 @@ EOL
 access-list 104 permit udp 192.168.3.0 0.0.0.127 192.168.4.0 0.0.0.255
 access-list 104 deny tcp host 192.168.3.3 192.168.4.0 0.0.0.255 gt 32768
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
 
     it 'mutches aclstr with remark' do
@@ -253,7 +253,7 @@ access-list 104 permit udp 192.168.3.0 0.0.0.127 192.168.4.0 0.0.0.255
 access-list 104 deny tcp host 192.168.3.3 192.168.4.0 0.0.0.255 gt 32768
 access-list 104 remark this is remark!!
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 end

data/spec/cisco_acl_intp/{standard_acl_spec.rb → acl_standard_spec.rb}

@@ -8,7 +8,7 @@ describe NamedStdAcl do
     end
 
     it 'should be zero when initialized' do
-      @acl.size.should be_zero
+      expect(@acl.size).to be_zero
     end
 
     it 'should be size 1 and matches aclstr when added a acl entry' do
@@ -20,12 +20,12 @@ describe NamedStdAcl do
         }
       )
       @acl.add_entry sa
-      @acl.size.should eq 1
+      expect(@acl.size).to eq 1
       aclstr = <<'EOL'
 ip access-list standard test-std-acl
  permit 192.168.3.0 0.0.0.127
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 
@@ -49,7 +49,7 @@ EOL
     end
 
     it 'should be size 2' do
-      @acl.size.should eq 2
+      expect(@acl.size).to eq 2
     end
 
     it 'mutches aclstr' do
@@ -58,7 +58,7 @@ ip access-list standard test-std-acl2
  permit 192.168.3.0 0.0.0.127
  deny 192.168.4.0 0.0.0.255
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
 
     it 'mutches aclstr with remark' do
@@ -70,7 +70,7 @@ ip access-list standard test-std-acl2
  deny 192.168.4.0 0.0.0.255
  remark this is remark!!
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 
@@ -99,7 +99,7 @@ EOL
         protocol: 'tcp',
         src_operator: :eq, src_ip: '192.168.10.3', src_port: 64_332
       )
-      ace.to_s.should be_aclstr('deny host 192.168.10.3')
+      expect(ace.to_s).to be_aclstr('deny host 192.168.10.3')
     end
 
     it 'should be last entry' do
@@ -107,14 +107,15 @@ EOL
         protocol: 'tcp',
         src_operator: :eq, src_ip: '10.0.0.3', src_port: 33_890
       )
-      ace.to_s.should be_aclstr('deny 10.0.0.0 0.0.0.255')
+      expect(ace.to_s).to be_aclstr('deny 10.0.0.0 0.0.0.255')
     end
 
     it 'should be nil if not found match entry' do
-      @acl.find_aces_contains(
-        protocol: 'udp',
-        src_operator: :eq, src_ip: '11.0.0.3', src_port: 33_333
-      ).should be_nil
+      expect(
+        @acl.find_aces_contains(
+          protocol: 'udp',
+          src_operator: :eq, src_ip: '11.0.0.3', src_port: 33_333
+        )).to be_nil
     end
   end
 end
@@ -126,7 +127,7 @@ describe NumberedStdAcl do
     end
 
     it 'should be zero when initialized' do
-      @acl.size.should be_zero
+      expect(@acl.size).to be_zero
     end
 
     it 'should be size 1 and matches aclstr when added a acl entry' do
@@ -138,11 +139,11 @@ describe NumberedStdAcl do
         }
       )
       @acl.add_entry sa
-      @acl.size.should eq 1
+      expect(@acl.size).to eq 1
       aclstr = <<'EOL'
 access-list 10 permit 192.168.3.0 0.0.0.127
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 
@@ -166,7 +167,7 @@ EOL
     end
 
     it 'should be size 2' do
-      @acl.size.should eq 2
+      expect(@acl.size).to eq 2
     end
 
     it 'mutches aclstr' do
@@ -174,7 +175,7 @@ EOL
 access-list 14 permit 192.168.3.0 0.0.0.127
 access-list 14 deny 192.168.4.0 0.0.0.255
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
 
     it 'mutches aclstr with remark' do
@@ -185,7 +186,7 @@ access-list 14 permit 192.168.3.0 0.0.0.127
 access-list 14 deny 192.168.4.0 0.0.0.255
 access-list 14 remark this is remark!!
 EOL
-      @acl.to_s.should be_aclstr(aclstr)
+      expect(@acl.to_s).to be_aclstr(aclstr)
     end
   end
 
@@ -202,7 +203,7 @@ EOL
       it 'should has seq number by add_entry' do
         @acl.renumber
         @acl.reduce(10) do |num, each|
-          each.seq_number.should eq num
+          expect(each.seq_number).to eq num
           num + 10
         end
       end
@@ -229,10 +230,10 @@ access-list 15 remark entry 4
 access-list 15 remark entry 2
 access-list 15 remark entry 3
 EOL
-        @acl.name.should eq acl_new.name
-        @acl.acl_type.should eq acl_new.acl_type
-        @acl.to_s.should be_aclstr(aclstr)
-        acl_new.to_s.should be_aclstr(aclstr_new)
+        expect(@acl.name).to eq acl_new.name
+        expect(@acl.acl_type).to eq acl_new.acl_type
+        expect(@acl.to_s).to be_aclstr(aclstr)
+        expect(acl_new.to_s).to be_aclstr(aclstr_new)
       end
     end
   end

data/spec/cisco_acl_intp/cisco_acl_intp_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe CiscoAclIntp do
   it 'should have a version number' do
-    CiscoAclIntp::VERSION.should_not be_nil
+    expect(CiscoAclIntp::VERSION).not_to be_nil
   end
 end
 

data/spec/cisco_acl_intp/parser_spec.rb

@@ -19,9 +19,9 @@ ip access-list extended FA8-OUT
 !
 EOL
       @parser.parse_string(datastr)
-      @parser.contains_error?.should be_false
+      expect(@parser.contains_error?).to be_falsey
       @parser.parse_string(StringIO.new(datastr))
-      @parser.contains_error?.should be_false
+      expect(@parser.contains_error?).to be_falsey
     end
 
     it 'should not be parsed acl' do
@@ -34,15 +34,15 @@ ip access-list extended FA8-OUT
 !
 EOL
       @parser.parse_string(datastr)
-      @parser.contains_error?.should be_true
+      expect(@parser.contains_error?).to be_truthy
       @parser.parse_string(StringIO.new(datastr))
-      @parser.contains_error?.should be_true
+      expect(@parser.contains_error?).to be_truthy
     end
 
     it 'should be error by NON-IO object' do
       @parser.parse_string(123_456_789)
-      @parser.contains_error?.should be_true
-      @parser.error_list.shift.should match(/acl error/)
+      expect(@parser.contains_error?).to be_truthy
+      expect(@parser.error_list.shift).to match(/acl error/)
     end
   end
 
@@ -60,7 +60,7 @@ ip access-list extended FA8-OUT
 !
 EOL
       @parser.parse_file(StringIO.new(datastr))
-      @parser.contains_error?.should be_false
+      expect(@parser.contains_error?).to be_falsey
     end
 
     it 'should not be parsed acl' do
@@ -73,13 +73,13 @@ ip access-list extended FA8-OUT
 !
 EOL
       @parser.parse_file(StringIO.new(datastr))
-      @parser.contains_error?.should be_true
+      expect(@parser.contains_error?).to be_truthy
     end
 
     it 'should be error by NON-IO object' do
       @parser.parse_file(123_456_789)
-      @parser.contains_error?.should be_true
-      @parser.error_list.shift.should match(/Parse aborted/)
+      expect(@parser.contains_error?).to be_truthy
+      expect(@parser.error_list.shift).to match(/Parse aborted/)
     end
   end
 
@@ -111,12 +111,12 @@ EOL
         if each_test[:correct]
           it "should be parsed #{acl_file} with no error" do
             @parser.parse_file(acl_file)
-            @parser.contains_error?.should be_false
+            expect(@parser.contains_error?).to be_falsey
           end
         else
           it "should be parsed #{acl_file} with error" do
             @parser.parse_file(acl_file)
-            @parser.contains_error?.should be_true
+            expect(@parser.contains_error?).to be_truthy
           end
         end
       end