Other spec fixes

Signed-off-by: Tim Smith <tsmith@chef.io>

spec/recipes/mac_os_x_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe 'build-essential::default' do
-  let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'mac_os_x', version: '10.12',
-                               step_into: ['build_essential']).converge('build-essential::default')
-  end
+  context 'macOS' do
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new(platform: 'mac_os_x', version: '10.12',
+                                 step_into: ['build_essential']).converge('build-essential::default')
+    end
 
-  it 'installs the xcode command line tools' do
-    expect(chef_run).to install_xcode_command_line_tools('install')
+    it 'installs the xcode command line tools' do
+      expect(chef_run).to install_xcode_command_line_tools('install')
+    end
   end
 end

spec/recipes/rhel_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'build-essential::default' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'centos', version: '6.8',
+    ChefSpec::ServerRunner.new(platform: 'centos', version: '6.9',
                                step_into: ['build_essential']).converge(described_recipe)
   end
 

spec/recipes/solaris2_spec.rb

@@ -1,26 +1,28 @@
 require 'spec_helper'
 
 describe 'build-essential::default' do
-  let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'solaris2', version: '5.11',
-                               step_into: ['build_essential']).converge('build-essential::default')
-  end
+  context 'Solaris' do
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new(platform: 'solaris2', version: '5.11',
+                                 step_into: ['build_essential']).converge('build-essential::default')
+    end
 
-  it 'installs the correct packages' do
-    expect(chef_run).to install_package('autoconf')
-    expect(chef_run).to install_package('automake')
-    expect(chef_run).to install_package('bison')
-    expect(chef_run).to install_package('gnu-coreutils')
-    expect(chef_run).to install_package('flex')
-    expect(chef_run).to install_package('gcc').with_version('4.8.2')
-    expect(chef_run).to install_package('gcc-c').with_version('4.8.2')
-    expect(chef_run).to install_package('gcc-c++').with_version('4.8.2')
-    expect(chef_run).to install_package('gnu-grep')
-    expect(chef_run).to install_package('gnu-make')
-    expect(chef_run).to install_package('gnu-patch')
-    expect(chef_run).to install_package('gnu-tar')
-    expect(chef_run).to install_package('make')
-    expect(chef_run).to install_package('pkg-config')
-    expect(chef_run).to install_package('ucb')
+    it 'installs the correct packages' do
+      expect(chef_run).to install_package('autoconf')
+      expect(chef_run).to install_package('automake')
+      expect(chef_run).to install_package('bison')
+      expect(chef_run).to install_package('gnu-coreutils')
+      expect(chef_run).to install_package('flex')
+      expect(chef_run).to install_package('gcc').with_version('4.8.2')
+      expect(chef_run).to install_package('gcc-c').with_version('4.8.2')
+      expect(chef_run).to install_package('gcc-c++').with_version('4.8.2')
+      expect(chef_run).to install_package('gnu-grep')
+      expect(chef_run).to install_package('gnu-make')
+      expect(chef_run).to install_package('gnu-patch')
+      expect(chef_run).to install_package('gnu-tar')
+      expect(chef_run).to install_package('make')
+      expect(chef_run).to install_package('pkg-config')
+      expect(chef_run).to install_package('ucb')
+    end
   end
 end

spec/recipes/suse_spec.rb

@@ -1,23 +1,25 @@
 require 'spec_helper'
 
 describe 'build-essential::default' do
-  let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'opensuse', version: '42.1',
-                               step_into: ['build_essential']).converge('build-essential::default')
-  end
-
-  it 'installs the correct packages' do
-    expect(chef_run).to install_package(['autoconf', 'bison', 'flex', 'gcc', 'gcc-c++', 'kernel-default-devel', 'make', 'm4'])
-  end
-
-  context 'on suse < 12' do
+  context 'SUSE' do
     let(:chef_run) do
-      ChefSpec::ServerRunner.new(platform: 'suse', version: '11.4',
-                                 step_into: ['build_essential']).converge(described_recipe)
+      ChefSpec::ServerRunner.new(platform: 'opensuse', version: '42.3',
+                                 step_into: ['build_essential']).converge('build-essential::default')
     end
 
-    it 'installs more packages' do
-      expect(chef_run).to install_package(['gcc48', 'gcc48-c++'])
+    it 'installs the correct packages on modern SLES/openSUSE' do
+      expect(chef_run).to install_package(['autoconf', 'bison', 'flex', 'gcc', 'gcc-c++', 'kernel-default-devel', 'make', 'm4'])
+    end
+
+    context 'on suse < 12' do
+      let(:chef_run) do
+        ChefSpec::ServerRunner.new(platform: 'suse', version: '11.4',
+                                   step_into: ['build_essential']).converge(described_recipe)
+      end
+
+      it 'installs more packages' do
+        expect(chef_run).to install_package(['gcc48', 'gcc48-c++'])
+      end
     end
   end
 end