Merge pull request #40 from esposito/patch-1

Fix specs

guard-teaspoon.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {spec,test}/*`.split("\n")
 
   s.add_dependency "guard", "~> 2.2"
+  s.add_dependency "guard-compat", "~> 1.2"
   s.add_dependency "teaspoon", ">= 0.8.0"
 end

lib/guard/teaspoon.rb

@@ -1,5 +1,4 @@
-require "guard"
-require "guard/plugin"
+require "guard/compat/plugin"
 
 module Guard
   class Teaspoon < Plugin
@@ -30,8 +29,6 @@ def start
     end
 
     def run_all
-      # run all tests instead of running only the last run tests
-      @options.delete :files
       passed = @runner.run_all(@options[:run_all])
 
       if passed
@@ -71,7 +68,7 @@ def run_on_modifications(original_paths)
     private
 
     def notify(status)
-      ::Guard::Notifier.notify(status.to_s.capitalize, title: "Teaspoon Guard", image: status)
+      Guard::Compat::UI.notify(status.to_s.capitalize, title: "Teaspoon Guard", image: status)
     end
 
     def remove_failed(paths)

lib/guard/teaspoon/runner.rb

@@ -18,6 +18,8 @@ def initialize(options = {})
       end
 
       def run_all(options = {})
+        # run all tests instead of running only the last run tests
+        @options.delete :files
         @console.execute(@options.merge(options))
       end
 

spec/guard/teaspoon/runner_spec.rb

@@ -39,6 +39,13 @@
       subject.run_all(baz: "teaspoon")
     end
 
+    it 'removes previously set files so that all files are run' do
+      subject = Guard::Teaspoon::Runner.new(files: ["file1", "file2"], baz: "teaspoon")
+      subject.console = console
+      console.should_receive(:execute).with(foo: "bar", baz: "teaspoon")
+      subject.run_all(foo: "bar")
+    end
+
   end
 
   describe "#run" do

spec/spec_helper.rb

@@ -11,6 +11,7 @@
 Coveralls.wear!
 
 require "guard/teaspoon"
+require "guard/compat/test/helper"
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }