diff options
author | Vivek Singh <vivek.singh@msystechnologies.com> | 2019-10-04 15:31:56 +0530 |
---|---|---|
committer | Vivek Singh <vivek.singh@msystechnologies.com> | 2019-10-28 14:06:22 +0530 |
commit | 7686384b8fca141673abee311b3d986bdd91dc05 (patch) | |
tree | a4c9136fa6b382cd4c8633993ec7eef8b6914036 | |
parent | 678ad53039b988049340842eb9e6f96413220eed (diff) | |
download | chef-7686384b8fca141673abee311b3d986bdd91dc05.tar.gz |
Chefstyle fixes
Signed-off-by: Vivek Singh <vivek.singh@msystechnologies.com>
4 files changed, 3 insertions, 4 deletions
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb index c6102e7071..a15b47ca73 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb @@ -25,7 +25,7 @@ class Chef class ChefRepositoryFileSystemCookbookArtifactDir < ChefRepositoryFileSystemCookbookDir # Override from parent def cookbook_version - loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, self.chefignore) + loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore) cookbook_name, _dash, identifier = name.rpartition("-") # KLUDGE: We shouldn't have to use instance_variable_set loader.instance_variable_set(:@cookbook_name, cookbook_name) diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb index 7cc0cc3235..4f8368b025 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb @@ -142,7 +142,7 @@ class Chef end def cookbook_version - loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, self.chefignore) + loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore) loader.load_cookbooks loader.cookbook_version end diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb index 424e60731a..4d76be579a 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb @@ -25,7 +25,7 @@ class Chef class ChefRepositoryFileSystemVersionedCookbookDir < ChefRepositoryFileSystemCookbookDir # Override from parent def cookbook_version - loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, self.chefignore) + loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore) # We need the canonical cookbook name if we are using versioned cookbooks, but we don't # want to spend a lot of time adding code to the main Chef libraries canonical_name = canonical_cookbook_name(File.basename(file_path)) diff --git a/spec/unit/cookbook_uploader_spec.rb b/spec/unit/cookbook_uploader_spec.rb index 85e6c4c41c..07ff303274 100644 --- a/spec/unit/cookbook_uploader_spec.rb +++ b/spec/unit/cookbook_uploader_spec.rb @@ -60,7 +60,6 @@ describe Chef::CookbookUploader do allow(Chef::Config).to receive(:cookbook_path) { cookbook_path } end - it "defaults to not enabling policy mode" do expect(described_class.new(cookbooks_to_upload, rest: http_client).policy_mode?).to be(false) end |