Test arbitration

lib/mail_room/arbitration/redis.rb

@@ -17,8 +17,6 @@ def initialize(mailbox)
 
       attr_accessor :options
 
-      # Build a new delivery, hold the mailbox configuration
-      # @param [MailRoom::Delivery::Sidekiq::Options]
       def initialize(options)
         @options = options
       end

lib/mail_room/mailbox_handler.rb

@@ -43,9 +43,7 @@ def new_messages
     # search for all new (unseen) message ids
     # @return [Array<Integer>] message ids
     def new_message_ids
-      uids = @imap.uid_search(@mailbox.search_command)
-      uids.select! { |uid| @mailbox.deliver?(uid) }
-      uids
+      @imap.uid_search(@mailbox.search_command).select { |uid| @mailbox.deliver?(uid) }
     end
 
     # @private

mail_room.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "bourne"
   gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "fakeredis"
 
   # for testing delivery methods
   gem.add_development_dependency "faraday"
   gem.add_development_dependency "mail"
   gem.add_development_dependency "letter_opener"
-  gem.add_development_dependency "redis"
+  gem.add_development_dependency "redis-namespace"
   gem.add_development_dependency "pg"
   gem.add_development_dependency "charlock_holmes"
 end

spec/lib/arbitration/redis_spec.rb

@@ -2,9 +2,62 @@
 require 'mail_room/arbitration/redis'
 
 describe MailRoom::Arbitration::Redis do
+  let(:mailbox) { 
+    MailRoom::Mailbox.new(
+      arbitration_options: {
+        namespace: "mail_room"
+      }
+    ) 
+  }
+  let(:options) { described_class::Options.new(mailbox) }
+  subject       { described_class.new(options) }
+
+  # Private, but we don't care.
+  let(:redis) { subject.send(:redis) }
+
   describe '#deliver?' do
-    let(:mailbox) { MailRoom::Mailbox.new }
+    context "when called the first time" do
+      it "returns true" do
+        expect(subject.deliver?(123)).to be_truthy
+      end
+
+      it "increments the delivered flag" do
+        subject.deliver?(123)
+
+        expect(redis.get("delivered:123")).to eq("1")
+      end
+
+      it "sets an expiration on the delivered flag" do
+        subject.deliver?(123)
+
+        expect(redis.ttl("delivered:123")).to be > 0
+      end
+    end
+
+    context "when called the second time" do
+      before do
+        subject.deliver?(123)
+      end
+
+      it "returns false" do
+        expect(subject.deliver?(123)).to be_falsey
+      end
+
+      it "increments the delivered flag" do
+        subject.deliver?(123)
+
+        expect(redis.get("delivered:123")).to eq("2")
+      end
+    end
+
+    context "when called for another uid" do
+      before do
+        subject.deliver?(123)
+      end
 
-    # TODO
+      it "returns true" do
+        expect(subject.deliver?(234)).to be_truthy
+      end
+    end
   end
 end

spec/lib/mailbox_handler_spec.rb

@@ -21,6 +21,25 @@
       mailbox.should have_received(:deliver).with(message2)
     end
 
+    it "fetches and delivers all new messages from ids that haven't been processed yet" do
+      imap.stubs(:uid_search).returns([1,2])
+      message1 = stub(:attr => {'RFC822' => 'message1'})
+      message2 = stub(:attr => {'RFC822' => 'message2'})
+      imap.stubs(:uid_fetch).returns([message2])
+      mailbox.stubs(:deliver)
+      mailbox.stubs(:deliver?).with(1).returns(false)
+      mailbox.stubs(:deliver?).with(2).returns(true)
+
+      handler = MailRoom::MailboxHandler.new(mailbox, imap)
+      handler.process
+
+      imap.should have_received(:uid_search).with('UNSEEN')
+      imap.should have_received(:uid_fetch).with([2], 'RFC822')
+
+      mailbox.should have_received(:deliver).with(message1).never
+      mailbox.should have_received(:deliver).with(message2)
+    end
+
     it 'returns no messages if there are no ids' do
       imap.stubs(:uid_search).returns([])
       imap.stubs(:uid_fetch)

spec/lib/mailbox_spec.rb

@@ -89,9 +89,5 @@
         noop.should have_received(:deliver).never
       end
     end
-
-    describe "arbitration" do
-      # TODO
-    end
   end
 end

spec/spec_helper.rb

@@ -6,6 +6,7 @@
 require 'rspec'
 require 'mocha/api'
 require 'bourne'
+require 'fakeredis/rspec'
 
 require File.expand_path('../../lib/mail_room', __FILE__)