cinch-test 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: c21cdd89e05e7ac6c64889d9ac5d5b8ed8087d74
-  data.tar.gz: e0b20d4963cc2815719feed54221488839d01c1b
+  metadata.gz: ffa5c1ce20e4f337f9e1f4566ae8e26cf4dc0018
+  data.tar.gz: 60199f145b4f948f7891c45f2400867cb702e369
 SHA512:
-  metadata.gz: 20b19201f0e9d5d6349f4c9bfe1f9354f94acf415aca3fb9dfa275f8ec3ba6d5c33cc98ce882ad72d7d288ba8f8ec300ab8263503a518f58ee673dd14f2fa088
-  data.tar.gz: b791bdeda32f5c4206c7a567971c08191e4ef4e598f6c19f1fbecd0da6fc983eb6e04077afa319441ab117947493b1e9b7afdad261c99925c96eb134dfd46858
+  metadata.gz: bfd8b2b23ca8531736f584370e7534fb87a78ee7b55fa5825ef8b42ed49564dc5bb9186572b72a7beb9b495bdc544475019a038f524ace0fabeba844ddd16763
+  data.tar.gz: 9131e5744509a6ec3d9e53c3fe2c1eeb0d4e00fcead755592ee936dc83f63bfd8e23d57ba02b02611871da4b566053655c68ddbaf7e0237f4c244492695368a7

data/Rakefile

@@ -1,9 +1,7 @@
-require 'rake'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-  t.test_files = Dir.glob('spec/**/*_spec.rb')
-  t.libs.push 'spec'
-end
+RSpec::Core::RakeTask.new
 
-task :default => :test
+task :default => :spec
+task :test => :spec

data/cinch-test.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'coveralls', '~> 0.6'
-  gem.add_development_dependency 'minitest', '~> 5'
-  gem.add_development_dependency 'wrong', '~> 0.7'
+
   gem.add_development_dependency 'rake', '~> 10'
-  gem.add_development_dependency 'rr', '~> 1.1'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'coveralls', '~> 0.7'
+
   gem.add_dependency 'cinch', '~> 2'
 end

data/lib/cinch/test.rb

@@ -144,24 +144,14 @@ module Cinch
       replies
     end
 
-    private
-
     # Process message by dispatching it to the handlers
     # @param [Cinch::Test::MockMessage] message A MockMessage object.
     # @param [Symbol] event The event type of the message.
     def process_message(message, event)
       handlers = message.bot.handlers
 
-      # Deal with secondary event types
-      # See http://rubydoc.info/github/cinchrb/cinch/file/docs/events.md
-      events = [:catchall, event]
-
-      # If the message has a channel add the :channel event otherwise
-      #   add :private
-      events << message.channel.nil? ? :private : :channel
-
-      # If the message is :private also trigger :message
-      events << :message if events.include?(:private)
+      # Get a list of applicable event types.
+      events = get_events(message, event)
 
       # Dispatch each of the events to the handlers
       events.each { |e| handlers.dispatch(e, message) }
@@ -172,5 +162,20 @@ module Cinch
         handler.thread_group.list.each(&:join)
       end
     end
+
+    def get_events(message, event)
+      # Deal with secondary event types
+      # See http://rubydoc.info/github/cinchrb/cinch/file/docs/events.md
+      events = event.is_a?(Array) ? [:catchall] + event : [:catchall, event]
+
+      # If the message has a channel add the :channel event otherwise
+      #   add :private
+      events << (message.channel.nil? ? :private : :channel)
+
+      # If the message is :private also trigger :message
+      events << :message if events.include?(:private)
+
+      events
+    end
   end
 end

data/lib/cinch/test/version.rb

@@ -1,6 +1,6 @@
 module Cinch
   # Versioning Info
   module Test
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/cinch_test_spec.rb

@@ -1,126 +1,81 @@
 require 'spec_helper'
 
 describe Cinch::Test do
-  class MyPlugin
-    include Cinch::Plugin
+  include Cinch::Test
 
-    attr_reader :foo
-    def initialize(*)
-      super
-      @foo = config[:foo]
-    end
+  before(:each) do
+    @bot = make_bot(MyPlugin, foo: 'foo_value')
+  end
 
-    match /foo/, method: :foo
-    def foo(m)
-      m.reply "foo: #{@foo}"
+  describe 'Cinch::Test' do
+    it 'should add the :channel event to messages with a channel set' do
+      message = make_message(@bot, 'blah', channel: '#test')
+      expect(get_events(message, []))
+        .to include(:channel)
     end
+  end
 
-    match /bar/, method: :bar
-    def bar(m)
-      m.reply 'bar reply'
+  describe 'Mock bot' do
+    it 'makes a test bot without a config' do
+      bot = make_bot(MyPlugin)
+      expect(bot).to be_instance_of(Cinch::Test::MockBot)
     end
 
-    match /baz/, method: :baz
-    def baz(m)
-      m.reply 'baz reply', true
+    it 'makes a test bot with a config' do
+      expect(@bot).to be_instance_of(Cinch::Test::MockBot)
     end
 
-    listen_to :channel
-    def listen(m)
-      m.reply 'I listen' if m.message == 'blah'
+    it 'makes a bot with config values available to the plugin' do
+      message = make_message(@bot, '!foo')
+      replies = get_replies(message)
+      expect(replies.first.text).to eq('foo: foo_value')
     end
+  end
 
-    match /trout/, method: :action, react_on: :action
-    def action(m)
-      m.reply 'I hate fish'
+  describe 'Messages' do
+    it 'sent directly to a test bot get a logged reply' do
+      message = make_message(@bot, '!bar')
+      replies = get_replies(message)
+      expect(replies.first.text).to eq('bar reply')
     end
 
-    match /ping/, method: :ping
-    def ping(m)
-      m.channel.send 'Pong?'
+    it 'sent directly to a test bot and can receive a prefixed reply' do
+      replies = get_replies(make_message(@bot, '!baz'))
+      expect(replies.first.text).to eq('test: baz reply')
     end
 
-    match /dance/, method: :dance
-    def dance(m)
-      m.channel.action 'DANCES'
+    it 'sent to users are logged' do
+      r = get_replies(make_message(@bot, '!message', channel: '#test')).first
+      expect(r.text).to eq('a message!')
+      expect(r.event).to eq(:private)
     end
 
-    match /message/, method: :message
-    def message(m)
-      m.user.send 'a message!'
+    it 'sent to a bot can be responded to with a logged action' do
+      replies = get_replies(make_message(@bot, '!scallops'))
+      expect(replies.first.text).to eq('loves shellfish')
     end
 
-    match /scallops/, :method => :shellfish
-    def shellfish(m)
-      m.action_reply 'loves shellfish'
+    it 'should trigger listeners' do
+      message = make_message(@bot, 'blah', channel: '#test')
+      expect(get_replies(message)).to_not be_empty
     end
-  end
-
-  include Cinch::Test
 
-  it 'makes a test bot without a config' do
-    bot = make_bot(MyPlugin)
-    assert bot.is_a?(Cinch::Bot)
-  end
-
-  let(:bot) { make_bot(MyPlugin, :foo => 'foo_value') }
-
-  it 'makes a test bot with a config' do
-    assert bot.is_a?(Cinch::Bot)
-  end
-
-  it 'makes a bot with config values available to the plugin' do
-    message = make_message(bot, '!foo')
-    replies = get_replies(message)
-    assert replies.first.text == 'foo: foo_value'
-  end
-
-  describe 'message events' do
-    it 'messages a test bot and gets a reply' do
-      message = make_message(bot, '!bar')
+    it 'should trigger listeners and log the output text' do
+      message = make_message(@bot, 'blah', channel: '#test')
       replies = get_replies(message)
-      assert replies.first.text == 'bar reply'
+      expect(replies.first.text).to eq('I listen')
     end
 
-    it 'messages a test bot and gets a prefixed reply' do
-      replies = get_replies(make_message(bot, '!baz'))
-      assert replies.first.text == 'test: baz reply'
-    end
-  end
-
-  describe 'user events' do
-    it 'captures messages sent to users' do
-      r = get_replies(make_message(bot, '!message', channel: '#test')).first
-      assert r.text == 'a message!'
-      assert r.event == :private
-    end
-  end
-
-  describe '#make_message with action_reply' do
-    it 'messages a test bot and gets an action' do
-      replies = get_replies(make_message(bot, '!scallops'))
-      assert replies.first.text == 'loves shellfish'
-    end
-  end
-
-  describe 'channel events' do
-    # This will be fixed next rev, I hope.
-    # it 'get triggered by channel events' do
-    #   message = make_message(bot, 'blah', channel: '#test')
-    #   replies = get_replies(message)
-    #   assert replies.first.text == 'I listen'
-    # end
-
-    it 'captures channel messages' do
-      r = get_replies(make_message(bot, '!ping', channel: '#test')).first
-      assert r.text == 'Pong?'
-      assert r.event == :channel
+    it 'should trigger in channels properly' do
+      r = get_replies(make_message(@bot, '!ping', channel: '#test')).first
+      expect(r.text).to eq('Pong?')
+      expect(r.event).to eq(:channel)
     end
 
-    it 'captures a channel action' do
-      r = get_replies(make_message(bot, '!dance', channel: '#test')).first
-      assert r.text == 'DANCES'
-      assert r.event == :action
+    it 'that are events should trigger properly' do
+      r = get_replies(make_message(@bot, '!dance', channel: '#test')).first
+      expect(r.text).to eq('DANCES')
+      expect(r.event).to eq(:action)
     end
   end
 end

data/spec/my_plugin.rb

@@ -0,0 +1,54 @@
+class MyPlugin
+  include Cinch::Plugin
+
+  attr_reader :foo
+  def initialize(*)
+    super
+    @foo = config[:foo]
+  end
+
+  match /foo/, method: :foo
+  def foo(m)
+    m.reply "foo: #{@foo}"
+  end
+
+  match /bar/, method: :bar
+  def bar(m)
+    m.reply 'bar reply'
+  end
+
+  match /baz/, method: :baz
+  def baz(m)
+    m.reply 'baz reply', true
+  end
+
+  listen_to :channel
+  def listen(m)
+    m.reply 'I listen' if m.message == 'blah'
+  end
+
+  match /trout/, method: :action, react_on: :action
+  def action(m)
+    m.reply 'I hate fish'
+  end
+
+  match /ping/, method: :ping
+  def ping(m)
+    m.channel.send 'Pong?'
+  end
+
+  match /dance/, method: :dance
+  def dance(m)
+    m.channel.action 'DANCES'
+  end
+
+  match /message/, method: :message
+  def message(m)
+    m.user.send 'a message!'
+  end
+
+  match /scallops/, :method => :shellfish
+  def shellfish(m)
+    m.action_reply 'loves shellfish'
+  end
+end

data/spec/spec_helper.rb

@@ -8,10 +8,4 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start
 
 require 'cinch/test'
-require 'minitest'
-require 'minitest/autorun'
-require 'wrong/adapters/minitest'
-require 'rr'
-
-Wrong.config[:color] = true
-
+require 'my_plugin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-test
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jay Adkisson
@@ -9,38 +9,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: wrong
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -53,34 +53,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +84,7 @@ files:
 - lib/cinch/test.rb
 - lib/cinch/test/version.rb
 - spec/cinch_test_spec.rb
+- spec/my_plugin.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jayferd/cinch-test
 licenses:
@@ -139,4 +112,5 @@ specification_version: 4
 summary: Helpers for testing Cinch Plugins
 test_files:
 - spec/cinch_test_spec.rb
+- spec/my_plugin.rb
 - spec/spec_helper.rb