Improve acceptance tests

Add an actual agent run to each test, to confirm that the master is able
to serve requests in some basic capacity. Would have caught the "unicorn
/ nginx support broken" issue where ssl headers weren't passed right.

Also moves some of the tests into common blocks to reduce duplication.

Author: Daniel Dreier

spec/acceptance/passenger_server_spec.rb

@@ -1,25 +1,35 @@
 require 'spec_helper_acceptance'
 
 describe 'passenger server', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'running on passenger' do
-    it 'should run with no errors', :servertype => 'passenger', :webserver => 'apache' do
+  context 'running on passenger', :servertype => 'passenger', :webserver => 'apache' do
+    it 'should run with no errors' do
       pp = <<-EOS
-        class { "puppet::server":
-          servertype   => 'passenger',
-          ca           => true,
-          servername   => $::hostname,
+        class { 'puppet::server':
+          servertype => 'passenger',
+          ca         => true,
+          servername => $::hostname,
         }
       EOS
 
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
+    it_behaves_like 'basic working puppetmaster'
 
-    describe port(8140) do
-      it {
-        should be_listening
-      }
+    # sanity checks to ensure the passenger setup doesn't bring in other services
+    describe service('nginx') do
+      it { should_not be_enabled }
+      it { should_not be_running }
     end
+    describe service('puppetmaster') do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+    describe service('puppetserver') do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+
   end
 end

spec/acceptance/thin_server_spec.rb

@@ -2,8 +2,8 @@
 
 describe 'thin server', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
 
-  context 'running on thin' do
-    it 'should run with no errors', :servertype => 'thin', :webserver => 'nginx' do
+  context 'running on thin', :servertype => 'thin', :webserver => 'nginx' do
+    it 'should run with no errors' do
       pp = <<-EOS
         class { "puppet::server":
           servertype   => 'thin',
@@ -17,24 +17,16 @@ class { "puppet::server":
     end
 
     describe package('thin') do
-      it {
-        should be_installed.by('gem')
-      }
+      it { should be_installed.by('gem') }
     end
 
     describe service('thin-puppetmaster') do
-      it {
-        should be_enabled
-      }
-      it {
-        should be_running
-      }
+      it { should be_enabled }
+      it { should be_running }
     end
 
-    describe port(8140) do
-      it {
-        should be_listening
-      }
-    end
+    it_behaves_like "basic working puppetmaster"
+    it_behaves_like "nginx-based webserver"
+
   end
 end

spec/acceptance/unicorn_server_spec.rb

@@ -1,45 +1,22 @@
 require 'spec_helper_acceptance'
 
 describe 'server', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'running on unicorn' do
-    it 'should run with no errors', :servertype => 'unicorn', :webserver => 'nginx' do
+  context 'running on unicorn', :servertype => 'unicorn', :webserver => 'nginx' do
+    it 'should run with no errors' do
       pp = <<-EOS
-        class { "puppet::server":
-          servertype   => 'unicorn',
-          ca           => true,
+        class { 'puppet::server':
+          servertype => 'unicorn',
+          ca         => true,
         }
       EOS
 
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
-  describe command('puppet agent --test --server puppet') do
-    its(:exit_status) { should eq 0 }
-    its(:stderr) { should_not match /Forbidden request:/ }
-    its(:stderr) { should_not match /Error:/ }
-  end
-
-    describe package('nginx') do
-      it {
-        should be_installed
-      }
-    end
 
-    describe service('nginx') do
-      it {
-        should be_enabled
-      }
-      it {
-        should be_running
-      }
-    end
+    it_behaves_like "basic working puppetmaster"
+    it_behaves_like "nginx-based webserver"
 
-    describe port(8140) do
-      it {
-        should be_listening
-      }
-    end
   end
-
 end

spec/acceptance/webrick_server_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper_acceptance'
 
 describe 'server', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'running on webrick/standalone' do
-    it 'should run with no errors', :server => 'webrick', :webserver => 'builtin' do
+  context 'running on webrick/standalone', :server => 'webrick', :webserver => 'builtin' do
+    it 'should run with no errors' do
       pp = <<-EOS
-        class { "puppet::server":
-          servertype   => 'standalone',
-          ca           => true,
+        class { 'puppet::server':
+          servertype => 'standalone',
+          ca         => true,
         }
       EOS
 
@@ -16,19 +16,29 @@ class { "puppet::server":
     end
 
     describe service('puppetmaster') do
-      it {
-        should be_enabled
-      }
-      it {
-        should be_running
-      }
+      it { should be_enabled }
+      it { should be_running }
     end
 
-    describe port(8140) do
-      it {
-        should be_listening
-      }
+    # sanity checks to ensure the webrick setup doesn't bring in other services
+    describe service('nginx') do
+      it { should_not be_enabled }
+      it { should_not be_running }
     end
-  end
+    describe service('apache2') do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+    describe service('httpd') do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+    describe service('puppetserver') do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+
+    it_behaves_like 'basic working puppetmaster'
 
+  end
 end

spec/spec_helper_acceptance.rb

@@ -70,3 +70,32 @@
   on host, "rm -rf /var/lib/puppet/ssl; puppet cert --generate $HOSTNAME"
 
 end
+
+shared_examples_for "basic working puppetmaster" do
+  describe command('puppet agent --test --server puppet') do
+    its(:exit_status) { should eq 0 }
+    its(:stderr) { should_not match /Forbidden request:/ }
+    its(:stderr) { should_not match /Error:/ }
+  end
+  describe port(8140) do
+    it {
+      should be_listening
+    }
+  end
+end
+
+shared_examples_for "nginx-based webserver" do
+  describe package('nginx') do
+    it { should be_installed }
+  end
+
+  describe service('nginx') do
+    it { should be_enabled }
+    it { should be_running }
+  end
+
+  describe service('puppetmaster') do
+    it { should_not be_enabled }
+    it { should_not be_running }
+  end
+end