Merge pull request #38 from eitoball/fix-when-tmux-not-installed-again

Fix when tmux is not installed or is not found again.
guard · Aug 1, 2019 · 5ed9091 · 5ed9091
2 parents caf272c + d21d36f
commit 5ed9091
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/notiffany/notifier/tmux/client.rb b/lib/notiffany/notifier/tmux/client.rb
@@ -11,7 +11,7 @@ class << self
           def version
             begin
               Float(_capture("-V")[/\d+\.\d+/])
-            rescue TypeError
+            rescue NoMethodError, TypeError
               raise Base::UnavailableError, "Could not find tmux"
             end
           end

diff --git a/spec/lib/notiffany/notifier/tmux_spec.rb b/spec/lib/notiffany/notifier/tmux_spec.rb
@@ -14,7 +14,16 @@ class Notifier
       describe ".version" do
         context "when tmux is not installed" do
           it "fails" do
-            allow(sheller).to receive(:stdout).and_return('')
+            allow(sheller).to receive(:stdout).and_return(nil)
+            expect do
+              described_class.version
+            end.to raise_error(Base::UnavailableError)
+          end
+        end
+
+        context "when 'tmux -v' doesn't contain float-like string" do
+          it "fails" do
+            allow(sheller).to receive(:stdout).and_return('master')
             expect do
               described_class.version
             end.to raise_error(Base::UnavailableError)