hipbot 1.0.0 → 1.0.3

data/spec/spec_helper.rb

@@ -1,20 +1,13 @@
 require_relative '../lib/hipbot'
 
-# require 'coveralls'
-# Coveralls.wear!
+require 'coveralls'
+Coveralls.wear!
 
 RSpec.configure do |config|
-  config.mock_with :mocha
+  config.mock_with :rspec
 
   config.before(:all) do
     Hipbot::User.send(:include, Hipbot::Storages::Hash)
     Hipbot::Room.send(:include, Hipbot::Storages::Hash)
-    Hipbot.stubs(logger: NullLogger.instance)
-  end
-end
-
-class NullLogger
-  def self.instance
-    Logger.new('/dev/null')
   end
 end

data/spec/unit/bot_spec.rb

@@ -5,7 +5,6 @@ describe "a class that inherits", Hipbot::Bot do
 
   before(:each) do
     described_class.instance.plugins.clear
-    described_class.instance.configuration.logger = NullLogger.instance
     described_class.instance.setup
   end
   subject { described_class.instance }
@@ -19,7 +18,7 @@ describe "a class that inherits", Hipbot::Bot do
       described_class.on /^hello there$/ do
         reply('hi!')
       end
-      subject.expects(:send_to_room).with(room, 'hi!')
+      subject.should_receive(:send_to_room).with(room, 'hi!')
       subject.react(sender, room, '@robot hello there')
     end
 
@@ -27,7 +26,7 @@ describe "a class that inherits", Hipbot::Bot do
       described_class.on /^you are (.*), robot$/ do |adj|
         reply("i know i'm #{adj}!")
       end
-      subject.expects(:send_to_room).with(room, "i know i'm cool!")
+      subject.should_receive(:send_to_room).with(room, "i know i'm cool!")
       subject.react(sender, room, '@robot you are cool, robot')
     end
 
@@ -35,7 +34,7 @@ describe "a class that inherits", Hipbot::Bot do
       described_class.on /^send "(.*)" to (.*@.*)$/ do |message, recipient|
         reply("sent \"#{message}\" to #{recipient}")
       end
-      subject.expects(:send_to_room).with(room, 'sent "hello!" to robot@robots.org')
+      subject.should_receive(:send_to_room).with(room, 'sent "hello!" to robot@robots.org')
       subject.react(sender, room, '@robot send "hello!" to robot@robots.org')
     end
 
@@ -43,14 +42,14 @@ describe "a class that inherits", Hipbot::Bot do
       described_class.default do |message|
         reply("I don't understand \"#{message}\"")
       end
-      subject.expects(:send_to_room).with(room, 'I don\'t understand "hello robot!"')
+      subject.should_receive(:send_to_room).with(room, 'I don\'t understand "hello robot!"')
       subject.react(sender, room, '@robot hello robot!')
     end
 
     it "should choose first option when multiple options match" do
       described_class.on /hello there/ do reply('hello there') end
       described_class.on /hello (.*)/ do reply('hello') end
-      subject.expects(:send_to_room).with(room, 'hello there')
+      subject.should_receive(:send_to_room).with(room, 'hello there')
       subject.react(sender, room, '@robot hello there')
     end
 
@@ -62,17 +61,17 @@ describe "a class that inherits", Hipbot::Bot do
       end
 
       it "should understand simple english" do |msg|
-        subject.expects(:send_to_room).with(room, 'hello tom')
+        subject.should_receive(:send_to_room).with(room, 'hello tom')
         subject.react(sender, room, '@robot hello tom')
       end
 
       it "should understand english" do |msg|
-        subject.expects(:send_to_room).with(room, 'hello tom')
+        subject.should_receive(:send_to_room).with(room, 'hello tom')
         subject.react(sender, room, '@robot good morning tom')
       end
 
       it "should understand german" do |msg|
-        subject.expects(:send_to_room).with(room, 'hello tom')
+        subject.should_receive(:send_to_room).with(room, 'hello tom')
         subject.react(sender, room, '@robot guten tag tom')
       end
     end
@@ -82,7 +81,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /^you are (.*)$/, global: true do |adj|
           reply("i know i'm #{adj}!")
         end
-        subject.expects(:send_to_room).with(room, "i know i'm cool!")
+        subject.should_receive(:send_to_room).with(room, "i know i'm cool!")
         subject.react(sender, room, 'you are cool')
       end
 
@@ -90,7 +89,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /^you are (.*)$/ do |adj|
           reply("i know i'm #{adj}!")
         end
-        subject.expects(:send_to_room).never
+        subject.should_receive(:send_to_room).never
         subject.react(sender, room, 'you are cool')
       end
     end
@@ -102,7 +101,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, from: sender.name do
           reply('Wazzup, Tom?')
         end
-        subject.expects(:send_to_room).with(room, 'Wazzup, Tom?')
+        subject.should_receive(:send_to_room).with(room, 'Wazzup, Tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
 
@@ -110,7 +109,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, from: ['someone', sender.name] do
           reply('wazzup, tom?')
         end
-        subject.expects(:send_to_room).with(room, 'wazzup, tom?')
+        subject.should_receive(:send_to_room).with(room, 'wazzup, tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
 
@@ -118,7 +117,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, from: sender.name do
           reply('wazzup, tom?')
         end
-        subject.expects(:send_to_room).never
+        subject.should_receive(:send_to_room).never
         subject.react(other_user, room, '@robot wazzup?')
       end
 
@@ -126,7 +125,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, from: [sender.name] do
           reply('wazzup, tom?')
         end
-        subject.expects(:send_to_room).never
+        subject.should_receive(:send_to_room).never
         subject.react(other_user, room, '@robot wazzup?')
       end
     end
@@ -138,7 +137,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, room: 'Test Room' do
           reply('Wazzup, Tom?')
         end
-        subject.expects(:send_to_room).with(room, 'Wazzup, Tom?')
+        subject.should_receive(:send_to_room).with(room, 'Wazzup, Tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
 
@@ -146,7 +145,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, room: ['Test Room 2', 'Test Room'] do
           reply('wazzup, tom?')
         end
-        subject.expects(:send_to_room).with(room, 'wazzup, tom?')
+        subject.should_receive(:send_to_room).with(room, 'wazzup, tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
 
@@ -154,7 +153,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, room: 'Test Room' do
           reply('wazzup, tom?')
         end
-        subject.expects(:send_to_room).never
+        subject.should_receive(:send_to_room).never
         subject.react(sender, other_room, '@robot wazzup?')
       end
 
@@ -162,7 +161,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /wazzup\?/, room: ['Test Room 2'] do
           reply('wazzup, tom?')
         end
-        subject.expects(:send_to_room).never
+        subject.should_receive(:send_to_room).never
         subject.react(sender, room, '@robot wazzup?')
       end
     end
@@ -174,7 +173,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /.*/ do
           reply("you said: #{message.body}")
         end
-        subject.expects(:send_to_room).with(room, "you said: hello")
+        subject.should_receive(:send_to_room).with(room, "you said: hello")
         subject.react(user, room, "@robot hello")
       end
 
@@ -182,7 +181,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /.*/ do
           reply("you are: #{sender.name}")
         end
-        subject.expects(:send_to_room).with(room, "you are: Tom Smith")
+        subject.should_receive(:send_to_room).with(room, "you are: Tom Smith")
         subject.react(user, room, "@robot hello")
       end
 
@@ -190,7 +189,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /.*/ do
           reply("recipients: #{message.recipients.join(', ')}")
         end
-        subject.expects(:send_to_room).with(room, "recipients: robot, dave")
+        subject.should_receive(:send_to_room).with(room, "recipients: robot, dave")
         subject.react(user, room, "@robot tell @dave hello from me")
       end
 
@@ -198,7 +197,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /.*/ do
           reply(message.sender.first_name)
         end
-        subject.expects(:send_to_room).with(room, 'Tom')
+        subject.should_receive(:send_to_room).with(room, 'Tom')
         subject.react(user, room, '@robot What\'s my name?')
       end
 
@@ -206,7 +205,7 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.on /.*/ do
           reply(message.mentions.join(' '))
         end
-        subject.expects(:send_to_room).with(room, 'dave rachel')
+        subject.should_receive(:send_to_room).with(room, 'dave rachel')
         subject.react(user, room, '@robot do you know @dave? @dave is @rachel father')
       end
     end
@@ -235,12 +234,12 @@ describe "a class that inherits", Hipbot::Bot do
       }
 
       it "should respond to reaction defined in plugin" do
-        subject.expects(:send_to_room).with(room, 'plugin ack')
+        subject.should_receive(:send_to_room).with(room, 'plugin ack')
         subject.react(sender, room, '@robot plugin respond')
       end
 
       it "should respond to default reaction defined in plugin" do
-        subject.expects(:send_to_room).with(room, 'plugin default')
+        subject.should_receive(:send_to_room).with(room, 'plugin default')
         subject.react(sender, room, '@robot blahblah')
       end
 
@@ -248,12 +247,12 @@ describe "a class that inherits", Hipbot::Bot do
         described_class.default do
           reply('bot default')
         end
-        subject.expects(:send_to_room).with(room, 'plugin default')
+        subject.should_receive(:send_to_room).with(room, 'plugin default')
         subject.react(sender, room, '@robot blahblah')
       end
 
       it 'should have access to #plugin inside reaction' do
-        subject.expects(:send_to_room).with(room, 'some method')
+        subject.should_receive(:send_to_room).with(room, 'some method')
         subject.react(sender, room, '@robot plugin method')
       end
     end
@@ -262,8 +261,8 @@ describe "a class that inherits", Hipbot::Bot do
   describe "configurable options" do
     Hipbot::Configuration::OPTIONS.each do |option|
       it "should delegate #{option} to configuration" do
-        value = stub
-        subject.configuration.expects(option).returns(value)
+        value = double
+        subject.configuration.should_receive(option).and_return(value)
         subject.send(option)
       end
     end

data/spec/unit/match_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Hipbot::Match do
   subject { described_class.new(reaction, message) }
 
-  let(:message) { stub(for?: true, body: 'test message') }
+  let(:message) { double(for?: true, body: 'test message', private?: false) }
   let(:reaction) do
-    stub(
+    double(
       global?: false,
       from_anywhere?: true,
       to_anything?: false,
@@ -16,7 +16,11 @@ describe Hipbot::Match do
   end
 
   before do
-    Hipbot.stubs(:user)
+    Hipbot.stub(user: double)
+  end
+
+  after do
+    Hipbot.unstub(:user)
   end
 
   describe "#matches?" do
@@ -25,8 +29,8 @@ describe Hipbot::Match do
     describe "specific regexp" do
       describe "matching the message body" do
         before do
-          message.stubs(body: 'test message')
-          reaction.stubs(regexps: [/\Atest/])
+          message.stub(body: 'test message')
+          reaction.stub(regexps: [/\Atest/])
         end
 
         its(:matches?) { should be_true }
@@ -34,8 +38,8 @@ describe Hipbot::Match do
 
       describe "not matching message body" do
         before do
-          message.stubs(body: 'test message')
-          reaction.stubs(regexps: [/\Arandom/])
+          message.stub(body: 'test message')
+          reaction.stub(regexps: [/\Arandom/])
         end
 
         its(:matches?) { should be_false }
@@ -45,8 +49,8 @@ describe Hipbot::Match do
     describe "multiple regexps" do
       describe "matching message body" do
         before do
-          message.stubs(body: 'test message')
-          reaction.stubs(regexps: [/\Awat/, /\Atest/])
+          message.stub(body: 'test message')
+          reaction.stub(regexps: [/\Awat/, /\Atest/])
         end
 
         its(:matches?) { should be_true }
@@ -54,8 +58,8 @@ describe Hipbot::Match do
 
       describe "not matching message body" do
         before do
-          message.stubs(body: 'test message')
-          reaction.stubs(regexps: [/\Awat/, /\Arandom/])
+          message.stub(body: 'test message')
+          reaction.stub(regexps: [/\Awat/, /\Arandom/])
         end
 
         its(:matches?) { should be_false }
@@ -65,7 +69,7 @@ describe Hipbot::Match do
     describe "specific condition" do
       describe "returning true" do
         before do
-          reaction.stubs(condition: proc { true })
+          reaction.stub(condition: proc { true })
         end
 
         its(:matches?) { should be_true }
@@ -73,7 +77,7 @@ describe Hipbot::Match do
 
       describe "returning false" do
         before do
-          reaction.stubs(condition: proc { false })
+          reaction.stub(condition: proc { false })
         end
 
         its(:matches?) { should be_false }
@@ -82,10 +86,10 @@ describe Hipbot::Match do
   end
 
   describe "#invoke" do
-    let(:response) { stub }
+    let(:response) { double }
 
     before do
-      Hipbot::Response.stubs(new: response)
+      Hipbot::Response.stub(new: response)
     end
 
     after do
@@ -94,54 +98,54 @@ describe Hipbot::Match do
 
     describe "a reaction with no regexps" do
       before do
-        reaction.stubs(to_anything?: true)
+        reaction.stub(to_anything?: true)
       end
 
       it "calls response with message body" do
-        response.expects(:invoke).with([message.body])
+        response.should_receive(:invoke).with([message.body])
       end
     end
 
     describe "a reaction with regexp with no variables" do
       before do
-        reaction.stubs(regexps: [/.*/])
+        reaction.stub(regexps: [/.*/])
       end
 
       it "calls response with message body" do
-        response.expects(:invoke).with([])
+        response.should_receive(:invoke).with([])
       end
     end
 
     describe "a reaction with regexp with one variable" do
       before do
-        message.stubs(body: 'I like trains.')
-        reaction.stubs(regexps: [/\Ai like (\w+)/i])
+        message.stub(body: 'I like trains.')
+        reaction.stub(regexps: [/\Ai like (\w+)/i])
       end
 
       it "calls response with variable parsed out of message body" do
-        response.expects(:invoke).with(['trains'])
+        response.should_receive(:invoke).with(['trains'])
       end
     end
 
     describe "a reaction with regexp with multiple variables" do
       before do
-        message.stubs(body: 'I like trains and cars.')
-        reaction.stubs(regexps: [/\Ai like (\w+) and (\w+)/i])
+        message.stub(body: 'I like trains and cars.')
+        reaction.stub(regexps: [/\Ai like (\w+) and (\w+)/i])
       end
 
       it "calls response with variables parsed out of message body" do
-        response.expects(:invoke).with(%w{trains cars})
+        response.should_receive(:invoke).with(%w{trains cars})
       end
     end
 
     describe "a reaction with multiple regexps with variables" do
       before do
-        message.stubs(body: 'I enjoy trains and cars.')
-        reaction.stubs(regexps: [/\AI enjoy (\w+) and (\w+)/, /\Ai like (\w+) and (\w+)/i])
+        message.stub(body: 'I enjoy trains and cars.')
+        reaction.stub(regexps: [/\AI enjoy (\w+) and (\w+)/, /\Ai like (\w+) and (\w+)/i])
       end
 
       it "calls response with variable parsed out of message body" do
-        response.expects(:invoke).with(%w{trains cars})
+        response.should_receive(:invoke).with(%w{trains cars})
       end
     end
   end

data/spec/unit/matchable_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Hipbot::Matchable do
+  include Hipbot::Matchable
+
+  before(:all) do
+    Hipbot::Bot.instance.setup
+  end
+
+  let(:sender) { Hipbot::User.new(name: 'test user') }
+  let(:room) { Hipbot::Room.new(name: 'test room') }
+
+  def plugins
+    []
+  end
+
+  describe '#react' do
+    it 'calls #invoke_all on Match' do
+      Hipbot::Match.should_receive(:invoke_all)
+      react(sender, room, 'test message')
+    end
+  end
+end