Merge pull request #87 from branan/fix_rspec_211

Fix negative tests on rspec 2.11

spec/classes/mysql_config_spec.rb

@@ -209,9 +209,7 @@ describe 'mysql::config' do
     end
 
     it 'should fail' do
-      expect do
+      expect { subject }.to raise_error(Puppet::Error, /Duplicate (declaration|definition)/)
-        subject
-      end.should raise_error(Puppet::Error, /Duplicate (declaration|definition)/)
     end
 
   end
@@ -226,9 +224,7 @@ describe 'mysql::config' do
     end
 
     it 'should fail' do
-      expect do
+      expect { subject }.to raise_error(Puppet::Error, /required when ssl is true/)
-        subject
-      end.should raise_error(Puppet::Error, /required when ssl is true/)
     end
 
   end

spec/classes/mysql_init_spec.rb

@@ -47,9 +47,7 @@ describe 'mysql' do
     end
 
     it 'should fail' do
-      expect do
+      expect { subject }.to  raise_error(/Unsupported osfamily: foo/)
-        subject
-      end.should raise_error(/Unsupported osfamily: foo/)
     end
   end
 

spec/classes/mysql_java_spec.rb

@@ -47,9 +47,7 @@ describe 'mysql::java' do
     end
 
     it 'should fail' do
-      expect do
+      expect { subject }.to raise_error(/Unsupported osfamily: foo/)
-        subject
-      end.should raise_error(/Unsupported osfamily: foo/)
     end
   end
 

spec/classes/mysql_python_spec.rb

@@ -47,9 +47,7 @@ describe 'mysql::python' do
     end
 
     it 'should fail' do
-      expect do
+      expect { subject }.to raise_error(/Unsupported osfamily: foo/)
-        subject
-      end.should raise_error(/Unsupported osfamily: foo/)
     end
   end
 

spec/classes/mysql_ruby_spec.rb

@@ -55,9 +55,7 @@ describe 'mysql::ruby' do
     end
 
     it 'should fail' do
-      expect do
+      expect { subject }.to raise_error(/Unsupported osfamily: foo/)
-        subject
-      end.should raise_error(/Unsupported osfamily: foo/)
     end
   end