From 4730bd397aae888957493bf0851a5a63c347d3c6 Mon Sep 17 00:00:00 2001
From: William Yardley <wby@axs.com>
Date: Fri, 20 Oct 2017 15:21:25 -0700
Subject: [PATCH 1/3] remove unused spec_helper_system

---
 spec/spec_helper_system.rb | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 spec/spec_helper_system.rb

diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
deleted file mode 100644
index ef7746ac7..000000000
--- a/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-
-include RSpecSystemPuppet::Helpers
-include Serverspec::Helper::RSpecSystem
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(source: proj_root, module_name: 'mongodb')
-    shell('puppet module install puppetlabs-stdlib')
-    shell('puppet module install puppetlabs-apt')
-
-    case node.facts['osfamily']
-    when 'RedHat'
-      shell('puppet module install stahnma-epel')
-      puppet_apply('include epel')
-    end
-  end
-end

From 5727837e65caadd824029b77eb4a0c0fe57548c0 Mon Sep 17 00:00:00 2001
From: William Yardley <wby@axs.com>
Date: Fri, 20 Oct 2017 16:12:47 -0700
Subject: [PATCH 2/3] fix permissions and remove shebang

---
 spec/spec_helper_acceptance.rb | 1 -
 1 file changed, 1 deletion(-)
 mode change 100755 => 100644 spec/spec_helper_acceptance.rb

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
old mode 100755
new mode 100644
index 661af0bda..2b933ba96
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby -S rspec
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 

From e2e08f1e9bfeb3172b3434408029cffd77690cb0 Mon Sep 17 00:00:00 2001
From: William Yardley <wby@axs.com>
Date: Fri, 20 Oct 2017 16:13:12 -0700
Subject: [PATCH 3/3] Fix expected file permissions to match module's current
 state

---
 spec/acceptance/server_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
index 1cf3d4226..e08ad2d2a 100644
--- a/spec/acceptance/server_spec.rb
+++ b/spec/acceptance/server_spec.rb
@@ -194,7 +194,7 @@ class { 'mongodb::client': }
         it { is_expected.to be_file }
         it { is_expected.to be_owned_by 'root' }
         it { is_expected.to be_grouped_into 'root' }
-        it { is_expected.to be_mode 644 }
+        it { is_expected.to be_mode 600 }
         it { is_expected.to contain 'db.auth(\'admin\', \'password\')' }
       end