Merge pull request #154 from gentoo/raise-error

Cleanup rspec testing to full pass.

spec/unit/type/package_accept_keywords_spec.rb

@@ -11,7 +11,7 @@ describe Puppet::Type.type(:package_accept_keywords) do
 
   describe "when validating attributes" do
     params     = [:name]
-    properties = [:accept_keywords, :keywords, :target, :ensure, :version, :slot]
+    properties = [:accept_keywords, :target, :ensure, :version, :slot]
 
     params.each do |param|
       it "should have the #{param} param" do
@@ -36,7 +36,7 @@ describe Puppet::Type.type(:package_accept_keywords) do
     end
 
     it "should reject accept_keywords with a space" do
-      expect { described_class.new(:name => "sys-devel/gcc", :accept_keywords => "~amd 64") }.to raise_error
+      expect { described_class.new(:name => "sys-devel/gcc", :accept_keywords => "~amd 64") }.to raise_error(/cannot contain whitespace/)
     end
 
     it "should accept an array for accept_keywords" do

spec/unit/type/package_keywords_spec.rb

@@ -36,7 +36,7 @@ describe Puppet::Type.type(:package_keywords) do
     end
 
     it "should reject keywords with a space" do
-      expect { described_class.new(:name => "sys-devel/gcc", :keywords => "~amd 64") }.to raise_error
+      expect { described_class.new(:name => "sys-devel/gcc", :keywords => "~amd 64") }.to raise_error(/cannot contain whitespace/)
     end
 
     it "should accept an array for keywords" do

spec/unit/type/package_use_spec.rb

@@ -36,7 +36,7 @@ describe Puppet::Type.type(:package_use) do
     end
 
     it "should reject use flags with a space" do
-      expect { described_class.new(:name => "sys-devel/gcc", :use => "open mp") }.to raise_error
+      expect { described_class.new(:name => "sys-devel/gcc", :use => "open mp") }.to raise_error(/cannot contain whitespace/)
     end
 
     it "should accept an array for use" do

spec/unit/util/portage_spec.rb

@@ -338,7 +338,7 @@ describe Puppet::Util::Portage do
       it "should raise an error when parsing #{atom}" do
         expect {
           Puppet::Util::Portage.parse_atom(atom)
-        }.to raise_error, Puppet::Util::Portage::AtomError
+        }.to raise_error(Puppet::Util::Portage::AtomError)
       end
     end
   end
@@ -387,7 +387,7 @@ describe Puppet::Util::Portage do
       it "should raise an error when parsing #{cmpver}" do
         expect {
           Puppet::Util::Portage.parse_cmpver(cmpver)
-        }.to raise_error, Puppet::Util::Portage::AtomError
+        }.to raise_error(Puppet::Util::Portage::AtomError)
       end
     end
   end

spec/unit/util/webapp_spec.rb

@@ -165,7 +165,7 @@ describe Puppet::Util::Webapp do
       it "should raise an error when parsing '#{name}'" do
         expect {
           Puppet::Util::Webapp.parse_name(name)
-        }.to raise_error, Puppet::Util::Webapp::WebappError
+        }.to raise_error(Puppet::Util::Webapp::WebappError)
       end
     end
   end
@@ -221,7 +221,7 @@ describe Puppet::Util::Webapp do
       it "should raise an error when parsing '#{path}'" do
         expect {
           Puppet::Util::Webapp.parse_path(path)
-        }.to raise_error, Puppet::Util::Webapp::WebappError
+        }.to raise_error(Puppet::Util::Webapp::WebappError)
       end
     end
   end
@@ -256,7 +256,7 @@ describe Puppet::Util::Webapp do
       it "should raise an error when parsing '#{app}'" do
         expect {
           Puppet::Util::Webapp.parse_app(app)
-        }.to raise_error, Puppet::Util::Webapp::WebappError
+        }.to raise_error(Puppet::Util::Webapp::WebappError)
       end
     end
   end