merge class selenium::service into selenium::server

amine2z · Oct 2, 2013 · ba59bb7 · ba59bb7
1 parent 558c335
commit ba59bb7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 50 deletions.
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -2,10 +2,17 @@
 #
 # simple template
 #
+#
 # === Examples
 #
 # include selenium::server
 #
+#
+# === Authors
+#
+# Joshua Hoblitt <jhoblitt@cpan.org>
+#
+#
 class selenium::server(
   $display      = $selenium::params::display,
   $options      = $selenium::params::server_options,
@@ -24,7 +31,12 @@
     options      => $options,
     java         => $selenium::java,
   } ->
-  class { 'selenium::service': } ->
+  service { 'seleniumserver':
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
+  } ->
   Class[ 'selenium::server' ]
 
 }
diff --git a/manifests/service.pp b/manifests/service.pp
diff --git a/spec/classes/selenium_server_spec.rb b/spec/classes/selenium_server_spec.rb
@@ -16,7 +16,12 @@
         'display' => p[:display],
         'options' => p[:options],
       })
-      should contain_class('selenium::service')
+      should contain_service('seleniumserver').with({
+        :ensure     => 'running',
+        :hasstatus  => 'true',
+        :hasrestart => 'true',
+        :enable     => 'true',
+      })
       should contain_class('selenium::server')
     end
   end

diff --git a/spec/classes/selenium_service_spec.rb b/spec/classes/selenium_service_spec.rb