summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-08-09 13:38:37 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-08-16 18:41:25 -0700
commit86b7ae916e37a17e9f764bcc6699b7cd38e6d732 (patch)
treea0f939fa5a7bb598723a4543c2acc5a6654a01b9
parent392814db246c40549504d935bed94ad5d6442bfa (diff)
downloadchef-86b7ae916e37a17e9f764bcc6699b7cd38e6d732.tar.gz
fixing Lint/Void cop
-rw-r--r--spec/support/shared/functional/securable_resource.rb4
-rw-r--r--spec/unit/chef_fs/parallelizer.rb8
-rw-r--r--spec/unit/mixin/deprecation_spec.rb2
-rw-r--r--spec/unit/provider/package/yum_spec.rb12
4 files changed, 13 insertions, 13 deletions
diff --git a/spec/support/shared/functional/securable_resource.rb b/spec/support/shared/functional/securable_resource.rb
index 506b96736c..17b78dda9d 100644
--- a/spec/support/shared/functional/securable_resource.rb
+++ b/spec/support/shared/functional/securable_resource.rb
@@ -138,8 +138,8 @@ shared_context "use Windows permissions", :windows_only do
RSpec::Matchers.define :have_expected_properties do |mask, type, flags|
match do |ace|
- ace.mask == mask
- ace.type == type
+ ace.mask == mask &&
+ ace.type == type &&
ace.flags == flags
end
end
diff --git a/spec/unit/chef_fs/parallelizer.rb b/spec/unit/chef_fs/parallelizer.rb
index 818837fb4a..84637f7283 100644
--- a/spec/unit/chef_fs/parallelizer.rb
+++ b/spec/unit/chef_fs/parallelizer.rb
@@ -35,9 +35,9 @@ describe Chef::ChefFS::Parallelizer do
context "With :ordered => false (unordered output)" do
it "An empty input produces an empty output" do
- parallelize([], :ordered => false) do
+ expect(parallelize([], :ordered => false) do
sleep 10
- end.to_a == []
+ end.to_a).to eql([])
expect(elapsed_time).to be < 0.1
end
@@ -107,9 +107,9 @@ describe Chef::ChefFS::Parallelizer do
context "With :ordered => true (ordered output)" do
it "An empty input produces an empty output" do
- parallelize([]) do
+ expect(parallelize([]) do
sleep 10
- end.to_a == []
+ end.to_a).to eql([])
expect(elapsed_time).to be < 0.1
end
diff --git a/spec/unit/mixin/deprecation_spec.rb b/spec/unit/mixin/deprecation_spec.rb
index 8f22b09295..8707c6476e 100644
--- a/spec/unit/mixin/deprecation_spec.rb
+++ b/spec/unit/mixin/deprecation_spec.rb
@@ -36,7 +36,7 @@ describe Chef::Mixin do
end
it "warns when accessing the deprecated constant" do
- Chef::Mixin::DeprecatedClass
+ Chef::Mixin::DeprecatedClass # rubocop:disable Lint/Void
expect(@log_io.string).to include("This is a test deprecation")
end
end
diff --git a/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb
index ab726134e9..4bc28f130a 100644
--- a/spec/unit/provider/package/yum_spec.rb
+++ b/spec/unit/provider/package/yum_spec.rb
@@ -1229,9 +1229,9 @@ describe Chef::Provider::Package::Yum::RPMPackage do
it "should always have at least one provide, itself" do
expect(@rpm.provides.size).to eq(1)
- @rpm.provides[0].name == "testing"
- @rpm.provides[0].version.evr == "1:1.6.5-9.36.el5"
- @rpm.provides[0].flag == :==
+ expect(@rpm.provides[0].name).to eql("testing")
+ expect(@rpm.provides[0].version.evr).to eql("1:1.6.5-9.36.el5")
+ expect(@rpm.provides[0].flag).to eql(:==)
end
end
@@ -1253,9 +1253,9 @@ describe Chef::Provider::Package::Yum::RPMPackage do
it "should always have at least one provide, itself" do
expect(@rpm.provides.size).to eq(1)
- @rpm.provides[0].name == "testing"
- @rpm.provides[0].version.evr == "1:1.6.5-9.36.el5"
- @rpm.provides[0].flag == :==
+ expect(@rpm.provides[0].name).to eql("testing")
+ expect(@rpm.provides[0].version.evr).to eql("1:1.6.5-9.36.el5")
+ expect(@rpm.provides[0].flag).to eql(:==)
end
end