summaryrefslogtreecommitdiff
path: root/spec/functional/file_content_management/deploy_strategies_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/functional/file_content_management/deploy_strategies_spec.rb')
-rw-r--r--spec/functional/file_content_management/deploy_strategies_spec.rb15
1 files changed, 1 insertions, 14 deletions
diff --git a/spec/functional/file_content_management/deploy_strategies_spec.rb b/spec/functional/file_content_management/deploy_strategies_spec.rb
index d3fc6bcd37..6b9d76d0d4 100644
--- a/spec/functional/file_content_management/deploy_strategies_spec.rb
+++ b/spec/functional/file_content_management/deploy_strategies_spec.rb
@@ -19,7 +19,6 @@
require "spec_helper"
shared_examples_for "a content deploy strategy" do
-
def normalize_mode(mode_int)
( mode_int & 07777).to_s(8)
end
@@ -38,9 +37,7 @@ shared_examples_for "a content deploy strategy" do
let(:content_deployer) { described_class.new }
let(:target_file_path) { File.join(sandbox_dir, "cp-deploy-strategy-target-file.txt") }
-
describe "creating the file" do
-
##
# UNIX Context
let(:default_mode) { normalize_mode(0666 & ~File.umask) }
@@ -69,7 +66,7 @@ shared_examples_for "a content deploy strategy" do
def ace_inherits?(ace)
flags = ace.flags
- (flags & masks::OBJECT_INHERIT_ACE) !=0
+ (flags & masks::OBJECT_INHERIT_ACE) != 0
end
let(:parent_inheritable_aces) do
@@ -103,7 +100,6 @@ shared_examples_for "a content deploy strategy" do
end
describe "updating the file" do
-
let(:staging_dir) { Dir.mktmpdir }
let(:staging_file_content) { "this is the expected content" }
@@ -155,7 +151,6 @@ shared_examples_for "a content deploy strategy" do
end
context "when the owner of the target file is not the owner of the staging file", :requires_root do
-
before do
File.chown(1337, 1337, target_file_path)
end
@@ -167,14 +162,11 @@ shared_examples_for "a content deploy strategy" do
expect(unix_invariant_properies(original_info)).to eq(unix_invariant_properies(updated_info))
end
-
end
-
end
end
describe Chef::FileContentManagement::Deploy::Cp do
-
let(:unix_invariants) do
[
:uid,
@@ -193,11 +185,9 @@ describe Chef::FileContentManagement::Deploy::Cp do
end
it_should_behave_like "a content deploy strategy"
-
end
describe Chef::FileContentManagement::Deploy::MvUnix, :unix_only do
-
let(:unix_invariants) do
[
:uid,
@@ -213,9 +203,7 @@ end
class Chef::FileContentManagement::Deploy::MvWindows ; end
describe Chef::FileContentManagement::Deploy::MvWindows, :windows_only do
-
context "when a file has no sacl" do
-
let(:security_descriptor_invariants) do
[
:owner,
@@ -226,5 +214,4 @@ describe Chef::FileContentManagement::Deploy::MvWindows, :windows_only do
it_should_behave_like "a content deploy strategy"
end
-
end