mv service resource into selenium::config to prevent circular deps

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

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -46,6 +46,12 @@
     group   => 'root',
     mode    => '0755',
     content => template("${module_name}/init.d/selenium.erb"),
+  } ->
+  service { $prog:
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
   }
 
 }
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -31,12 +31,6 @@
     options      => $options,
     java         => $selenium::java,
   } ->
-  service { 'seleniumserver':
-    ensure     => running,
-    hasstatus  => true,
-    hasrestart => true,
-    enable     => true,
-  } ->
   Class[ 'selenium::server' ]
 
 }
diff --git a/spec/classes/selenium_server_spec.rb b/spec/classes/selenium_server_spec.rb
@@ -16,12 +16,6 @@
         'display' => p[:display],
         'options' => p[:options],
       })
-      should contain_service('seleniumserver').with({
-        :ensure     => 'running',
-        :hasstatus  => 'true',
-        :hasrestart => 'true',
-        :enable     => 'true',
-      })
       should contain_class('selenium::server')
     end
   end

diff --git a/spec/defines/selenium_config_spec.rb b/spec/defines/selenium_config_spec.rb
@@ -35,6 +35,12 @@
         with_content(/SLNM_JAVA='#{p[:java]}'/).
         with_content(/SLNM_LOG_NAME='#{title}'/).
         with_content(/prog='selenium#{title}'/)
+      should contain_service("selenium#{title}").with({
+        :ensure     => 'running',
+        :hasstatus  => 'true',
+        :hasrestart => 'true',
+        :enable     => 'true',
+      })
     end
   end