lib/teaspoon/driver/phantomjs.rb in teaspoon-1.1.4 vs lib/teaspoon/driver/phantomjs.rb in teaspoon-1.1.5

@@ -52,11 +52,10 @@
         %{"#{string.gsub('"', '\"')}"}
       end
 
       def executable
         return @executable if @executable
-        @executable = which("phantomjs")
-        @executable = ::Phantomjs.path if @executable.blank? && defined?(::Phantomjs)
+        @executable = defined?(::Phantomjs) ? ::Phantomjs.path : which("phantomjs")
         return @executable unless @executable.blank?
         raise Teaspoon::MissingDependencyError.new("Unable to locate phantomjs. Install it or use the phantomjs gem.")
       end
 
       def script