spec/whm/cert_spec.rb in lumberg-2.0.0.pre3 vs spec/whm/cert_spec.rb in lumberg-2.0.0.pre4

@@ -5,13 +5,13 @@
 SELF_KEY = File.read('./spec/sample_certs/sample.key')
 
 module Lumberg
   describe Whm::Cert do
     before(:each) do
-      @login    = { :host => @whm_host, :hash => @whm_hash }
-      @server   = Whm::Server.new(@login.dup)
-      @cert      = Whm::Cert.new(:server => @server.dup)
+      @login  = { :host => @whm_host, :hash => @whm_hash }
+      @server = Whm::Server.new(@login.dup)
+      @cert   = Whm::Cert.new(:server => @server.dup)
     end
 
     describe "#listcrts" do
       use_vcr_cassette "whm/cert/listcrts"
 
@@ -35,18 +35,55 @@
     end
 
     describe "#generatessl" do
       use_vcr_cassette "whm/cert/generatessl"
 
-      it "generates a CSR" do
-        result = @cert.generatessl(:city => "houston", :xemail => "[e-mail]", :host => "myhost.com", 
-                                   :country => "US", :state => "TX", :co => "Company", :cod => "Dept", 
-                                   :email => "[e-mail]", :pass => "abc123")
-        result[:success].should be_true
-        result[:message].should == "Key, Certificate, and CSR generated OK"
-        result[:params][:csr].should match(/.*BEGIN CERTIFICATE REQUEST.*/)
-        result[:params][:cert].should match(/.*BEGIN CERTIFICATE.*/)
-        result[:params][:key].should match(/.*BEGIN RSA PRIVATE KEY.*/)
+      context "generating a new CSR" do
+        subject do
+          @cert.generatessl(
+            :city             => "houston",
+            :host             => "myhost.com",
+            :country          => "US",
+            :state            => "TX",
+            :company          => "Company",
+            :company_division => "Dept",
+            :email            => "[e-mail]",
+            :pass             => "abc123",
+            :xemail           => "",
+            :noemail          => 1
+          )
+        end
+
+        its([:success]) { should be_true }
+        its([:message]) { should == "Key, Certificate, and CSR generated OK" }
+
+        its([:params])  { should have_key :csr }
+        its([:params])  { should have_key :key }
+        its([:params])  { should have_key :cert }
+      end
+
+      context "generating a new CSR with an ampersand in company name" do
+        subject do
+          @cert.generatessl(
+            :city             => "houston",
+            :host             => "myhost.com",
+            :country          => "US",
+            :state            => "TX",
+            :company          => "Foo & Bar",
+            :company_division => "Dept",
+            :email            => "[e-mail]",
+            :pass             => "abc123",
+            :xemail           => "",
+            :noemail          => 1
+          )
+        end
+
+        its([:success]) { should be_true }
+        its([:message]) { should == "Key, Certificate, and CSR generated OK" }
+
+        its([:params])  { should have_key :csr }
+        its([:params])  { should have_key :key }
+        its([:params])  { should have_key :cert }
       end
     end
 
     describe "#installssl" do
       use_vcr_cassette "whm/cert/installssl"