Merge pull request #17 from dobbymoodge/ruby187_specfix

Fix ruby 1.8.7 quirks
voxpupuli · Sep 22, 2015 · 408dad6 · 408dad6
2 parents 87949b5 + fd44d95
commit 408dad6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/puppet/type/acl.rb b/lib/puppet/type/acl.rb
@@ -218,7 +218,7 @@ def self.pick_default_perms(perms)
     }
     Set.new((non_default + default).map { |perm|
       key = perm.split(':')[0..1].join(':')
-      matching_default = default.reject { |perm| perm !~ /^#{key}:/ }
+      matching_default = default.reject { |tmp_perm| tmp_perm !~ /^#{key}:/ }
       if (matching_default.length > 0)
         matching_default
       else

diff --git a/spec/unit/puppet/type/acl_spec.rb b/spec/unit/puppet/type/acl_spec.rb
@@ -134,10 +134,10 @@
     advanced_perms = ['user:foo:rwx', 'group:foo:rwx', 'default:user:foo:---']
     advanced_perms_results = ['user:foo:---', 'group:foo:rwx']
     it 'should not do anything with no defaults' do
-      expect(acl_type.pick_default_perms(basic_perms)).to eq(basic_perms)
+      expect(acl_type.pick_default_perms(basic_perms)).to match_array(basic_perms)
     end
     it 'should override defaults' do
-      expect(acl_type.pick_default_perms(advanced_perms)).to eq(advanced_perms_results)
+      expect(acl_type.pick_default_perms(advanced_perms)).to match_array(advanced_perms_results)
     end
   end