Don't try to stop a server when no server is running. (Fixes #31)

guard · Feb 1, 2012 · 82d916a · 82d916a
1 parent 6106daf
commit 82d916a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/lib/guard/jasmine.rb b/lib/guard/jasmine.rb
@@ -89,7 +89,7 @@ def start
     # @raise [:task_has_failed] when stop has failed
     #
     def stop
-      Server.stop
+      Server.stop unless options[:server] == :none
     end
 
     # Gets called when the Guard should reload itself.

diff --git a/spec/guard/jasmine_spec.rb b/spec/guard/jasmine_spec.rb
@@ -398,9 +398,22 @@
   end
 
   describe '.stop' do
-    it 'stops the server' do
-      server.should_receive(:stop)
-      guard.stop
+    context 'with a configured server' do
+      let(:guard) { Guard::Jasmine.new(nil, { :server => :thin }) }
+
+      it 'stops the server' do
+        server.should_receive(:stop)
+        guard.stop
+      end
+    end
+
+    context 'without a configured server' do
+      let(:guard) { Guard::Jasmine.new(nil, { :server => :none }) }
+
+      it 'does not stop the server' do
+        server.should_not_receive(:stop)
+        guard.stop
+      end
     end
   end