spec/spec_helper.rb in chatterbot-0.5.1 vs spec/spec_helper.rb in chatterbot-0.6.1

@@ -1,19 +1,17 @@
+# -*- coding: utf-8 -*-
 require 'simplecov'
 SimpleCov.start
 #$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 #$LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'bundler/setup'
 Bundler.require
 
+#require "twitter_oauth"
+require "twitter"
 
-#require 'rspec'
-#require 'chatterbot'
-
-require "twitter_oauth"
-
 require 'tempfile'
 require 'sqlite3'
 
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -26,31 +24,41 @@
   bot.stub!(:load_config).and_return({})
   bot
 end
 
 def fake_search(max_id = 100, result_count = 0, id_base=0)
-  mock(TwitterOAuth::Client,
-       {
-         :search => {
-           'max_id' => max_id,
-           'results' => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
-         }        
-       }
+  mock(Twitter::Client,
+       :credentials? => true,
+       :search => Twitter::SearchResults.new(:max_id => max_id,
+                                             :results => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) } )
        )
+
+  # mock(Twitter::Client,
+  #      {
+  #        :credentials? => true,
+  #        :search => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
+  #      }
+  #      )
 end
 
 def fake_replies(max_id = 100, result_count = 0, id_base = 0)
-  mock(TwitterOAuth::Client,
+  mock(Twitter::Client,
        {
-         :replies => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
+         :credentials? => true,
+         :mentions => 1.upto(result_count).collect { |i| fake_tweet(i, id_base, true) }
        }
        )
 end
 
-def fake_tweet(index, id=0)
+def fake_tweet(index, id=0, as_object = false)
   id = index if id <= 0
-  {
+  x = {
     :from_user => "chatterbot",
     :index => index,
-    :id => id
+    :id => id,
+    :user => {
+      'screen_name' => "chatterbot"
+    }
   }
+
+  as_object == true ? Twitter::Status.new(x) : x
 end