Ratified tests, improved coverage

Author: Sasha Gerrand

spec/oracle_rpm_spec.rb

@@ -11,59 +11,6 @@
     expect(chef_run).to include_recipe('java::set_java_home')
   end
 
-  describe 'type attribute' do
-    let(:chef_run) do
-      ChefSpec::Runner.new do |node|
-        node.automatic['java']['install_flavor'] = 'oracle_rpm'
-        node.set['java']['oracle_rpm']['type'] = type
-      end.converge(described_recipe)
-    end
-
-    describe 'using default value' do
-      let(:chef_run) do
-        ChefSpec::Runner.new do |node|
-          node.automatic['java']['install_flavor'] = 'oracle_rpm'
-        end.converge(described_recipe)
-      end
-
-      it 'installs jdk package' do
-        expect(chef_run).to install_package('jdk')
-      end
-    end
-
-    describe 'for valid values' do
-      shared_examples 'expected java packages are installed' do
-        it "installs package" do
-          expect(chef_run).to install_package(type)
-        end
-
-        it 'does not raise an error' do
-          expect { chef_run }.not_to raise_error
-        end
-      end
-
-      context 'for jdk' do
-        let(:type) { 'jdk' }
-
-        it_behaves_like 'expected java packages are installed'
-      end
-
-      context 'for jre' do
-        let(:type) { 'jre' }
-
-        it_behaves_like 'expected java packages are installed'
-      end
-    end
-
-    describe 'for invalid values' do
-      let(:type) { 'banana' }
-
-      it 'raises an error' do
-        expect { chef_run }.to raise_error
-      end
-    end
-  end
-
   describe 'update-java-alternatives' do
     let(:chef_run) do
       ChefSpec::Runner.new(platform: platform, version: version) do |node|
@@ -82,8 +29,8 @@
     end
   end
 
-  describe 'package_name' do
-    context 'for default values' do
+  describe 'package_name attribute' do
+    describe 'using default value' do
       let(:chef_run) do
         ChefSpec::Runner.new do |node|
           node.automatic['java']['install_flavor'] = 'oracle_rpm'
@@ -103,11 +50,27 @@
         end.converge(described_recipe)
       end
 
-      it 'installs package_name if set' do
+      it 'installs package_name' do
         expect(chef_run).to install_package('prime-caffeine')
       end
     end
 
+    context 'when package_name and package_version is set' do
+      let(:chef_run) do
+        ChefSpec::Runner.new do |node|
+          node.automatic['java']['install_flavor'] = 'oracle_rpm'
+          node.set['java']['oracle_rpm']['package_name'] = 'prime-caffeine'
+          node.set['java']['oracle_rpm']['package_version'] = '8.7.6-goldmaster'
+        end.converge(described_recipe)
+      end
+
+      it 'installs package_name with specific version' do
+        expect(chef_run).to install_package('prime-caffeine').with(
+          version: '8.7.6-goldmaster'
+        )
+      end
+    end
+
     context 'when type is set' do
       let(:chef_run) do
         ChefSpec::Runner.new do |node|
@@ -116,7 +79,7 @@
         end.converge(described_recipe)
       end
 
-      it 'installs type if set' do
+      it 'installs type' do
         expect(chef_run).to install_package('jdk')
       end
     end
@@ -135,4 +98,57 @@
       end
     end
   end
+
+  describe 'type attribute' do
+    let(:chef_run) do
+      ChefSpec::Runner.new do |node|
+        node.automatic['java']['install_flavor'] = 'oracle_rpm'
+        node.set['java']['oracle_rpm']['type'] = type
+      end.converge(described_recipe)
+    end
+
+    describe 'using default value' do
+      let(:chef_run) do
+        ChefSpec::Runner.new do |node|
+          node.automatic['java']['install_flavor'] = 'oracle_rpm'
+        end.converge(described_recipe)
+      end
+
+      it 'installs jdk package' do
+        expect(chef_run).to install_package('jdk')
+      end
+    end
+
+    describe 'for valid values' do
+      shared_examples 'expected java packages are installed' do
+        it "installs package" do
+          expect(chef_run).to install_package(type)
+        end
+
+        it 'does not raise an error' do
+          expect { chef_run }.not_to raise_error
+        end
+      end
+
+      context 'for jdk' do
+        let(:type) { 'jdk' }
+
+        it_behaves_like 'expected java packages are installed'
+      end
+
+      context 'for jre' do
+        let(:type) { 'jre' }
+
+        it_behaves_like 'expected java packages are installed'
+      end
+    end
+
+    describe 'for invalid values' do
+      let(:type) { 'banana' }
+
+      it 'raises an error' do
+        expect { chef_run }.to raise_error
+      end
+    end
+  end
 end