Add rspec test covering both files and directories

Author: Kevin Paulisse

spec/octocatalog-diff/fixtures/catalogs/catalog-modules-test.json

@@ -0,0 +1,58 @@
+{
+  "document_type": "Catalog",
+  "tags": ["settings","test"],
+  "name": "my.rspec.node",
+  "version": "production",
+  "environment": "production",
+  "resources": [
+    {
+      "type": "Stage",
+      "title": "main",
+      "tags": ["stage"],
+      "exported": false,
+      "parameters": {
+        "name": "main"
+      }
+    },
+    {
+      "type": "Class",
+      "title": "Settings",
+      "tags": ["class","settings"],
+      "exported": false
+    },
+    {
+      "type": "File",
+      "title": "/tmp/foo",
+      "tags": ["file","class"],
+      "file": "/x/modules/modulestest/manifests/init.pp",
+      "line": 37,
+      "exported": false,
+      "parameters": {
+        "backup": false,
+        "mode": "0440",
+        "owner": "root",
+        "group": "root",
+        "source": "puppet:///modules/modulestest/tmp/modulestest"
+      }
+    },
+    {
+      "type": "File",
+      "title": "/tmp/foobaz",
+      "tags": ["file","class"],
+      "file": "/x/modules/modulestest/manifests/init.pp",
+      "line": 37,
+      "exported": false,
+      "parameters": {
+        "backup": false,
+        "ensure": "directory",
+        "mode": "0755",
+        "owner": "root",
+        "group": "root",
+        "source": "puppet:///modules/modulestest/foo"
+      }
+    }
+  ],
+  "classes": [
+    "test"
+  ]
+}

spec/octocatalog-diff/tests/catalog-util/fileresources_spec.rb

@@ -20,13 +20,13 @@ def catalog_from_fixture(path)
     end
 
     it 'should return path if file is found' do
-      allow(File).to receive(:file?).with('/a/foo/files/bar').and_return(true)
+      allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(true)
       result = OctocatalogDiff::CatalogUtil::FileResources.file_path('puppet:///modules/foo/bar', ['/a'])
       expect(result).to eq('/a/foo/files/bar')
     end
 
     it 'should return nil if file is not found' do
-      allow(File).to receive(:file?).with('/a/foo/files/bar').and_return(false)
+      allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(false)
       result = OctocatalogDiff::CatalogUtil::FileResources.file_path('puppet:///modules/foo/bar', ['/a'])
       expect(result).to eq(nil)
     end
@@ -54,6 +54,46 @@ def catalog_from_fixture(path)
     end
   end
 
+  context 'with mixed files and directories' do
+    describe '#convert_file_resources' do
+      before(:each) do
+        @tmpdir = Dir.mktmpdir
+        FileUtils.cp_r OctocatalogDiff::Spec.fixture_path('repos/modulepath/manifests'), @tmpdir
+        FileUtils.cp_r OctocatalogDiff::Spec.fixture_path('repos/modulepath/modules'), @tmpdir
+        Dir.mkdir File.join(@tmpdir, 'environments')
+        File.symlink @tmpdir, File.join(@tmpdir, 'environments', 'production')
+        File.open(File.join(@tmpdir, 'manifests', 'site.pp'), 'w') { |f| f.write "include modulestest\n" }
+
+        @obj = catalog_from_fixture('catalogs/catalog-modules-test.json')
+        @obj.compilation_dir = @tmpdir
+        @resources_save = @obj.resources.dup
+        OctocatalogDiff::CatalogUtil::FileResources.convert_file_resources(@obj)
+      end
+
+      after(:each) do
+        FileUtils.remove_entry_secure @tmpdir if File.directory?(@tmpdir)
+      end
+
+      it 'should populate content of a file' do
+        r = @obj.resources.select { |x| x['type'] == 'File' && x['title'] == '/tmp/foo' }
+        expect(r).to be_a_kind_of(Array)
+        expect(r.size).to eq(1)
+        expect(r.first).to be_a_kind_of(Hash)
+        expect(r.first['parameters'].key?('source')).to eq(false)
+        expect(r.first['parameters']['content']).to eq("Modules Test\n")
+      end
+
+      it 'should leave a directory unmodified' do
+        r = @obj.resources.select { |x| x['type'] == 'File' && x['title'] == '/tmp/foobaz' }
+        expect(r).to be_a_kind_of(Array)
+        expect(r.size).to eq(1)
+        expect(r.first).to be_a_kind_of(Hash)
+        expect(r.first['parameters'].key?('content')).to eq(false)
+        expect(r.first['parameters']['source']).to eq('puppet:///modules/modulestest/foo')
+      end
+    end
+  end
+
   describe '#convert_file_resources' do
     before(:each) do
       @tmpdir = Dir.mktmpdir