(SIMP-3787) gnome: add libxkbcommon-x11 to package list (#31)

- Add libxkbcommon-x11 to package list on EL 7.4
- Maintenance updates to .fixtures.yml and .travis.yml

SIMP-3787 #close
SIMP-3786 #comment code update

.fixtures.yml

@@ -5,5 +5,3 @@ fixtures:
     polkit: https://github.com/simp/pupmod-simp-polkit
     simplib: https://github.com/simp/pupmod-simp-simplib
     stdlib: https://github.com/simp/puppetlabs-stdlib
-  symlinks:
-    gnome: "#{source_dir}"

.travis.yml

@@ -15,6 +15,7 @@ before_script:
 bundler_args: --without development system_tests --path .vendor
 before_install: rm Gemfile.lock || true
 script:
+- bundle exec rake compare_latest_tag
 - bundle exec rake test
 notifications:
   email: false

CHANGELOG

@@ -1,3 +1,8 @@
+* Wed Sep 20 2017 Liz Nemsick <[email protected]> - 7.0.1-0
+- Add libxkbcommon-x11 to required package list for CentOS/RedHat 7.4.
+- Remove unnecessary CentOS data-in-module files.  The OS family fact
+  for CentOS is RedHat, so these files are not used.
+
 * Mon Jun 05 2017 Nick Miller <[email protected]> - 7.0.0-0
 - module was rewritten
   - takes advantage of the data in modules paradigm

data/os/RedHat-7.4.yaml

@@ -0,0 +1,3 @@
+---
+gnome::packages:
+  libxkbcommon-x11: ~

hiera.yaml

@@ -2,6 +2,10 @@
 version: 4
 datadir: data
 hierarchy:
+  - name: "OS family + Major.Minor Release"
+    backend: yaml
+    path: "os/%{facts.os.family}-%{facts.os.release.major}.%{facts.os.release.minor}"
+
   - name: "OS family + Major Release"
     backend: yaml
     path: "os/%{facts.os.family}-%{facts.os.release.major}"

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-gnome",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "author": "SIMP Team",
   "summary": "Provides useful settings to set up the GNOME desktop environment",
   "license": "Apache-2.0",

spec/classes/gnome_spec.rb

@@ -35,6 +35,8 @@
   'yelp',
 ]
 
+packages_el7_4 = packages_el7 + [ 'libxkbcommon-x11' ]
+
 describe 'gnome' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
@@ -204,4 +206,44 @@
 
     end
   end
+
+  # These tests can be folded into the tests above, once
+  # simp-rspec-puppet-facts RubyGem is updated.
+  context 'with CentOS 7.4' do
+    let(:facts) {{
+      :os => {
+        :family    => "RedHat",
+        :hardware  => "x86_64",
+        :name      => "CentOS",
+        :release   => {
+          :major => "7",
+          :minor => "4"
+        }
+      },
+      :gdm_version => '3.20.1'
+    }}
+
+    packages_el7_4.each do |pkg|
+      it { is_expected.to contain_package(pkg).with_ensure('installed') }
+    end
+  end
+
+  context 'with RedHat 7.4' do
+    let(:facts) {{
+      :os => {
+        :family    => "RedHat",
+        :hardware  => "x86_64",
+        :name      => "RedHat",
+        :release   => {
+          :major => "7",
+          :minor => "4"
+        }
+      },
+      :gdm_version => '3.20.1'
+    }}
+
+    packages_el7_4.each do |pkg|
+      it { is_expected.to contain_package(pkg).with_ensure('installed') }
+    end
+  end
 end