conflict_spec.rb in checker-0.6.5.rc1

- old
+ new

@@ -2,10 +2,10 @@
 
 describe Checker::Modules::Conflict do
   it 'checks all files' do
     files = ['a.rb', 'b.js.erb', 'c.r', 'd.yaml', 'e.yml', 'f.coffee']
     mod = Checker::Modules::Conflict.new(files)
-    mod.stub(:check_one).and_return(true)
+    mod.stub(:check_one).and_return(stub(:success? => true, :status => :ok))
     mod.should_receive(:check_one).exactly(6).times
     mod.check 
   end
 
   it "does find git conflict" do