Permalink
Browse files

Merge branch 'master' of github.com:canonical-hackers/marvin

  • Loading branch information...
paulv committed Jul 2, 2012
2 parents ad6769d + baeaec3 commit 4125eab9458c2fa8258d14d56ef80cc8b1e0a8ce
Showing with 13 additions and 1 deletion.
  1. +12 −0 spec/helpers.rb
  2. +1 −1 spec/magic_spec.rb
View
@@ -19,3 +19,15 @@ def fake_bot
def rand_string(size=16)
(1..size).collect { (i = Kernel.rand(62); i += ((i < 10) ? 48 : ((i < 36) ? 55 : 61 ))).chr }.join
end
+
+module Cinch
+ module Plugin
+ def initialize(opts = {})
+ @bot = fake_bot
+ @handlers = []
+ @timers = []
+ # Lets try not initing the bot
+ # __register
+ end
+ end
+end
View
@@ -34,7 +34,7 @@
should be_nil
end
- describe 'Invalid Data Handling' do
+ describe 'Invalid ' do
it 'should return an error string when querying for text for invalid data' do
@plugin.get_card_text(rand_string).
should == 'Error finding this card\'s description.'

0 comments on commit 4125eab

Please sign in to comment.