gitlab-mail_room 0.0.4 → 0.0.10

data/spec/lib/arbitration/redis_spec.rb

@@ -5,7 +5,8 @@ describe MailRoom::Arbitration::Redis do
   let(:mailbox) {
     build_mailbox(
       arbitration_options: {
-        namespace: "mail_room"
+        namespace: "mail_room",
+        redis_url: ENV['REDIS_URL']
       }
     )
   }
@@ -78,7 +79,7 @@ describe MailRoom::Arbitration::Redis do
 
   context 'redis client connection params' do
     context 'when only url is present' do
-      let(:redis_url) { "redis://localhost:6379" }
+      let(:redis_url) { ENV.fetch('REDIS_URL', 'redis://localhost:6379') }
       let(:mailbox) {
         build_mailbox(
           arbitration_options: {

data/spec/lib/cli_spec.rb

@@ -4,23 +4,35 @@ describe MailRoom::CLI do
   let(:config_path) {File.expand_path('../fixtures/test_config.yml', File.dirname(__FILE__))}
   let!(:configuration) {MailRoom::Configuration.new({:config_path => config_path})}
   let(:coordinator) {stub(:run => true, :quit => true)}
+  let(:configuration_args) { anything }
+  let(:coordinator_args) { [anything, anything] }
 
   describe '.new' do
     let(:args) {["-c", "a path"]}
 
     before :each do
-      MailRoom::Configuration.stubs(:new).returns(configuration)
-      MailRoom::Coordinator.stubs(:new).returns(coordinator)
+      MailRoom::Configuration.expects(:new).with(configuration_args).returns(configuration)
+      MailRoom::Coordinator.stubs(:new).with(*coordinator_args).returns(coordinator)
     end
 
-    it 'parses arguments into configuration' do
-      expect(MailRoom::CLI.new(args).configuration).to eq(configuration)
-      expect(MailRoom::Configuration).to have_received(:new).with({:config_path => 'a path'})
+    context 'with configuration args' do
+      let(:configuration_args) do
+        {:config_path => 'a path'}
+      end
+
+      it 'parses arguments into configuration' do
+        expect(MailRoom::CLI.new(args).configuration).to eq configuration
+      end
     end
 
-    it 'creates a new coordinator with configuration' do
-      expect(MailRoom::CLI.new(args).coordinator).to eq(coordinator)
-      expect(MailRoom::Coordinator).to have_received(:new).with(configuration.mailboxes)
+    context 'with coordinator args' do
+      let(:coordinator_args) do
+        [configuration.mailboxes, anything]
+      end
+
+      it 'creates a new coordinator with configuration' do
+        expect(MailRoom::CLI.new(args).coordinator).to eq(coordinator)
+      end
     end
   end
 
@@ -30,30 +42,33 @@ describe MailRoom::CLI do
     before :each do
       cli.configuration = configuration
       cli.coordinator = coordinator
+      cli.stubs(:exit)
     end
 
     it 'starts running the coordinator' do
-      cli.start
+      coordinator.expects(:run)
 
-      expect(coordinator).to have_received(:run)
+      cli.start
     end
 
     context 'on error' do
-      let(:error_message) { "oh noes!" }
-      let(:coordinator) { OpenStruct.new(run: true, quit: true) }
+      let(:error) { RuntimeError.new("oh noes!") }
+      let(:coordinator) { stub(run: true, quit: true) }
+      let(:crash_handler) { stub(handle: nil) }
 
       before do
         cli.instance_variable_set(:@options, {exit_error_format: error_format})
-        coordinator.stubs(:run).raises(RuntimeError, error_message)
+        coordinator.stubs(:run).raises(error)
+        MailRoom::CrashHandler.stubs(:new).returns(crash_handler)
       end
 
       context 'json format provided' do
         let(:error_format) { 'json' }
 
         it 'passes onto CrashHandler' do
-          cli.start
+          crash_handler.expects(:handle).with(error, error_format)
 
-          expect(MailRoom::CrashHandler).to have_received(:new).with a_hash_including({format: error_format})
+          cli.start
         end
       end
     end

data/spec/lib/configuration_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe MailRoom::Configuration do
   let(:config_path) {File.expand_path('../fixtures/test_config.yml', File.dirname(__FILE__))}
 
-  describe 'set_mailboxes' do
+  describe '#initalize' do
     context 'with config_path' do
       let(:configuration) { MailRoom::Configuration.new(:config_path => config_path) }
 
@@ -12,6 +12,10 @@ describe MailRoom::Configuration do
 
         expect(configuration.mailboxes).to eq(['mailbox1', 'mailbox2'])
       end
+
+      it 'parses health check' do
+        expect(configuration.health_check).to be_a(MailRoom::HealthCheck)
+      end
     end
 
     context 'without config_path' do
@@ -19,10 +23,13 @@ describe MailRoom::Configuration do
 
       it 'sets mailboxes to an empty set' do
         MailRoom::Mailbox.stubs(:new)
+        MailRoom::Mailbox.expects(:new).never
 
         expect(configuration.mailboxes).to eq([])
+      end
 
-        expect(MailRoom::Mailbox).to have_received(:new).never
+      it 'sets the health check to nil' do
+        expect(configuration.health_check).to be_nil
       end
     end
   end

data/spec/lib/coordinator_spec.rb

@@ -3,20 +3,25 @@ require 'spec_helper'
 describe MailRoom::Coordinator do
   describe '#initialize' do
     it 'builds a watcher for each mailbox' do
-      MailRoom::MailboxWatcher.stubs(:new).returns('watcher1', 'watcher2')
+      MailRoom::MailboxWatcher.expects(:new).with('mailbox1').returns('watcher1')
+      MailRoom::MailboxWatcher.expects(:new).with('mailbox2').returns('watcher2')
 
       coordinator = MailRoom::Coordinator.new(['mailbox1', 'mailbox2'])
 
       expect(coordinator.watchers).to eq(['watcher1', 'watcher2'])
-
-      expect(MailRoom::MailboxWatcher).to have_received(:new).with('mailbox1')
-      expect(MailRoom::MailboxWatcher).to have_received(:new).with('mailbox2')
     end
 
     it 'makes no watchers when mailboxes is empty' do
       coordinator = MailRoom::Coordinator.new([])
       expect(coordinator.watchers).to eq([])
     end
+
+    it 'sets the health check' do
+      health_check = MailRoom::HealthCheck.new({ address: '127.0.0.1', port: 8080})
+      coordinator = MailRoom::Coordinator.new([], health_check)
+
+      expect(coordinator.health_check).to eq(health_check)
+    end
   end
 
   describe '#run' do
@@ -24,27 +29,37 @@ describe MailRoom::Coordinator do
       watcher = stub
       watcher.stubs(:run)
       watcher.stubs(:quit)
+
+      health_check = stub
+      health_check.stubs(:run)
+      health_check.stubs(:quit)
+
       MailRoom::MailboxWatcher.stubs(:new).returns(watcher)
-      coordinator = MailRoom::Coordinator.new(['mailbox1'])
+      coordinator = MailRoom::Coordinator.new(['mailbox1'], health_check)
       coordinator.stubs(:sleep_while_running)
+      watcher.expects(:run)
+      watcher.expects(:quit)
+      health_check.expects(:run)
+      health_check.expects(:quit)
+
       coordinator.run
-      expect(watcher).to have_received(:run)
-      expect(watcher).to have_received(:quit)
     end
-    
+
     it 'should go to sleep after running watchers' do
       coordinator = MailRoom::Coordinator.new([])
       coordinator.stubs(:running=)
       coordinator.stubs(:running?).returns(false)
+      coordinator.expects(:running=).with(true)
+      coordinator.expects(:running?)
+
       coordinator.run
-      expect(coordinator).to have_received(:running=).with(true)
-      expect(coordinator).to have_received(:running?)
     end
 
     it 'should set attribute running to true' do
       coordinator = MailRoom::Coordinator.new([])
       coordinator.stubs(:sleep_while_running)
       coordinator.run
+
       expect(coordinator.running).to eq(true)
     end
   end
@@ -54,8 +69,9 @@ describe MailRoom::Coordinator do
       watcher = stub(:quit)
       MailRoom::MailboxWatcher.stubs(:new).returns(watcher)
       coordinator = MailRoom::Coordinator.new(['mailbox1'])
+      watcher.expects(:quit)
+
       coordinator.quit
-      expect(watcher).to have_received(:quit)
     end
   end
 end

data/spec/lib/crash_handler_spec.rb

@@ -4,21 +4,22 @@ describe MailRoom::CrashHandler do
 
   let(:error_message) { "oh noes!" }
   let(:error) { RuntimeError.new(error_message) }
+  let(:stdout) { StringIO.new }
 
   describe '#handle' do
 
-    subject{ described_class.new(error: error, format: format) }
+    subject{ described_class.new(stdout).handle(error, format) }
 
     context 'when given a json format' do
       let(:format) { 'json' }
-      let(:fake_json) do
-        { message: error_message }.to_json
-      end
 
-      it 'outputs the result of json to stdout' do
-        subject.stubs(:json).returns(fake_json)
+      it 'writes a json message to stdout' do
+        subject
+        stdout.rewind
+        output = stdout.read
 
-        expect{ subject.handle }.to output(/\"message\":\"#{error_message}\"/).to_stdout
+        expect(output).to end_with("\n")
+        expect(JSON.parse(output)['message']).to eq(error_message)
       end
     end
 
@@ -26,7 +27,7 @@ describe MailRoom::CrashHandler do
       let(:format) { "" }
 
       it 'raises an error as designed' do
-        expect{ subject.handle }.to raise_error(error.class, error_message)
+        expect{ subject }.to raise_error(error.class, error_message)
       end
     end
 
@@ -34,7 +35,7 @@ describe MailRoom::CrashHandler do
       let(:format) { "nonsense" }
 
       it 'raises an error as designed' do
-        expect{ subject.handle }.to raise_error(error.class, error_message)
+        expect{ subject }.to raise_error(error.class, error_message)
       end
     end
   end

data/spec/lib/delivery/letter_opener_spec.rb

@@ -10,20 +10,24 @@ describe MailRoom::Delivery::LetterOpener do
     before :each do
       Mail.stubs(:read_from_string).returns(mail)
       ::LetterOpener::DeliveryMethod.stubs(:new).returns(delivery_method)
-
-      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
 
     it 'creates a new LetterOpener::DeliveryMethod' do
-      expect(::LetterOpener::DeliveryMethod).to have_received(:new).with(:location => '/tmp/somewhere')
+      ::LetterOpener::DeliveryMethod.expects(:new).with(:location => '/tmp/somewhere').returns(delivery_method)
+
+      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
 
     it 'parses the message string with Mail' do
-      expect(::Mail).to have_received(:read_from_string).with('a message')
+      ::Mail.expects(:read_from_string).with('a message')
+
+      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
 
     it 'delivers the mail message' do
-      expect(delivery_method).to have_received(:deliver!).with(mail)
+      delivery_method.expects(:deliver!).with(mail)
+
+      MailRoom::Delivery::LetterOpener.new(mailbox).deliver('a message')
     end
   end
 end

data/spec/lib/delivery/logger_spec.rb

@@ -9,9 +9,9 @@ describe MailRoom::Delivery::Logger do
       it 'creates a new ruby logger' do
         ::Logger.stubs(:new)
 
-        MailRoom::Delivery::Logger.new(mailbox)
+        ::Logger.expects(:new).with(STDOUT)
 
-        expect(::Logger).to have_received(:new).with(STDOUT)
+        MailRoom::Delivery::Logger.new(mailbox)
       end
     end
 
@@ -19,14 +19,12 @@ describe MailRoom::Delivery::Logger do
       let(:mailbox) {build_mailbox(:log_path => '/var/log/mail-room.log')}
 
       it 'creates a new file to append to' do
-        ::Logger.stubs(:new)
         file = stub(:sync=)
-        ::File.stubs(:open).returns(file)
 
-        MailRoom::Delivery::Logger.new(mailbox)
+        File.expects(:open).with('/var/log/mail-room.log', 'a').returns(file)
+        ::Logger.stubs(:new).with(file)
 
-        expect(File).to have_received(:open).with('/var/log/mail-room.log', 'a')
-        expect(::Logger).to have_received(:new).with(file)
+        MailRoom::Delivery::Logger.new(mailbox)
       end
     end
   end
@@ -38,9 +36,9 @@ describe MailRoom::Delivery::Logger do
       logger = stub(:info)
       ::Logger.stubs(:new).returns(logger)
 
-      MailRoom::Delivery::Logger.new(mailbox).deliver('a message')
+      logger.expects(:info).with('a message')
 
-      expect(logger).to have_received(:info).with('a message')
+      MailRoom::Delivery::Logger.new(mailbox).deliver('a message')
     end
   end
 end

data/spec/lib/delivery/postback_spec.rb

@@ -18,19 +18,13 @@ describe MailRoom::Delivery::Postback do
         request = stub
         Faraday.stubs(:new).returns(connection)
 
-        connection.stubs(:token_auth)
-        connection.stubs(:post).yields(request)
+        connection.expects(:token_auth).with('abcdefg')
+        connection.expects(:post).yields(request)
 
-        request.stubs(:url)
-        request.stubs(:body=)
+        request.expects(:url).with('http://localhost/inbox')
+        request.expects(:body=).with('a message')
 
         MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
-
-        expect(connection).to have_received(:token_auth).with('abcdefg')
-        expect(connection).to have_received(:post)
-
-        expect(request).to have_received(:url).with('http://localhost/inbox')
-        expect(request).to have_received(:body=).with('a message')
       end
     end
 
@@ -52,19 +46,13 @@ describe MailRoom::Delivery::Postback do
         request = stub
         Faraday.stubs(:new).returns(connection)
 
-        connection.stubs(:basic_auth)
-        connection.stubs(:post).yields(request)
+        connection.expects(:basic_auth).with('user1', 'password123abc')
+        connection.expects(:post).yields(request)
 
-        request.stubs(:url)
-        request.stubs(:body=)
+        request.expects(:url).with('http://localhost/inbox')
+        request.expects(:body=).with('a message')
 
         MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
-
-        expect(connection).to have_received(:basic_auth).with('user1', 'password123abc')
-        expect(connection).to have_received(:post)
-
-        expect(request).to have_received(:url).with('http://localhost/inbox')
-        expect(request).to have_received(:body=).with('a message')
       end
 
       context 'with content type in the delivery options' do
@@ -86,18 +74,14 @@ describe MailRoom::Delivery::Postback do
           connection = stub
           request = stub
           Faraday.stubs(:new).returns(connection)
-  
-          connection.stubs(:basic_auth)
-          connection.stubs(:post).yields(request)
-  
+
+          connection.expects(:post).yields(request)
           request.stubs(:url)
           request.stubs(:body=)
           request.stubs(:headers).returns({})
+          connection.expects(:basic_auth).with('user1', 'password123abc')
 
           MailRoom::Delivery::Postback.new(delivery_options).deliver('a message')
-  
-          expect(connection).to have_received(:basic_auth).with('user1', 'password123abc')
-          expect(connection).to have_received(:post)
           
           expect(request.headers['Content-Type']).to eq('text/plain')
         end

data/spec/lib/delivery/que_spec.rb

@@ -18,20 +18,15 @@ describe MailRoom::Delivery::Que do
     let(:options) {MailRoom::Delivery::Que::Options.new(mailbox)}
 
     it 'stores the message in que_jobs table' do
-      PG.stubs(:connect).returns(connection)
-      connection.stubs(:exec)
-
-      MailRoom::Delivery::Que.new(options).deliver('email')
-
-      expect(PG).to have_received(:connect).with({
+      PG.expects(:connect).with({
         host: 'localhost',
         port: 5432,
         dbname: 'delivery_test',
         user: 'postgres',
         password: ''
-      })
+      }).returns(connection)
 
-      expect(connection).to have_received(:exec).with(
+      connection.expects(:exec).with(
         "INSERT INTO que_jobs (priority, job_class, queue, args) VALUES ($1, $2, $3, $4)",
         [
           5,
@@ -40,6 +35,8 @@ describe MailRoom::Delivery::Que do
           JSON.dump(['email'])
         ]
       )
+
+      MailRoom::Delivery::Que.new(options).deliver('email')
     end
   end
 end

data/spec/lib/health_check_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe MailRoom::HealthCheck do
+  let(:address) { '127.0.0.1' }
+  let(:port) { 8000 }
+  let(:params) { { address: address, port: port } }
+  subject { described_class.new(params) }
+
+  describe '#initialize' do
+    context 'with valid parameters' do
+      it 'validates successfully' do
+        expect(subject).to be_a(described_class)
+      end
+    end
+
+    context 'with invalid address' do
+      let(:address) { nil }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error('No health check address specified')
+      end
+    end
+
+    context 'with invalid port' do
+      let(:port) { nil }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error('Health check port 0 is invalid')
+      end
+    end
+  end
+
+  describe '#run' do
+    it 'sets running to true' do
+      server = stub(start: true)
+      subject.stubs(:create_server).returns(server)
+
+      subject.run
+
+      expect(subject.running).to be true
+    end
+  end
+
+  describe '#quit' do
+    it 'sets running to false' do
+      server = stub(start: true, shutdown: true)
+      subject.stubs(:create_server).returns(server)
+
+      subject.run
+      subject.quit
+
+      expect(subject.running).to be false
+    end
+  end
+end